Grant/Proposal pending status

Author: marcoacierno

backend/grants/migrations/0026_grant_pending_status.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.1.4 on 2025-01-20 00:57
+
+from django.db import migrations, models
+
+def copy_grant_status_to_pending_status(apps, schema_editor):
+    Grant = apps.get_model('grants', 'Grant')
+    for grant in Grant.objects.all():
+        grant.pending_status = grant.status
+        grant.save(update_fields=['pending_status'])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('grants', '0025_alter_grant_approved_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='grant',
+            name='pending_status',
+            field=models.CharField(blank=True, choices=[('pending', 'Pending'), ('rejected', 'Rejected'), ('approved', 'Approved'), ('waiting_list', 'Waiting List'), ('waiting_list_maybe', 'Waiting List, Maybe'), ('waiting_for_confirmation', 'Waiting for confirmation'), ('refused', 'Refused'), ('confirmed', 'Confirmed'), ('did_not_attend', 'Did Not Attend')], default='pending', max_length=30, verbose_name='pending status'),
+        ),
+        migrations.RunPython(copy_grant_status_to_pending_status, reverse_code=migrations.RunPython.noop),
+    ]

backend/grants/models.py

@@ -145,6 +145,13 @@ class ApprovedType(models.TextChoices):
     status = models.CharField(
         _("status"), choices=Status.choices, max_length=30, default=Status.pending
     )
