Grant/Proposal pending status (#4316)

Author: marcoacierno

.codecov.yml

@@ -13,6 +13,6 @@ coverage:
   round: down
   status:
     changes: false
-    patch: true
+    patch: false
     project: false
 github_checks: false

backend/custom_admin/admin.py

@@ -1,3 +1,4 @@
+from django.db.models import F
 from django.contrib import messages
 from functools import wraps
 
@@ -52,3 +53,19 @@ def wrapper(modeladmin, request, queryset):
         return func(modeladmin, request, queryset)
 
     return wrapper
+
+
+@admin.action(description="Confirm pending status change")
+@validate_single_conference_selection
+def confirm_pending_status(modeladmin, request, queryset):
+    queryset.update(
+        status=F("pending_status"),
+    )
+
+
+@admin.action(description="Reset pending status to status")
+@validate_single_conference_selection
+def reset_pending_status_back_to_status(modeladmin, request, queryset):
+    queryset.update(
+        pending_status=F("status"),
+    )

backend/grants/admin.py

@@ -5,7 +5,11 @@
 )
 from conferences.models.conference_voucher import ConferenceVoucher
 from pycon.constants import UTC
-from custom_admin.admin import validate_single_conference_selection
+from custom_admin.admin import (
+    confirm_pending_status,
+    reset_pending_status_back_to_status,
+    validate_single_conference_selection,
+)
 from import_export.resources import ModelResource
 from datetime import timedelta
 from typing import Dict, List, Optional
@@ -25,11 +29,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",
@@ -410,6 +416,7 @@ class GrantAdmin(ExportMixin, ConferencePermissionMixin, admin.ModelAdmin):
     list_filter = (
         "conference",
         "status",
+        "pending_status",
         "country_type",
         "occupation",
         "approved_type",
@@ -445,6 +452,7 @@ class GrantAdmin(ExportMixin, ConferencePermissionMixin, admin.ModelAdmin):
             {
                 "fields": (
                     "status",
+                    "pending_status",
                     "approved_type",
                     "country_type",
                     "ticket_amount",
@@ -575,3 +583,48 @@ def get_queryset(self, request):
 
     class Media:
         js = ["admin/js/jquery.init.js"]
+
+
+@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/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/migrations/0027_grantconfirmpendingstatusproxy.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.1.4 on 2025-01-23 14:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('grants', '0026_grant_pending_status'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='GrantConfirmPendingStatusProxy',
+            fields=[
+            ],
+            options={
+                'verbose_name': 'Grant Confirm Pending Status',
+                'verbose_name_plural': 'Grants Confirm Pending Status',
+                'proxy': True,
+                'indexes': [],
+                'constraints': [],
+            },
+            bases=('grants.grant',),
+        ),
+    ]

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,
@@ -331,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")