reformat metric template

Author: ethanandrews

api/skills_matcher_db/core/views.py

@@ -4,7 +4,7 @@
 from django.db.models.functions import TruncMonth
 from django.db.models import Count
 
-from skills_matcher_db.users.models import User
+from skills_matcher_db.users.models import User, Engagement
 from skills_matcher_db.project_owners.models import Project
 
 
@@ -29,19 +29,28 @@ def get_context_data(self, **kwargs):
             .order_by("month")
         )
 
-        # get user metric data
+        # get project metric data
         projects_metrics_qs = (
             Project.objects.annotate(month=TruncMonth("date_created"))
             .values("month")
             .annotate(project_count=Count("id"))
             .order_by("month")
         )
 
+        # get Engagement metric data
+        eng_metrics_qs = (
+            Engagement.objects.annotate(month=TruncMonth("date_created"))
+            .values("month")
+            .annotate(eng_count=Count("id"))
+            .order_by("month")
+        )
+
         context.update(
             {
                 "node_type": "assemblies",
                 "user_metrics": user_metrics_qs,
                 "project_metrics": projects_metrics_qs,
+                "eng_metrics": eng_metrics_qs,
             }
         )
         return context

api/skills_matcher_db/templates/admin/app_list.html

@@ -0,0 +1,46 @@
+{% load i18n %}
+
+{% if app_list %}
+
+  {% for app in app_list %}
+    <div class="app-{{ app.app_label }} module{% if app.app_url in request.path|urlencode %} current-app{% endif %}">
+      <table>
+        <caption>
+          <a href="{{ app.app_url }}" class="section" title="{% blocktranslate with name=app.name %}Models in the {{ name }} application{% endblocktranslate %}">{{ app.name }}</a>
+        </caption>
+
+        {% for model in app.models %}
+          {% with model_name=model.object_name|lower %}
+            <tr class="model-{{ model_name }}{% if model.admin_url in request.path|urlencode %} current-model{% endif %}">
+              <th scope="row" id="{{ app.app_label }}-{{ model_name }}">
+                {% if model.admin_url %}
+                  <a href="{{ model.admin_url }}"{% if model.admin_url in request.path|urlencode %} aria-current="page"{% endif %}>{{ model.name }}</a>
+                {% else %}
+                  {{ model.name }}
+                {% endif %}
+              </th>
+
+              {% if model.add_url %}
+                <td><a href="{{ model.add_url }}" class="addlink" aria-describedby="{{ app.app_label }}-{{ model_name }}">{% translate 'Add' %}</a></td>
+              {% else %}
+                <td></td>
+              {% endif %}
+
+              {% if model.admin_url and show_changelinks %}
+                {% if model.view_only %}
+                  <td><a href="{{ model.admin_url }}" class="viewlink" aria-describedby="{{ app.app_label }}-{{ model_name }}">{% translate 'View' %}</a></td>
+                {% else %}
+                  <td><a href="{{ model.admin_url }}" class="changelink" aria-describedby="{{ app.app_label }}-{{ model_name }}">{% translate 'Change' %}</a></td>
+                {% endif %}
+              {% elif show_changelinks %}
+                <td></td>
+              {% endif %}
+            </tr>
+          {% endwith %}
+        {% endfor %}
+      </table>
+    </div>
+  {% endfor %}
+{% else %}
+  <p>{% translate 'You don’t have permission to view or edit anything.' %}</p>
+{% endif %}

api/skills_matcher_db/templates/admin/core/metrics.html

@@ -21,23 +21,67 @@
     <h1>Application Metrics</h1>
 
     <h2>New Users by Month</h2>
-        <ul>
-            {% for item in user_metrics %}
-                <li>{{ item.month|date:"Y-m" }} - {{ item.user_count }} user</li>
+    <table style="width:300px">
+        <tr>
+          <th scope="row">
+            <a href="{% url 'admin:view_metrics' %}"> Month </a>
+          </th>
+          <th scope="row">
+            <a href="{% url 'admin:view_metrics' %}"> Users </a>
+          </th>
+        </tr>
+       
+        {% for item in user_metrics %}
+            <tr>
+                <td>{{ item.month|date:"Y-m" }} </td><td> {{ item.user_count }} </td>
             {% empty %}
-                <li>No items found.</li>
-            {% endfor %}
-        </ul>
+                <td>No items found.</td><td></td>
+            </tr>
+        {% endfor %}
 
+      </table>
 
     <h2>New Projects by Month</h2>
-    <ul>
-        {% for item in projects_metrics_qs %}
-            <li>{{ item.month|date:"Y-m" }} - {{ item.project_count }} project</li>
-        {% empty %}
-            <li>No items found.</li>
+    <table style="width:300px">
+        <tr>
+          <th scope="row">
+            <a href="{% url 'admin:view_metrics' %}"> Month </a>
+          </th>
+          <th scope="row">
+            <a href="{% url 'admin:view_metrics' %}"> Projects </a>
+          </th>
+        </tr>
+       
+        {% for item in project_metrics %}
+            <tr>
+                <td>{{ item.month|date:"Y-m" }} </td><td> {{ item.project_count }} </td>
+            {% empty %}
+                <td>No items found.</td><td></td>
+            </tr>
         {% endfor %}
-    </ul>
+        
+      </table>
+
+    <h2>New Engagements by Month</h2>
+    <table style="width:300px">
+        <tr>
+          <th scope="row">
+            <a href="{% url 'admin:view_metrics' %}"> Month </a>
+          </th>
+          <th scope="row">
+            <a href="{% url 'admin:view_metrics' %}"> Engagements </a>
+          </th>
+        </tr>
+       
+        {% for item in eng_metrics %}
+            <tr>
+                <td>{{ item.month|date:"Y-m" }} </td><td> {{ item.eng_count }} </td>
+            {% empty %}
+                <td>No items found.</td><td></td>
+            </tr>
+        {% endfor %}
+        
+      </table>
 
 
 

api/skills_matcher_db/users/admin.py

@@ -61,4 +61,4 @@ class FavoriteAdmin(admin.ModelAdmin):
 
 @admin.register(Engagement)
 class EngagementAdmin(admin.ModelAdmin):
-    pass
+    list_display = ["project_owner", "expert", "date_created", "date_responded"]