action

Author: marcoacierno

backend/grants/admin.py

@@ -25,11 +25,13 @@
 )
 from schedule.models import ScheduleItem
 from submissions.models import Submission
-from .models import Grant
-from django.db.models import Exists, OuterRef
+from .models import Grant, GrantConfirmPendingStatusProxy
+from django.db.models import Exists, OuterRef, F
 
 from django.contrib.admin import SimpleListFilter
 from participants.models import Participant
+from django.urls import reverse
+from django.utils.safestring import mark_safe
 
 EXPORT_GRANTS_FIELDS = (
     "name",
@@ -575,3 +577,64 @@ def get_queryset(self, request):
 
     class Media:
         js = ["admin/js/jquery.init.js"]
+
+
+@admin.action(description="Confirm pending status change")
+@validate_single_conference_selection
+def confirm_pending_status(modeladmin, request, queryset):
+    Grant.objects.filter(id__in=queryset.values_list("id", flat=True)).update(
+        status=F("pending_status"),
+    )
+
+
+@admin.action(description="Reset pending status")
+@validate_single_conference_selection
+def reset_pending_status_back_to_status(modeladmin, request, queryset):
+    Grant.objects.filter(id__in=queryset.values_list("id", flat=True)).update(
+        pending_status=F("status"),
+    )
+
+
+@admin.register(GrantConfirmPendingStatusProxy)
+class GrantConfirmPendingStatusProxyAdmin(admin.ModelAdmin):
+    list_display = (
+        "id",
+        "full_name",
+        "status",
+        "to",
+        "pending_status",
+        "open_grant",
+        "conference",
+    )
+    list_filter = ("status", "pending_status", "conference")
+    search_fields = ("full_name", "user__email")
+    list_display_links = None
+    actions = [
+        confirm_pending_status,
+        reset_pending_status_back_to_status,
+    ]
+
+    def to(self, obj):
+        return "➡️"
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+    def has_add_permission(self, request):
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
+    def get_queryset(self, request):
+        return (
+            super()
+            .get_queryset(request)
+            .exclude(
+                pending_status=F("status"),
+            )
+        )
+
+    def open_grant(self, obj):
+        url = reverse("admin:grants_grant_change", args=[obj.id])
+        return mark_safe(f'<a href="{url}">Open Grant</a>')

backend/grants/models.py

@@ -338,3 +338,10 @@ def has_approved_accommodation(self):
             self.approved_type == Grant.ApprovedType.ticket_accommodation
             or self.approved_type == Grant.ApprovedType.ticket_travel_accommodation
         )
+
+
+class GrantConfirmPendingStatusProxy(Grant):
+    class Meta:
+        proxy = True
+        verbose_name = _("Grant Confirm Pending Status")
+        verbose_name_plural = _("Grants Confirm Pending Status")

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

@@ -21,7 +21,7 @@
         .waiting_for_confirmation,
         .confirmed {
             font-weight: 600;
-            color: var(--body-loud-color)
+            color: var(--body-loud-color);
         }
 
         #financialSummary td,

backend/grants/tests/test_admin.py

@@ -8,7 +8,9 @@
 from django.utils import timezone
 
 from grants.admin import (
+    confirm_pending_status,
     create_grant_vouchers,
+    reset_pending_status_back_to_status,
     send_reply_emails,
     mark_rejected_and_send_email,
 )
@@ -444,3 +446,63 @@ def test_mark_rejected_and_send_email(rf, mocker, admin_user):
     mock_send_rejected_email.assert_has_calls(
         [call(grant_id=grant1.id), call(grant_id=grant2.id)], any_order=True
     )
+
+
+def test_confirm_pending_status_action(rf):
+    grant_1 = GrantFactory(
+        status=Grant.Status.pending,
+        pending_status=Grant.Status.confirmed,
+    )
+
+    grant_2 = GrantFactory(
+        status=Grant.Status.rejected,
+        pending_status=Grant.Status.waiting_list,
+        conference=grant_1.conference,
+    )
+
+    grant_3 = GrantFactory(
+        status=Grant.Status.waiting_list,
+        pending_status=Grant.Status.waiting_list_maybe,
+        conference=grant_1.conference,
+    )
+
+    request = rf.get("/")
+    confirm_pending_status(None, request, Grant.objects.all())
+
+    grant_1.refresh_from_db()
+    grant_2.refresh_from_db()
+    grant_3.refresh_from_db()
+
+    assert grant_1.status == Grant.Status.confirmed
+    assert grant_2.status == Grant.Status.waiting_list
+    assert grant_3.status == Grant.Status.waiting_list_maybe
+
+
+def test_reset_pending_status_back_to_status_action(rf):
+    grant_1 = GrantFactory(
+        status=Grant.Status.pending,
+        pending_status=Grant.Status.confirmed,
+    )
+
+    grant_2 = GrantFactory(
+        status=Grant.Status.rejected,
+        pending_status=Grant.Status.waiting_list,
+        conference=grant_1.conference,
+    )
+
+    grant_3 = GrantFactory(
+        status=Grant.Status.waiting_list,
+        pending_status=Grant.Status.waiting_list_maybe,
+        conference=grant_1.conference,
+    )
+
+    request = rf.get("/")
+    reset_pending_status_back_to_status(None, request, Grant.objects.all())
+
+    grant_1.refresh_from_db()
+    grant_2.refresh_from_db()
+    grant_3.refresh_from_db()
+
+    assert grant_1.status == Grant.Status.pending
+    assert grant_2.status == Grant.Status.rejected
+    assert grant_3.status == Grant.Status.waiting_list

