feat: rework group manager interface (#311) (#344)

Makefile

@@ -57,3 +57,16 @@ _migrate: migrations
 
 .PHONY: migrate
 migrate: _migrate format
+
+
+.PHONY: test-coverage
+test-coverage:
+	coverage run --source=adminsec,usersec --omit={adminsec,usersec}/migrations/*,*.html manage.py test -v2 --settings=config.settings.test
+	coverage report
+	coverage html
+
+.PHONY: test-coverage-keepdb
+test-coverage-keepdb:
+	coverage run --source=adminsec,usersec --omit={adminsec,usersec}/migrations/*,*.html manage.py test -v2 --settings=config.settings.test --keepdb
+	coverage report
+	coverage html

adminsec/templates/adminsec/overview.html

@@ -4,16 +4,13 @@
 
   <h2 class="mb-5 mt-5">
     <span class="fw-light">
-      Welcome {% if user.first_name or user.last_name %} {{ user.first_name }} {{ user.last_name }}{% else %}{{ user.username }}{% endif %}
-      &mdash;
+      Welcome {% if user.first_name or user.last_name %} {{ user.first_name }} {{ user.last_name }}{% else %}{{ user.username }}{% endif %}!
     </span>
-    Open Requests
     <a href="{% url 'adminsec:termsandconditions-list' %}" class="btn btn-secondary float-end">
-      <i class="iconify" data-icon="mdi:format-list-bulleted"></i>
       Terms &amp; Conditions
     </a>
   </h2>
 
-  {% include "usersec/modules/request_grid.html" %}
+  {% include "adminsec/requests.html" %}
 
 {% endblock content %}

adminsec/templates/adminsec/requests.html

@@ -0,0 +1,35 @@
+{% load common %}
+
+<table class="table">
+  <thead>
+    <tr>
+      <th>Request Type</th>
+      <th>Requester</th>
+      <th>Created</th>
+      <th>Modified</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for obj in pending_requests %}
+      <tr>
+        <td>
+          <a href="{{ obj|get_detail_url:user }}" class="btn btn-dark btn-sm">
+            <i class="iconify" data-icon="mdi:eye"></i>
+            {{ obj.get_request_type }}
+          </a>
+        </td>
+        <td>{{ obj.requester.name }}</td>
+        <td>{{ obj.date_created|date:"Y-m-d H:i" }}</td>
+        <td>{{ obj.date_modified|date:"Y-m-d H:i" }}</td>
+      </tr>
+      {% empty %}
+      <tr>
+        <td colspan="4" class="text-center">
+          <em class="text-muted">No pending requests.</em>
+        </td>
+      </tr>
+    {% endfor %}
+  </tbody>
+</table>
+
+

adminsec/templates/adminsec/termsandconditions_list.html

@@ -5,8 +5,7 @@
 <h1 class="mt-4">
   Terms &amp; Conditions
   <a class="btn btn-secondary float-end" href="{% url 'adminsec:overview' %}">
-    <i class="iconify" data-icon="mdi:arrow-left-bold"></i>
-    Go To Overview
+    <i class="iconify" data-icon="mdi:home"></i>
   </a>
 </h1>