v0.20.4: Simplify sub-workflow display to one table per instance

- Each sub-workflow instance (Payment 1, Payment 2) renders as a single
  card with all steps as rows in one table
- Columns: Step, Assigned To, Status, Completed By, Completed At, Comments
- Card border reflects instance status (green/blue/red/grey)
- Much cleaner than separate stage cards per step

Author: matteius

django_forms_workflows/templates/django_forms_workflows/submission_detail.html

@@ -242,43 +242,20 @@ <h5 class="mb-3"><i class="bi bi-diagram-3"></i> Approval History</h5>
         {% endfor %}
 
         {% if sub_workflow_instance_stages %}
-        {# ---- Per-instance stage cards (like parent stages) ---- #}
+        {# ---- One table per sub-workflow instance, steps as rows ---- #}
         {% 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
+            {% if section.instance.status == 'rejected' %}border-danger
+            {% elif section.instance.status == 'approved' %}border-success
+            {% elif section.instance.status == 'in_progress' %}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 mb-0">
+                    <table class="table table-sm table-hover mb-0">
                         <thead class="table-light">
                             <tr>
+                                <th>Step</th>
                                 <th>Assigned To</th>
                                 <th>Status</th>
                                 <th>Completed By</th>
@@ -287,8 +264,10 @@ <h5 class="mb-3 mt-4"><i class="bi bi-list-check"></i> {{ section.instance.label
                             </tr>
                         </thead>
                         <tbody>
+                            {% for stage in section.stage_groups %}
                             {% for task in stage.tasks %}
                             <tr>
+                                <td><strong>{{ stage.name }}</strong></td>
                                 <td>
                                     {% if task.assigned_to %}
                                         {{ task.assigned_to.get_full_name|default:task.assigned_to.username }}
@@ -309,13 +288,13 @@ <h5 class="mb-3 mt-4"><i class="bi bi-list-check"></i> {{ section.instance.label
                                 <td>{{ task.comments|default:"-" }}</td>
                             </tr>
                             {% endfor %}
+                            {% endfor %}
                         </tbody>
                     </table>
                 </div>
             </div>
         </div>
         {% endfor %}
-        {% endfor %}
         {% endif %}
 
         {% else %}

pyproject.toml

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