Add summary by occupation to grant summary

Author: estyxx

backend/grants/summary.py

@@ -63,6 +63,9 @@ def calculate(self, conference_id):
         country_types = {
             country_type.value: country_type.label for country_type in Grant.CountryType
         }
+        occupation_summary = self._aggregate_data_by_occupation(
+            filtered_grants, statuses
+        )
 
         return dict(
             conference_id=conference_id,
@@ -84,6 +87,7 @@ def calculate(self, conference_id):
             requested_needs_summary=requested_needs_summary,
             country_type_summary=country_type_summary,
             country_types=country_types,
+            occupation_summary=occupation_summary,
         )
 
     def _aggregate_data_by_country(self, grants_by_country, statuses):
@@ -291,3 +295,23 @@ def _aggregate_data_by_requested_needs_summary(self, filtered_grants, statuses):
                 requested_needs_summary[field][status] += total
 
         return requested_needs_summary
+
+    def _aggregate_data_by_occupation(self, filtered_grants, statuses):
+        """
+        Aggregates grant data by occupation and status.
+        """
+        occupation_data = filtered_grants.values("occupation", "status").annotate(
+            total=Count("id")
+        )
+        occupation_summary = {
+            occupation: {status[0]: 0 for status in statuses}
+            for occupation in Grant.Occupation.values
+        }
+
+        for data in occupation_data:
+            occupation = data["occupation"]
+            status = data["status"]
+            total = data["total"]
+            occupation_summary[occupation][status] += total
+
+        return occupation_summary

backend/grants/templates/admin/grants/grant_summary.html

@@ -387,6 +387,35 @@ <h2>by Requested Needs</h2>
             {% endfor %}
         </tbody>
     </table>
+    <h2>by Occupation</h2>
+    <table>
+        <thead>
+            <tr>
+                <th>Occupation</th>
+                <th></th>
+                {% for status in statuses %}
+                    <th class="status-column-{{ forloop.counter }}"
+                        {% if status.0 not in preselected_statuses %}style="display:none"{% endif %}>
+                        {{ status.1|title }}
+                    </th>
+                {% endfor %}
+            </tr>
+        </thead>
+        <tbody>
+            {% for occupation, occupation_data in occupation_summary.items %}
+                <tr>
+                    <td>{{ occupation|title }}</td>
+                    <td></td>
+                    {% for status in statuses %}
+                        <td class="status-column-{{ forloop.counter }}"
+                            {% if status.0 not in preselected_statuses %}style="display:none"{% endif %}>
+                            {{ occupation_data|get_item:status.0|default:"0" }}
+                        </td>
+                    {% endfor %}
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
 </div>
 <script>
     document.addEventListener('DOMContentLoaded', function() {