django-forms-workflows 0.28.4__tar.gz → 0.28.6__tar.gz

{django_forms_workflows-0.28.4 → django_forms_workflows-0.28.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.28.4
+Version: 0.28.6
 Summary: Enterprise-grade, database-driven form builder with approval workflows and external data integration
 License: LGPL-3.0-only
 License-File: LICENSE

{django_forms_workflows-0.28.4 → django_forms_workflows-0.28.6}/django_forms_workflows/admin.py

@@ -278,10 +278,26 @@ class WorkflowDefinitionInline(admin.StackedInline):
     fields = [
         "name_label",
         "requires_approval",
-        "trigger_conditions",
         "hide_approval_history",
-        ("notify_on_submission", "notify_on_approval", "notify_on_rejection"),
+        "trigger_conditions",
+        (
+            "notify_on_submission",
+            "notify_on_approval",
+            "notify_on_rejection",
+            "notify_on_withdrawal",
+        ),
         "additional_notify_emails",
+        "notification_cadence",
+        (
+            "notification_cadence_day",
+            "notification_cadence_time",
+            "notification_cadence_form_field",
+        ),
+        (
+            "approval_deadline_days",
+            "send_reminder_after_days",
+            "auto_approve_after_days",
+        ),
         ("allow_bulk_export", "allow_bulk_pdf_export"),
     ]
 
@@ -1085,20 +1101,50 @@ class WorkflowStageAdmin(admin.ModelAdmin):
     per group that needs its own approve_label or approval fields.
     """
 
-    list_display = ("__str__", "workflow", "order", "approval_logic", "approve_label")
+    list_display = (
+        "__str__",
+        "workflow",
+        "order",
+        "approval_logic",
+        "approve_label",
+        "requires_manager_approval",
+        "has_trigger_conditions",
+    )
     list_filter = ("workflow", "approval_logic", "requires_manager_approval")
     list_select_related = ("workflow", "workflow__form_definition")
     search_fields = ("name", "workflow__form_definition__name")
     ordering = ("workflow", "order")
     inlines = [StageApprovalGroupInline]
-    fields = (
-        "workflow",
-        ("order", "name"),
-        "approval_logic",
-        "approve_label",
-        "requires_manager_approval",
+    fieldsets = (
+        (
+            None,
+            {
+                "fields": (
+                    "workflow",
+                    ("order", "name"),
+                    "approval_logic",
+                    "approve_label",
+                    "requires_manager_approval",
+                )
+            },
+        ),
+        (
+            "Conditional Trigger",
+            {
+                "classes": ("collapse",),
+                "description": (
+                    "When set, this stage only runs if the submission data matches these "
+                    "conditions. Leave blank to always run this stage."
+                ),
+                "fields": ("trigger_conditions",),
+            },
+        ),
     )
 
+    @admin.display(boolean=True, description="Has trigger conditions")
+    def has_trigger_conditions(self, obj):
+        return bool(obj.trigger_conditions)
+
 
 class WorkflowStageInline(admin.StackedInline):
     """Inline for defining ordered stages on a WorkflowDefinition."""
@@ -1138,6 +1184,7 @@ class WorkflowDefinitionAdmin(admin.ModelAdmin):
                     "form_definition",
                     "name_label",
                     "requires_approval",
+                    "hide_approval_history",
                     "trigger_conditions",
                 )
             },

{django_forms_workflows-0.28.4 → django_forms_workflows-0.28.6}/django_forms_workflows/templates/django_forms_workflows/submission_detail.html

@@ -233,7 +233,7 @@
                 {% elif stage.approved_count > 0 %}bg-primary text-white
                 {% else %}bg-light text-muted{% endif %}">
                 <span>
-                    <strong>{% if workflow_name_label %}{{ workflow_name_label }}{% else %}Stage {{ stage.number }}{% if not stage.has_multiple_stages %}: {{ stage.name }}{% endif %}{% endif %}</strong>
+                    <strong>{% if workflow_name_label %}{{ workflow_name_label }}{% else %}Stage {{ stage.number }}: {{ stage.name }}{% endif %}</strong>
                 </span>
                 <span class="badge bg-white
                     {% if stage.rejected_count > 0 %}text-danger

{django_forms_workflows-0.28.4 → django_forms_workflows-0.28.6}/django_forms_workflows/views.py

@@ -563,21 +563,27 @@ def submission_detail(request, submission_id):
                 continue
             is_parent = task.workflow_stage_id in parent_stage_ids
             target = parent_groups if is_parent else sub_groups
-            # Group parent tasks by stage_number (order) so parallel stages
-            # (same order, different stage IDs) merge into one card.
-            # Sub-workflow tasks still group by stage ID.
-            stage_key = (
-                (task.stage_number or 0) if is_parent else task.workflow_stage_id
-            )
+            # Group by workflow_stage_id so every distinct stage (including
+            # parallel stages at the same order number) gets its own card.
+            stage_key = task.workflow_stage_id
             if stage_key not in target:
+                stage_name = (
+                    task.workflow_stage.name
+                    if task.workflow_stage
+                    else f"Stage {task.stage_number or 0}"
+                )
                 target[stage_key] = {
                     "number": task.stage_number or 0,
-                    "name": f"Stage {task.stage_number or 0}",
+                    "name": stage_name,
+                    "approval_logic": (
+                        task.workflow_stage.approval_logic
+                        if task.workflow_stage
+                        else "all"
+                    ),
                     "tasks": [],
                     "approved_count": 0,
                     "rejected_count": 0,
                     "total_count": 0,
-                    "has_multiple_stages": False,
                 }
             group = target[stage_key]
             # Enrich task with its stage name for the "Step" column
@@ -593,17 +599,6 @@ def submission_detail(request, submission_id):
             elif task.status == "rejected":
                 group["rejected_count"] += 1
 
-        # Detect whether each parent group has tasks from multiple stages
-        for group in parent_groups.values():
-            stage_ids = {t.workflow_stage_id for t in group["tasks"]}
-            if len(stage_ids) > 1:
-                group["has_multiple_stages"] = True
-            elif len(stage_ids) == 1:
-                ws = group["tasks"][0].workflow_stage
-                if ws:
-                    group["name"] = ws.name
-                    group["approval_logic"] = ws.approval_logic
-
         if parent_groups:
             stage_groups = sorted(parent_groups.values(), key=lambda x: x["number"])
         if sub_groups:

{django_forms_workflows-0.28.4 → django_forms_workflows-0.28.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-forms-workflows"
-version = "0.28.4"
+version = "0.28.6"
 description = "Enterprise-grade, database-driven form builder with approval workflows and external data integration"
 license = "LGPL-3.0-only"
 readme = "README.md"