Allow approvers to adjust project before approving

claims/views.py

@@ -24,7 +24,7 @@ from .forms import (
     UserPermissionForm,
 )
 from .email_utils import notify_admin_of_claim, send_claimant_confirmation_email
-from .models import Claim, ClaimLog
+from .models import Claim, ClaimLog, Project
 
 User = get_user_model()
 
@@ -161,6 +161,7 @@ class ClaimDashboardView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
         context["can_change"] = self.request.user.has_perm("claims.change_claim")
         context["payments_enabled"] = getattr(settings, "CLAIMS_ENABLE_INTERNAL_PAYMENTS", False)
         context["summary"] = self._build_summary()
+        context["project_options"] = Project.objects.filter(is_active=True).order_by("name")
         context["has_any_claims"] = context["summary"]["total_claims"] > 0
         context["has_filtered_claims"] = self._has_filtered_claims(context["status_filter"], context["summary"])
         context["recent_claims"] = (
@@ -196,6 +197,11 @@ class ClaimDashboardView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
             return redirect(request.get_full_path())
         previous_status = claim.status
         claim.decision_note = decision_note
+        new_project = form.cleaned_data.get("project")
+        project_changed = False
+        if new_project is not None and new_project != claim.project:
+            claim.project = new_project
+            project_changed = True
 
         if action == ClaimDecisionForm.ACTION_APPROVE:
             claim.status = Claim.Status.APPROVED
@@ -204,7 +210,10 @@ class ClaimDashboardView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
             claim.status = Claim.Status.REJECTED
             messages.warning(request, _("%(claim)s markerades som nekad.") % {"claim": claim})
 
-        claim.save(update_fields=["status", "decision_note", "updated_at"])
+        update_fields = ["status", "decision_note", "updated_at"]
+        if project_changed:
+            update_fields.append("project")
+        claim.save(update_fields=update_fields)
         claim.add_log(
             action=ClaimLog.Action.STATUS_CHANGED,
             performed_by=request.user,