backend/grants/tests/test_summary.py

@@ -12,6 +12,7 @@ def grants_set():
         5,
         conference=conference,
         status="approved",
+        pending_status="approved",
         country_type="italy",
         gender="female",
         departure_country="IT",
@@ -20,6 +21,7 @@ def grants_set():
         3,
         conference=conference,
         status="rejected",
+        pending_status="rejected",
         country_type="europe",
         gender="male",
         departure_country="FR",
@@ -28,6 +30,7 @@ def grants_set():
         7,
         conference=conference,
         status="waiting_list",
+        pending_status="waiting_list",
         country_type="extra_eu",
         gender="other",
         departure_country="US",

backend/reviews/templates/proposals-recap.html

@@ -342,7 +342,7 @@ <h3>Show proposals with N reviews:</h3>
         </select>
       </div>
       <div class="opt-filter">
-        <h3>Show proposals with status:</h3>
+        <h3>Show proposals with pending status:</h3>
         <div>
           {% for status in all_statuses %}
           <label>
@@ -379,6 +379,10 @@ <h3>Show proposals with status:</h3>
                   <div class="text"><span>Status</span></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></div>
                   <div class="clear"></div>
@@ -390,8 +394,8 @@ <h3>Show proposals with status:</h3>
               <script>
                 submissionsById[{{ item.id }}] = {
                   id: {{ item.id }},
-                  status: "{{ item.status }}",
-                  originalStatus: "{{ item.status }}",
+                  status: "{{ item.pending_status }}",
+                  originalStatus: "{{ item.pending_status }}",
                   audienceLevel: {{ item.audience_level.id }},
                   languages: [{% for language in item.languages.all %}"{{language.code}}",{% endfor %}],
                   numOfVotes: {{item.userreview_set.count}},
@@ -485,6 +489,10 @@ <h3>Show proposals with status:</h3>
                   {{item.status}}
                 </td>
 
+                <td>
+                  {{item.pending_status}}
+                </td>
+
                 <td class="decision-input-wrapper">
                   <label>
                     <input

backend/submissions/admin.py

@@ -20,6 +20,7 @@
     ProposalMaterial,
     Submission,
     SubmissionComment,
+    SubmissionConfirmPendingStatusProxy,
     SubmissionTag,
     SubmissionType,
 )
@@ -311,3 +312,8 @@ class SubmissionTagAdmin(admin.ModelAdmin):
 @admin.register(SubmissionComment)
 class SubmissionCommentAdmin(admin.ModelAdmin):
     list_display = ("submission", "author", "text")
+
+
+@admin.register(SubmissionConfirmPendingStatusProxy)
+class SubmissionConfirmPendingStatusProxyAdmin(admin.ModelAdmin):
+    ...

backend/submissions/migrations/0026_sync_pending_status.py

@@ -0,0 +1,21 @@
+# Generated by Django 5.1.4 on 2025-01-20 22:54
+
+from django.db import migrations
+
+def sync_pending_status(apps, schema_editor):
+    from django.db import models
+
+    Submission = apps.get_model('submissions', 'Submission')
+    Submission.objects.update(
+        pending_status=models.F('status')
+    )
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('submissions', '0025_remove_proposalmaterial_title_proposalmaterial_name'),
+    ]
+
+    operations = [
+        migrations.RunPython(sync_pending_status, reverse_code=migrations.RunPython.noop),
+    ]

backend/submissions/models.py

@@ -257,3 +257,10 @@ def __str__(self):
     class Meta:
         verbose_name = _("comment")
         verbose_name_plural = _("comments")
+
+
+class SubmissionConfirmPendingStatusProxy(Submission):
+    class Meta:
+        proxy = True
+        verbose_name = _("Submission Confirm Pending Status")
+        verbose_name_plural = _("Submissions Confirm Pending Status")