From 74b72691e44564072d1644973e23a8131c4237a4 Mon Sep 17 00:00:00 2001
From: Kasownik <kasownik@hackerspace.pl>
Date: Fri, 3 Mar 2017 02:26:34 +0100
Subject: [PATCH] Admin template fixes: better member information, instant
 NOTAMEMBER link, separate list of inactive-wannabe members

---
 web/webapp/templates/admin_index.html  | 29 +++++++++++++++++++++++++-
 web/webapp/templates/admin_member.html | 16 +++++++++++---
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/web/webapp/templates/admin_index.html b/web/webapp/templates/admin_index.html
index ddfecaf..430787f 100644
--- a/web/webapp/templates/admin_index.html
+++ b/web/webapp/templates/admin_index.html
@@ -50,6 +50,33 @@
 		    </table>
 		</div>
 		{% endfor %}
+		<div class="col-md-6">
+		    <h2>Inactive-wannabes:</h2>
+		    <table class="table table-striped">
+			<tr>
+			    <th>#</th>
+			    <th>LDAP Username</th>
+			    <th>Months Due</th>
+			    <th>Payment Policy</th>
+			</tr>
+		    {% for member in inactive_members|selectattr("months_due") %}
+			<tr>
+			    <td>{{loop.index}}.</td>
+			    <td>
+				<a href="/admin/member/{{member.username}}">
+				    <b>{{member.username}}</b>
+				</a>
+			    </td>
+			    <td>
+				<span class="badge" style="background-color: #{{member.color}}">
+				    {{member.months_due}}
+				</span>
+			    </td>
+			    <td>{% include "button_payment_policy.html" %}</td>
+			</tr>
+		    {% endfor %}
+		    </table>
+		</div>
 		<div class="col-md-6">
 		    <h2>Inactive members:</h2>
 		    <table class="table table-striped">
@@ -59,7 +86,7 @@
 			    <th>Months Due</th>
 			    <th>Payment Policy</th>
 			</tr>
-		    {% for member in inactive_members %}
+		    {% for member in inactive_members|rejectattr("months_due") %}
 			<tr>
 			    <td>{{loop.index}}.</td>
 			    <td>
diff --git a/web/webapp/templates/admin_member.html b/web/webapp/templates/admin_member.html
index d014fe4..cf28c6c 100644
--- a/web/webapp/templates/admin_member.html
+++ b/web/webapp/templates/admin_member.html
@@ -13,7 +13,9 @@
             <img src="{{ member.get_contact_email() | gravatar }}" alt="gravatar" style="width: 70%; margin-top: 10px;" />
             <h1>{{member.username}}{%if cn %}<br /><small>{{cn}}</small>{% endif%}</h1>
             <h5>{{member.get_contact_email()}}</h5>
-            <p>
+	    <h5>Joined in {{ member.join_year }}-{{ "%02i" | format(member.join_month) }}</h5>
+            {% if admin %}<h5>Local ID: {{member.id}}</h5>{%endif%}
+	    <p>
                 {% if status.judgement %}
                 <span class="label label-success">Active</span><br/><br/>
                 {% else %}
@@ -98,13 +100,21 @@
                     <td>{{ mt.transfer.title }}</td>
                     <td>{{ mt.transfer.date }}</td>
                     {% endif %}
-                    <td>{{ mt.year }}/{{ "%02i" | format(mt.month) }}</td>
+                    <td>{{ mt.year }}-{{ "%02i" | format(mt.month) }}</td>
                 </tr>
+		    {% if admin and loop.last %}
+		<tr>
+		    <td colspan="5" class="notamember">
+		    <a href="/admin/match/{{member.username}}/1/NOTAMEMBER">[Add "NOT A MEMBER FROM THIS POINT" marker]</a>
+		    </td>
+		</tr>
+		    {%endif%}
                     {% else %}
                 <tr>
-                    <td colspan="5" class="notamember warning">
+                    <td colspan="4" class="notamember warning">
                         Not a member from this point...
                     </td>
+		    <td class="warning">{{ mt.year }}-{{ "%02i" | format(mt.month) }}</td>
                 </tr>
                 {% endif %}
                 {% endfor %}