django-forms-workflows 0.19.0__tar.gz → 0.19.2__tar.gz

{django_forms_workflows-0.19.0 → django_forms_workflows-0.19.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.19.0
+Version: 0.19.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.19.0 → django_forms_workflows-0.19.2}/django_forms_workflows/tasks.py

@@ -46,11 +46,22 @@ except Exception:  # pragma: no cover
 
 
 def _base_url() -> str:
-    return (
-        getattr(settings, "FORMS_WORKFLOWS_BASE_URL", None)
-        or getattr(settings, "SITE_BASE_URL", None)
-        or ""
+    """Return the base URL (scheme + domain) for building absolute links in emails.
+
+    Checks, in order:
+    1. ``settings.FORMS_WORKFLOWS_BASE_URL``
+    2. ``settings.SITE_BASE_URL``
+    3. First entry in ``settings.CSRF_TRUSTED_ORIGINS``
+    """
+    url = getattr(settings, "FORMS_WORKFLOWS_BASE_URL", None) or getattr(
+        settings, "SITE_BASE_URL", None
     )
+    if url:
+        return url
+    origins = getattr(settings, "CSRF_TRUSTED_ORIGINS", None)
+    if origins:
+        return origins[0]
+    return ""
 
 
 def _abs(url_path: str) -> str:

{django_forms_workflows-0.19.0 → django_forms_workflows-0.19.2}/django_forms_workflows/templates/django_forms_workflows/submission_detail.html

@@ -241,6 +241,75 @@
         </div>
         {% endfor %}
 
+        {% if sub_workflow_groups %}
+        {# ---- Sub-workflow tasks (detached child workflow stages) ---- #}
+        <h5 class="mb-3 mt-4"><i class="bi bi-diagram-2"></i> Sub-Workflow Approvals</h5>
+        {% for stage in sub_workflow_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>{{ 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>
+            <div class="card-body p-0">
+                <div class="table-responsive">
+                    <table class="table table-sm mb-0">
+                        <thead>
+                            <tr>
+                                <th>Assigned To</th>
+                                <th>Status</th>
+                                <th>Completed By</th>
+                                <th>Completed At</th>
+                                <th>Comments</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {% for task in stage.tasks %}
+                            <tr>
+                                <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>
+                                    {% 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>
+                                    {% 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>
+                            </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+        {% endfor %}
+        {% endif %}
+
         {% else %}
         {# ---- Legacy flat workflow ---- #}
         <div class="card mb-4">

{django_forms_workflows-0.19.0 → django_forms_workflows-0.19.2}/django_forms_workflows/views.py

@@ -544,23 +544,37 @@ def submission_detail(request, submission_id):
         "workflow_stage", "assigned_to", "assigned_group", "completed_by"
     ).order_by("stage_number", "-created_at")
 
-    # Build stage groups if any tasks are linked to a workflow stage
+    # Build stage groups if any tasks are linked to a workflow stage.
+    # Separate parent-workflow tasks from sub-workflow tasks so they
+    # render in distinct sections.
     stage_groups = None
+    sub_workflow_groups = None
     if approval_tasks.filter(workflow_stage__isnull=False).exists():
-        groups: dict = {}
+        # Determine which stage IDs belong to the parent workflow
+        workflow = getattr(submission.form_definition, "workflow", None)
+        parent_stage_ids = set()
+        if workflow:
+            parent_stage_ids = set(workflow.stages.values_list("id", flat=True))
+
+        parent_groups: dict = {}
+        sub_groups: dict = {}
         for task in approval_tasks:
-            stage_key = task.stage_number or 0
-            if stage_key not in groups:
+            if not task.workflow_stage_id:
+                continue
+            is_parent = task.workflow_stage_id in parent_stage_ids
+            target = parent_groups if is_parent else sub_groups
+            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 {stage_key}"
+                    else f"Stage {task.stage_number or 0}"
                 )
                 approval_logic = (
                     task.workflow_stage.approval_logic if task.workflow_stage else "all"
                 )
-                groups[stage_key] = {
-                    "number": stage_key,
+                target[stage_key] = {
+                    "number": task.stage_number or 0,
                     "name": stage_name,
                     "approval_logic": approval_logic,
                     "tasks": [],
@@ -568,13 +582,17 @@ def submission_detail(request, submission_id):
                     "rejected_count": 0,
                     "total_count": 0,
                 }
-            groups[stage_key]["tasks"].append(task)
-            groups[stage_key]["total_count"] += 1
+            target[stage_key]["tasks"].append(task)
+            target[stage_key]["total_count"] += 1
             if task.status == "approved":
-                groups[stage_key]["approved_count"] += 1
+                target[stage_key]["approved_count"] += 1
             elif task.status == "rejected":
-                groups[stage_key]["rejected_count"] += 1
-        stage_groups = sorted(groups.values(), key=lambda x: x["number"])
+                target[stage_key]["rejected_count"] += 1
+
+        if parent_groups:
+            stage_groups = sorted(parent_groups.values(), key=lambda x: x["number"])
+        if sub_groups:
+            sub_workflow_groups = sorted(sub_groups.values(), key=lambda x: x["number"])
 
     # Resolve fresh presigned URLs for any file-upload fields
     form_data = _resolve_form_data_urls(submission.form_data)
@@ -605,6 +623,7 @@ def submission_detail(request, submission_id):
             "submission": submission,
             "approval_tasks": approval_tasks,
             "stage_groups": stage_groups,
+            "sub_workflow_groups": sub_workflow_groups,
             "form_data": form_data,
             "form_data_ordered": form_data_ordered,
             "approval_field_names": approval_field_names,

{django_forms_workflows-0.19.0 → django_forms_workflows-0.19.2}/pyproject.toml

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