django-forms-workflows 0.20.2__tar.gz → 0.20.3__tar.gz

{django_forms_workflows-0.20.2 → django_forms_workflows-0.20.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.20.2
+Version: 0.20.3
 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.20.2 → django_forms_workflows-0.20.3}/django_forms_workflows/templates/django_forms_workflows/submission_detail.html

@@ -241,52 +241,72 @@
         </div>
         {% endfor %}
 
-        {% if sub_workflow_instances_merged %}
-        {# ---- Merged sub-workflow table ---- #}
-        <h5 class="mb-3 mt-4"><i class="bi bi-list-check"></i> {{ sub_wf_section_label|default:"Additional Approvals" }}</h5>
-        <div class="card mb-3 border-secondary">
+        {% if sub_workflow_instance_stages %}
+        {# ---- Per-instance stage cards (like parent stages) ---- #}
+        {% for section in sub_workflow_instance_stages %}
+        <h5 class="mb-3 mt-4"><i class="bi bi-list-check"></i> {{ section.instance.label }}</h5>
+        {% for stage in section.stage_groups %}
+        <div class="card mb-3
+            {% if stage.rejected_count > 0 %}border-danger
+            {% elif stage.approved_count == stage.total_count and stage.total_count > 0 %}border-success
+            {% elif stage.approved_count > 0 %}border-primary
+            {% else %}border-secondary{% endif %}">
+            <div class="card-header d-flex justify-content-between align-items-center
+                {% if stage.rejected_count > 0 %}bg-danger text-white
+                {% elif stage.approved_count == stage.total_count and stage.total_count > 0 %}bg-success text-white
+                {% elif stage.approved_count > 0 %}bg-primary text-white
+                {% else %}bg-light text-muted{% endif %}">
+                <span>
+                    <strong>Step {{ forloop.counter }}: {{ stage.name }}</strong>
+                    {% if stage.approval_logic == "all" %}
+                        <span class="badge bg-light text-dark ms-2" style="font-size:11px;">All must approve</span>
+                    {% elif stage.approval_logic == "any" %}
+                        <span class="badge bg-light text-dark ms-2" style="font-size:11px;">Any can approve</span>
+                    {% else %}
+                        <span class="badge bg-light text-dark ms-2" style="font-size:11px;">Sequential</span>
+                    {% endif %}
+                </span>
+                <span class="badge bg-white
+                    {% if stage.rejected_count > 0 %}text-danger
+                    {% elif stage.approved_count == stage.total_count and stage.total_count > 0 %}text-success
+                    {% else %}text-secondary{% endif %}">
+                    {{ stage.approved_count }}/{{ stage.total_count }} approved
+                    {% if stage.rejected_count > 0 %}&nbsp;· {{ stage.rejected_count }} rejected{% endif %}
+                </span>
+            </div>
             <div class="card-body p-0">
                 <div class="table-responsive">
-                    <table class="table table-sm table-hover mb-0">
+                    <table class="table table-sm mb-0">
                         <thead class="table-light">
                             <tr>
-                                <th>#</th>
-                                <th>Label</th>
                                 <th>Assigned To</th>
                                 <th>Status</th>
                                 <th>Completed By</th>
                                 <th>Completed At</th>
-                                <th></th>
+                                <th>Comments</th>
                             </tr>
                         </thead>
                         <tbody>
-                            {% for row in sub_workflow_instances_merged %}
+                            {% for task in stage.tasks %}
                             <tr>
-                                <td>{{ row.instance.index }}</td>
-                                <td>{{ row.instance.label }}</td>
                                 <td>
-                                    {% if row.task %}
-                                        {% if row.task.assigned_to %}
-                                            {{ row.task.assigned_to.get_full_name|default:row.task.assigned_to.username }}
-                                        {% elif row.task.assigned_group %}
-                                            {{ row.task.assigned_group.name }}
-                                        {% else %}-{% endif %}
+                                    {% if task.assigned_to %}
+                                        {{ task.assigned_to.get_full_name|default:task.assigned_to.username }}
+                                    {% elif task.assigned_group %}
+                                        {{ task.assigned_group.name }} <span class="text-muted">(Group)</span>
                                     {% else %}-{% endif %}
                                 </td>
                                 <td>
-                                    {% if row.instance.status == 'approved' %}<span class="badge bg-success">Approved</span>
-                                    {% elif row.instance.status == 'rejected' %}<span class="badge bg-danger">Rejected</span>
-                                    {% elif row.instance.status == 'in_progress' %}<span class="badge bg-primary">In Progress</span>
-                                    {% else %}<span class="badge bg-secondary">Pending</span>
+                                    {% if task.status == 'pending' %}<span class="badge bg-warning text-dark">Pending</span>
+                                    {% elif task.status == 'approved' %}<span class="badge bg-success">Approved</span>
+                                    {% elif task.status == 'rejected' %}<span class="badge bg-danger">Rejected</span>
+                                    {% elif task.status == 'expired' %}<span class="badge bg-secondary">Expired</span>
+                                    {% elif task.status == 'skipped' %}<span class="badge bg-secondary">Skipped</span>
                                     {% endif %}
                                 </td>
-                                <td>{% if row.task and row.task.completed_by %}{{ row.task.completed_by.get_full_name|default:row.task.completed_by.username }}{% else %}-{% endif %}</td>
-                                <td>{% if row.task and row.task.completed_at %}{{ row.task.completed_at|date:"Y-m-d H:i" }}{% else %}-{% endif %}</td>
-                                <td>
-                                    <a href="{% url 'forms_workflows:sub_workflow_detail' row.instance.id %}" class="btn btn-sm btn-outline-secondary">
-                                        <i class="bi bi-eye"></i> View
-                                    </a>
-                                </td>
+                                <td>{% if task.completed_by %}{{ task.completed_by.get_full_name|default:task.completed_by.username }}{% else %}-{% endif %}</td>
+                                <td>{% if task.completed_at %}{{ task.completed_at|date:"Y-m-d H:i" }}{% else %}-{% endif %}</td>
+                                <td>{{ task.comments|default:"-" }}</td>
                             </tr>
                             {% endfor %}
                         </tbody>
@@ -294,6 +314,8 @@
                 </div>
             </div>
         </div>
+        {% endfor %}
+        {% endfor %}
         {% endif %}
 
         {% else %}

{django_forms_workflows-0.20.2 → django_forms_workflows-0.20.3}/django_forms_workflows/views.py

@@ -604,14 +604,13 @@ def submission_detail(request, submission_id):
                     for sg in sub_workflow_groups:
                         sg["section_label"] = sg_name
 
-    # Build merged sub-workflow instance rows that combine instance info
-    # (index, label, status, created) with per-instance approval task info
-    # (assigned_to, completed_by, completed_at) into a single table.
-    sub_workflow_instances_merged = None
-    sub_wf_section_label = None
+    # Build per-instance stage groups so each sub-workflow instance is
+    # rendered as its own section with stage cards (matching parent style).
+    sub_workflow_instance_stages = None
     sub_wfs = list(
         submission.sub_workflows.select_related("definition")
         .prefetch_related(
+            "approval_tasks__workflow_stage",
             "approval_tasks__assigned_to",
             "approval_tasks__assigned_group",
             "approval_tasks__completed_by",
@@ -619,34 +618,53 @@ def submission_detail(request, submission_id):
         .order_by("index")
     )
     if sub_wfs:
-        swf_config = sub_wfs[0].definition if sub_wfs else None
-        sub_wf_section_label = (
-            (
-                swf_config.section_label
-                if swf_config and swf_config.section_label
-                else None
-            )
-            or (swf_config.sub_workflow.form_definition.name if swf_config else None)
-            or "Additional Approvals"
-        )
-        merged_rows = []
+        instance_sections = []
         for swf in sub_wfs:
-            tasks = list(swf.approval_tasks.order_by("-completed_at", "id"))
-            # Pick the most relevant task for display (completed or first pending)
-            display_task = None
-            for t in tasks:
-                if t.status in ("approved", "rejected"):
-                    display_task = t
-                    break
-            if not display_task and tasks:
-                display_task = tasks[0]
-            merged_rows.append(
+            tasks = list(
+                swf.approval_tasks.select_related("workflow_stage").order_by(
+                    "stage_number", "id"
+                )
+            )
+            # Group tasks by workflow_stage (like parent stage_groups)
+            stage_map: dict = {}
+            for task in tasks:
+                stage_key = task.workflow_stage_id or f"flat_{task.stage_number}"
+                if stage_key not in stage_map:
+                    stage_name = (
+                        task.workflow_stage.name
+                        if task.workflow_stage
+                        else f"Step {task.stage_number or 1}"
+                    )
+                    approval_logic = (
+                        task.workflow_stage.approval_logic
+                        if task.workflow_stage
+                        else "all"
+                    )
+                    stage_map[stage_key] = {
+                        "number": task.stage_number or 0,
+                        "name": stage_name,
+                        "approval_logic": approval_logic,
+                        "tasks": [],
+                        "approved_count": 0,
+                        "rejected_count": 0,
+                        "total_count": 0,
+                    }
+                stage_map[stage_key]["tasks"].append(task)
+                stage_map[stage_key]["total_count"] += 1
+                if task.status == "approved":
+                    stage_map[stage_key]["approved_count"] += 1
+                elif task.status == "rejected":
+                    stage_map[stage_key]["rejected_count"] += 1
+
+            instance_sections.append(
                 {
                     "instance": swf,
-                    "task": display_task,
+                    "stage_groups": sorted(
+                        stage_map.values(), key=lambda x: x["number"]
+                    ),
                 }
             )
-        sub_workflow_instances_merged = merged_rows
+        sub_workflow_instance_stages = instance_sections
 
     # Resolve fresh presigned URLs for any file-upload fields
     form_data = _resolve_form_data_urls(submission.form_data)
@@ -678,8 +696,7 @@ def submission_detail(request, submission_id):
             "approval_tasks": approval_tasks,
             "stage_groups": stage_groups,
             "sub_workflow_groups": sub_workflow_groups,
-            "sub_workflow_instances_merged": sub_workflow_instances_merged,
-            "sub_wf_section_label": sub_wf_section_label,
+            "sub_workflow_instance_stages": sub_workflow_instance_stages,
             "form_data": form_data,
             "form_data_ordered": form_data_ordered,
             "approval_field_names": approval_field_names,

{django_forms_workflows-0.20.2 → django_forms_workflows-0.20.3}/pyproject.toml

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