+    pending_status = models.CharField(
+        _("pending status"),
+        choices=Status.choices,
+        max_length=30,
+        default=Status.pending,
+        blank=True,
+    )
     approved_type = models.CharField(
         verbose_name=_("approved type"),
         choices=ApprovedType.choices,

backend/grants/summary.py

@@ -1,3 +1,4 @@
+from collections import defaultdict
 from django.db.models import Count, Sum
 from conferences.models.conference import Conference
 from helpers.constants import GENDERS
@@ -26,7 +27,7 @@ def calculate(self, conference_id):
         filtered_grants = Grant.objects.for_conference(conference)
 
         grants_by_country = filtered_grants.values(
-            "departure_country", "status"
+            "departure_country", "pending_status"
         ).annotate(total=Count("id"))
 
         (
@@ -109,71 +110,65 @@ def _aggregate_data_by_country(self, grants_by_country, statuses):
             if key not in summary:
                 summary[key] = {status[0]: 0 for status in statuses}
 
-            summary[key][data["status"]] += data["total"]
-            status_totals[data["status"]] += data["total"]
+            summary[key][data["pending_status"]] += data["total"]
+            status_totals[data["pending_status"]] += data["total"]
 
             # Update continent totals
             if continent not in totals_per_continent:
                 totals_per_continent[continent] = {status[0]: 0 for status in statuses}
-            totals_per_continent[continent][data["status"]] += data["total"]
+            totals_per_continent[continent][data["pending_status"]] += data["total"]
 
         return summary, status_totals, totals_per_continent
 
     def _aggregate_data_by_country_type(self, filtered_grants, statuses):
         """
         Aggregates grant data by country type and status.
         """
-        country_type_data = filtered_grants.values("country_type", "status").annotate(
-            total=Count("id")
+        country_type_data = filtered_grants.values(
+            "country_type", "pending_status"
+        ).annotate(total=Count("id"))
+        country_type_summary = defaultdict(
+            lambda: {status[0]: 0 for status in statuses}
         )
-        country_type_summary = {
-            country_type: {status[0]: 0 for status in statuses}
-            for country_type in Grant.CountryType.values
-        }
 
         for data in country_type_data:
             country_type = data["country_type"]
-            status = data["status"]
+            status = data["pending_status"]
             total = data["total"]
             country_type_summary[country_type][status] += total
 
-        return country_type_summary
+        return dict(country_type_summary)
 
     def _aggregate_data_by_gender(self, filtered_grants, statuses):
         """
         Aggregates grant data by gender and status.
         """
-        gender_data = filtered_grants.values("gender", "status").annotate(
+        gender_data = filtered_grants.values("gender", "pending_status").annotate(
             total=Count("id")
         )
-        gender_summary = {
-            gender: {status[0]: 0 for status in statuses} for gender, _ in GENDERS
-        }
-        gender_summary[""] = {
-            status[0]: 0 for status in statuses
-        }  # For unspecified genders
+        gender_summary = defaultdict(lambda: {status[0]: 0 for status in statuses})
 
         for data in gender_data:
             gender = data["gender"] if data["gender"] else ""
-            status = data["status"]
+            status = data["pending_status"]
             total = data["total"]
             gender_summary[gender][status] += total
 
-        return gender_summary
+        return dict(gender_summary)
 
     def _aggregate_financial_data_by_status(self, filtered_grants, statuses):
         """
         Aggregates financial data (total amounts) by grant status.
         """
-        financial_data = filtered_grants.values("status").annotate(
+        financial_data = filtered_grants.values("pending_status").annotate(
             total_amount_sum=Sum("total_amount")
         )
         print(financial_data)
         financial_summary = {status[0]: 0 for status in statuses}
         overall_total = 0
 
         for data in financial_data:
-            status = data["status"]
+            status = data["pending_status"]
             total_amount = data["total_amount_sum"] or 0
             financial_summary[status] += total_amount
             if status in self.BUDGET_STATUSES:
@@ -185,22 +180,19 @@ def _aggregate_data_by_grant_type(self, filtered_grants, statuses):
         """
         Aggregates grant data by grant_type and status.
         """
-        grant_type_data = filtered_grants.values("grant_type", "status").annotate(
-            total=Count("id")
-        )
-        grant_type_summary = {
-            grant_type: {status[0]: 0 for status in statuses}
-            for grant_type in Grant.GrantType.values
-        }
+        grant_type_data = filtered_grants.values(
+            "grant_type", "pending_status"
+        ).annotate(total=Count("id"))
+        grant_type_summary = defaultdict(lambda: {status[0]: 0 for status in statuses})
 
         for data in grant_type_data:
             grant_types = data["grant_type"]
-            status = data["status"]
+            status = data["pending_status"]
             total = data["total"]
             for grant_type in grant_types:
                 grant_type_summary[grant_type][status] += total
 
-        return grant_type_summary
+        return dict(grant_type_summary)
 
     def _aggregate_data_by_speaker_status(self, filtered_grants, statuses):
         """
@@ -223,55 +215,54 @@ def _aggregate_data_by_speaker_status(self, filtered_grants, statuses):
 
         proposed_speaker_data = (
             filtered_grants.filter(is_proposed_speaker=True)
-            .values("status")
+            .values("pending_status")
             .annotate(total=Count("id"))
         )
 
         confirmed_speaker_data = (
             filtered_grants.filter(is_confirmed_speaker=True)
-            .values("status")
+            .values("pending_status")
             .annotate(total=Count("id"))
         )
 
-        speaker_status_summary = {
-            "proposed_speaker": {status[0]: 0 for status in statuses},
-            "confirmed_speaker": {status[0]: 0 for status in statuses},
-        }
+        speaker_status_summary = defaultdict(
+            lambda: {status[0]: 0 for status in statuses}
+        )
 
         for data in proposed_speaker_data:
-            status = data["status"]
+            status = data["pending_status"]
             total = data["total"]
             speaker_status_summary["proposed_speaker"][status] += total
 
         for data in confirmed_speaker_data:
-            status = data["status"]
+            status = data["pending_status"]
             total = data["total"]
             speaker_status_summary["confirmed_speaker"][status] += total
 
-        return speaker_status_summary
+        return dict(speaker_status_summary)
 
     def _aggregate_data_by_approved_type(self, filtered_grants, statuses):
         """
         Aggregates grant data by approved type and status.
         """
-        approved_type_data = filtered_grants.values("approved_type", "status").annotate(
-            total=Count("id")
-        )
+        approved_type_data = filtered_grants.values(
+            "approved_type", "pending_status"
+        ).annotate(total=Count("id"))
         approved_type_summary = {
             approved_type: {status[0]: 0 for status in statuses}
             for approved_type in Grant.ApprovedType.values
         }
-        approved_type_summary[None] = {
-            status[0]: 0 for status in statuses
-        }  # For unspecified genders
+        approved_type_summary = defaultdict(
+            lambda: {status[0]: 0 for status in statuses}
+        )
 
         for data in approved_type_data:
             approved_type = data["approved_type"]
-            status = data["status"]
+            status = data["pending_status"]
             total = data["total"]
             approved_type_summary[approved_type][status] += total
 
-        return approved_type_summary
+        return dict(approved_type_summary)
 
     def _aggregate_data_by_requested_needs_summary(self, filtered_grants, statuses):
         """
@@ -286,11 +277,11 @@ def _aggregate_data_by_requested_needs_summary(self, filtered_grants, statuses):
         for field in requested_needs_summary.keys():
             field_data = (
                 filtered_grants.filter(**{field: True})
-                .values("status")
+                .values("pending_status")
                 .annotate(total=Count("id"))
             )
             for data in field_data:
-                status = data["status"]
+                status = data["pending_status"]
                 total = data["total"]
                 requested_needs_summary[field][status] += total
 
@@ -300,18 +291,15 @@ 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
-        }
+        occupation_data = filtered_grants.values(
+            "occupation", "pending_status"
+        ).annotate(total=Count("id"))
+        occupation_summary = defaultdict(lambda: {status[0]: 0 for status in statuses})
 
         for data in occupation_data:
             occupation = data["occupation"]
-            status = data["status"]
+            status = data["pending_status"]
             total = data["total"]
             occupation_summary[occupation][status] += total
 
-        return occupation_summary
+        return dict(occupation_summary)

backend/reviews/admin.py

@@ -282,15 +282,15 @@ def _review_grants_recap_view(self, request, review_session):
 
                 approved_type = approved_type_decisions.get(grant.id, "")
 
-                grant.status = decision
+                grant.pending_status = decision
                 grant.approved_type = (
                     approved_type if decision == Grant.Status.approved else None
                 )
 
             for grant in grants:
                 # save each to make sure we re-calculate the grants amounts
                 # TODO: move the amount calculation in a separate function maybe?
-                grant.save(update_fields=["status", "approved_type"])
+                grant.save(update_fields=["pending_status", "approved_type"])
 
             messages.success(
                 request, "Decisions saved. Check the Grants Summary for more info."
@@ -406,11 +406,11 @@ def _review_proposals_recap_view(self, request, review_session):
 
             for proposal in proposals:
                 decision = decisions[proposal.id]
-                proposal.status = decision
+                proposal.pending_status = decision
 
             Submission.objects.bulk_update(
                 proposals,
-                fields=["status"],
+                fields=["pending_status"],
             )
 
             return redirect(

backend/reviews/templates/grants-recap.html

@@ -444,6 +444,12 @@ <h3>
                   </div>
                   <div class="clear"></div>
                 </th>
+                <th scope="col">
+                  <div class="text">
+                    <span>Pending Status</span>
+                  </div>
+                  <div class="clear"></div>
+                </th>
                 <th scope="col">
                   <div class="text">
                     <span>Decision</span>
@@ -463,13 +469,13 @@ <h3>
               <script>
                 grantsById[{{item.id}}] = {
                     id: {{item.id}},
-                    status: "{{ item.status }}",
-                    originalStatus: "{{ item.status }}",
+                    status: "{{ item.pending_status }}",
+                    originalStatus: "{{ item.pending_status }}",
                     numOfVotes: {{item.userreview_set.count}},
                 };
               </script>
               <tr
-                data-original-status="{{ item.status }}"
+                data-original-status="{{ item.pending_status }}"
                 data-original-approved-type="{{ item.approved_type }}"
                 class="grant-item"
                 id="grant-{{ item.id }}"
@@ -593,15 +599,20 @@ <h3>
                 <td>
                   {{ item.get_status_display }}
                   <br />
-                  {% if item.approved_type %}({{ item.get_approved_type_display }}){% endif %}
+                  {% if item.status == "approved" and item.approved_type %}({{ item.get_approved_type_display }}){% endif %}
+                </td>
+                <td>
+                  {{ item.get_pending_status_display }}
+                  <br />
+                  {% if item.pending_status == "approved" and item.approved_type %}({{ item.get_approved_type_display }}){% endif %}
                 </td>
                 <td>
                   {% if perms.reviews.decision_reviewsession %}
                   <ul class="status-choices">
                     {% for status in all_review_statuses %}
                     <li>
                       <label>
-                        <input {% if item.status == status.0 %}checked{% endif %}
+                        <input {% if item.pending_status == status.0 %}checked{% endif %}
                           type="radio"
                           class="status-decision-radio"
                           name="decision-{{item.id}}"
@@ -630,7 +641,7 @@ <h3>
                   {% if perms.reviews.decision_reviewsession %}
                   <ul
                     data-item-id="{{ item.id }}"
-                    class="approved-type-choices {% if item.status != 'approved' %}hidden{% endif %}"
+                    class="approved-type-choices {% if item.pending_status != 'approved' %}hidden{% endif %}"
                   >
                     {% for approved_type in all_approved_types %}
                     <li>
@@ -673,7 +684,7 @@ <h3>
         <table>
           <tbody>
             <tr>
-              <td><h2>Pending status ➡</h2></td>
+              <td><h2>Changes ➡</h2></td>
               {% for status in all_statuses %}
               <td>
                 {% if status in all_review_statuses %}