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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.20.0
+Version: 0.20.2
 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/migrations/0043_fix_form_data_decimal_encoding.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.2.7 on 2026-03-12 20:30
+
+import django.core.serializers.json
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("django_forms_workflows", "0042_add_sub_workflow_section_label"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="formsubmission",
+            name="form_data",
+            field=models.JSONField(
+                encoder=django.core.serializers.json.DjangoJSONEncoder,
+                help_text="The actual form responses",
+            ),
+        ),
+    ]

{django_forms_workflows-0.20.0 → django_forms_workflows-0.20.2}/django_forms_workflows/models.py

@@ -6,6 +6,7 @@ Database-driven form definitions with approval workflows and external data integ
 
 from django.conf import settings
 from django.contrib.auth.models import Group
+from django.core.serializers.json import DjangoJSONEncoder
 from django.db import models
 
 
@@ -1149,7 +1150,10 @@ class FormSubmission(models.Model):
     )
 
     # Submission Data
-    form_data = models.JSONField(help_text="The actual form responses")
+    form_data = models.JSONField(
+        help_text="The actual form responses",
+        encoder=DjangoJSONEncoder,
+    )
     attachments = models.JSONField(
         default=list, blank=True, help_text="List of uploaded file paths"
     )

{django_forms_workflows-0.20.0 → django_forms_workflows-0.20.2}/django_forms_workflows/templates/django_forms_workflows/submission_detail.html

@@ -241,67 +241,52 @@
         </div>
         {% endfor %}
 
-        {% if sub_workflow_groups %}
-        {# ---- Sub-workflow tasks ---- #}
-        {% for stage in sub_workflow_groups %}
-        {% if forloop.first %}
-        <h5 class="mb-3 mt-4"><i class="bi bi-list-check"></i> {{ stage.section_label|default:"Additional Approvals" }}</h5>
-        {% endif %}
-        <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>{{ 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>
-                    {% elif stage.approval_logic == "sequence" %}
-                        <span class="badge bg-light text-dark ms-2" style="font-size:11px;">Sequential</span>
-                    {% endif %}
-                </span>
-                <span class="badge bg-light text-dark">{{ stage.approved_count }}/{{ stage.total_count }} approved</span>
-            </div>
+        {% 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">
             <div class="card-body p-0">
                 <div class="table-responsive">
-                    <table class="table table-sm mb-0">
-                        <thead>
+                    <table class="table table-sm table-hover 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>Comments</th>
+                                <th></th>
                             </tr>
                         </thead>
                         <tbody>
-                            {% for task in stage.tasks %}
+                            {% for row in sub_workflow_instances_merged %}
                             <tr>
+                                <td>{{ row.instance.index }}</td>
+                                <td>{{ row.instance.label }}</td>
                                 <td>
-                                    {% 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>
+                                    {% 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 %}
                                     {% else %}-{% endif %}
                                 </td>
                                 <td>
-                                    {% 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>
+                                    {% 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>
                                     {% endif %}
                                 </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>
+                                <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>
                             </tr>
                             {% endfor %}
                         </tbody>
@@ -309,7 +294,6 @@
                 </div>
             </div>
         </div>
-        {% endfor %}
         {% endif %}
 
         {% else %}
@@ -364,54 +348,7 @@
 
         {% endif %}
 
-        <!-- Sub-workflows -->
-        {% with sub_wfs=submission.sub_workflows.all %}
-        {% if sub_wfs %}
-        <div class="card mb-4">
-            <div class="card-header bg-light">
-                <h5 class="mb-0"><i class="bi bi-diagram-2"></i> Payment Approvals</h5>
-            </div>
-            <div class="card-body p-0">
-                <table class="table table-hover mb-0">
-                    <thead class="table-light">
-                        <tr>
-                            <th>#</th>
-                            <th>Label</th>
-                            <th>Status</th>
-                            <th>Created</th>
-                            <th></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for swf in sub_wfs %}
-                        <tr>
-                            <td>{{ swf.index }}</td>
-                            <td>{{ swf.label }}</td>
-                            <td>
-                                {% if swf.status == 'approved' %}
-                                    <span class="badge bg-success">Approved</span>
-                                {% elif swf.status == 'rejected' %}
-                                    <span class="badge bg-danger">Rejected</span>
-                                {% elif swf.status == 'in_progress' %}
-                                    <span class="badge bg-primary">In Progress</span>
-                                {% else %}
-                                    <span class="badge bg-secondary">Pending</span>
-                                {% endif %}
-                            </td>
-                            <td>{{ swf.created_at|date:"M d, Y" }}</td>
-                            <td>
-                                <a href="{% url 'forms_workflows:sub_workflow_detail' swf.id %}" class="btn btn-sm btn-outline-secondary">
-                                    <i class="bi bi-eye"></i> View
-                                </a>
-                            </td>
-                        </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-        </div>
-        {% endif %}
-        {% endwith %}
+
 
         <!-- Actions -->
         <div class="mt-3">

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

@@ -600,11 +600,54 @@ def submission_detail(request, submission_id):
                     for sg in sub_workflow_groups:
                         sg["section_label"] = sub_wf_config.section_label
                 elif sub_wf_config:
-                    # Fall back to the sub-workflow's form definition name
                     sg_name = sub_wf_config.sub_workflow.form_definition.name
                     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
+    sub_wfs = list(
+        submission.sub_workflows.select_related("definition")
+        .prefetch_related(
+            "approval_tasks__assigned_to",
+            "approval_tasks__assigned_group",
+            "approval_tasks__completed_by",
+        )
+        .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 = []
+        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(
+                {
+                    "instance": swf,
+                    "task": display_task,
+                }
+            )
+        sub_workflow_instances_merged = merged_rows
+
     # Resolve fresh presigned URLs for any file-upload fields
     form_data = _resolve_form_data_urls(submission.form_data)
     form_data_ordered = _build_ordered_form_data(submission, form_data)
@@ -635,6 +678,8 @@ 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,
             "form_data": form_data,
             "form_data_ordered": form_data_ordered,
             "approval_field_names": approval_field_names,

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

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