django-forms-workflows 0.64.0__tar.gz → 0.64.2__tar.gz

{django_forms_workflows-0.64.0 → django_forms_workflows-0.64.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.64.0
+Version: 0.64.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.64.0 → django_forms_workflows-0.64.2}/django_forms_workflows/forms.py

@@ -1413,15 +1413,15 @@ class ApprovalStepForm(forms.Form):
         FormFields belong to it.
         """
         if self.approval_task.workflow_stage_id:
-            qs = (
-                self.form_definition.fields.exclude(field_type="section")
-                .filter(workflow_stage_id=self.approval_task.workflow_stage_id)
-                .order_by("order")
-            )
+            qs = self.form_definition.fields.filter(
+                workflow_stage_id=self.approval_task.workflow_stage_id
+            ).order_by("order")
         else:
             # Workflow with no stages — no stage-specific fields to show.
             qs = self.form_definition.fields.none()
         for field_def in qs:
+            if field_def.field_type == "section":
+                continue  # sections are visual-only; handled in _build_layout_fields
             self._add_field(field_def)
 
     def _add_field(self, field_def):
@@ -1845,41 +1845,17 @@ class ApprovalStepForm(forms.Form):
     def _setup_layout(self):
         """Setup Crispy Forms layout."""
         self.helper = FormHelper()
-        self.helper.form_method = "post"
-        self.helper.form_class = "needs-validation"
+        self.helper.form_tag = False
 
-        layout_fields = []
+        # Only layout fields for the current approval stage.  Submission
+        # data is rendered separately by the template (via _form_data_rows).
         stage_id = self.approval_task.workflow_stage_id
-
-        # Separate fields into current stage vs other (read-only) groups
-        current_stage_defs = []
-        other_defs = []
-        for field_def in self.form_definition.fields.order_by("order"):
-            if field_def.workflow_stage_id == stage_id:
-                current_stage_defs.append(field_def)
-            else:
-                other_defs.append(field_def)
-
-        # Add submitted data section first (read-only)
-        if other_defs:
-            layout_fields.append(
-                HTML('<h3 class="mb-3">Submitted Information (Read-Only)</h3>')
-            )
-            layout_fields.extend(self._build_layout_fields(other_defs))
-
-        # Add current stage fields section with width support
-        current_stage_fields = self._build_layout_fields(current_stage_defs)
-        if current_stage_fields:
-            layout_fields.append(HTML('<hr class="my-4">'))
-            step_name = self.approval_task.step_name or "Review"
-            layout_fields.append(
-                HTML(f'<h3 class="mb-3">{step_name} - Your Input</h3>')
-            )
-            layout_fields.extend(current_stage_fields)
-
-        self.helper.layout = Layout(*layout_fields)
-        self.helper.form_id = f"approval_form_{self.submission.pk}"
-        self.helper.attrs = {"novalidate": True}
+        current_stage_defs = [
+            f
+            for f in self.form_definition.fields.order_by("order")
+            if f.workflow_stage_id == stage_id
+        ]
+        self.helper.layout = Layout(*self._build_layout_fields(current_stage_defs))
 
     def get_updated_form_data(self):
         """

{django_forms_workflows-0.64.0 → django_forms_workflows-0.64.2}/django_forms_workflows/templates/django_forms_workflows/approve.html

@@ -232,51 +232,18 @@
                 {% if section.fields %}
                 <table class="table table-bordered table-sm mb-0">
                     {% for field in section.fields %}
-                    <tr>
-                        <th style="width: 30%;">{{ field.label }}</th>
-                        <td>
-                            {% if field.value.url %}
-                                {% if field.value.content_type and 'image' in field.value.content_type %}
-                                    <div class="mb-2">
-                                        <img src="{{ field.value.url }}" alt="{{ field.value.filename }}" class="img-fluid" style="max-width: 400px; max-height: 400px;">
-                                    </div>
-                                {% endif %}
-                                <a href="{{ field.value.url }}" target="_blank" class="btn btn-sm btn-outline-primary">
-                                    <i class="bi bi-download"></i> {{ field.value.filename }}
-                                </a>
-                                <small class="text-muted ms-2">
-                                    {% if field.value.size %}({{ field.value.size|filesizeformat }}){% endif %}
-                                </small>
-                            {% elif field.value.path %}
-                                <span class="text-muted">{{ field.value.filename }}</span>
-                                <small class="text-muted ms-2">(File stored but URL unavailable)</small>
-                            {% elif field.value|is_signature %}
-                                <img src="{{ field.value }}" alt="Signature" class="img-fluid" style="max-width: 400px; max-height: 160px; border: 1px solid #dee2e6; border-radius: .375rem;">
-                            {% elif field.value.0.filename %}
-                                <ul class="list-unstyled mb-0">
-                                {% for f in field.value %}
-                                    <li class="mb-1">
-                                        {% if f.url %}
-                                            {% if f.content_type and 'image' in f.content_type %}
-                                                <div class="mb-1">
-                                                    <img src="{{ f.url }}" alt="{{ f.filename }}" class="img-fluid" style="max-width: 200px; max-height: 200px;">
-                                                </div>
-                                            {% endif %}
-                                            <a href="{{ f.url }}" target="_blank" class="btn btn-sm btn-outline-primary">
-                                                <i class="bi bi-download"></i> {{ f.filename }}
-                                            </a>
-                                            <small class="text-muted ms-2">{% if f.size %}({{ f.size|filesizeformat }}){% endif %}</small>
-                                        {% else %}
-                                            <span class="text-muted">{{ f.filename }}</span>
-                                        {% endif %}
-                                    </li>
-                                {% endfor %}
-                                </ul>
-                            {% else %}
-                                {{ field.value }}
-                            {% endif %}
+                    {% if field.type == 'section' %}
+                    <tr class="table-light">
+                        <td colspan="2" class="pt-3 pb-2 px-3">
+                            <h5 class="mb-0">{{ field.label }}</h5>
                         </td>
                     </tr>
+                    {% else %}
+                    <tr>
+                        <th style="width: 30%; vertical-align: top;">{{ field.label }}</th>
+                        <td>{% include "django_forms_workflows/_field_value.html" with entry=field %}</td>
+                    </tr>
+                    {% endif %}
                     {% endfor %}
                 </table>
                 {% else %}

{django_forms_workflows-0.64.0 → django_forms_workflows-0.64.2}/django_forms_workflows/templates/django_forms_workflows/submission_detail.html

@@ -149,55 +149,18 @@
                     <div class="px-3 pb-3">
                         <table class="table table-bordered table-sm mb-0">
                             {% for field in section.fields %}
-                            <tr>
-                                <th style="width: 30%;">{{ field.label }}</th>
-                                <td>
-                                    {% if field.value.url %}
-                                        {# Single file upload with URL #}
-                                        {% if field.value.content_type and 'image' in field.value.content_type %}
-                                            <div class="mb-2">
-                                                <img src="{{ field.value.url }}" alt="{{ field.value.filename }}" class="img-fluid" style="max-width: 400px; max-height: 400px;">
-                                            </div>
-                                        {% endif %}
-                                        <a href="{{ field.value.url }}" target="_blank" class="btn btn-sm btn-outline-primary">
-                                            <i class="bi bi-download"></i> {{ field.value.filename }}
-                                        </a>
-                                        <small class="text-muted ms-2">
-                                            {% if field.value.size %}({{ field.value.size|filesizeformat }}){% endif %}
-                                        </small>
-                                    {% elif field.value.path %}
-                                        {# Single file with path but no URL #}
-                                        <span class="text-muted">{{ field.value.filename }}</span>
-                                        <small class="text-muted ms-2">(File stored but URL unavailable)</small>
-                                    {% elif field.value|is_signature %}
-                                        {# Signature — inline base64 image #}
-                                        <img src="{{ field.value }}" alt="Signature" class="img-fluid" style="max-width: 400px; max-height: 160px; border: 1px solid #dee2e6; border-radius: .375rem;">
-                                    {% elif field.value.0.filename %}
-                                        {# Multi-file upload: list of file dicts #}
-                                        <ul class="list-unstyled mb-0">
-                                        {% for f in field.value %}
-                                            <li class="mb-1">
-                                                {% if f.url %}
-                                                    {% if f.content_type and 'image' in f.content_type %}
-                                                        <div class="mb-1">
-                                                            <img src="{{ f.url }}" alt="{{ f.filename }}" class="img-fluid" style="max-width: 200px; max-height: 200px;">
-                                                        </div>
-                                                    {% endif %}
-                                                    <a href="{{ f.url }}" target="_blank" class="btn btn-sm btn-outline-primary">
-                                                        <i class="bi bi-download"></i> {{ f.filename }}
-                                                    </a>
-                                                    <small class="text-muted ms-2">{% if f.size %}({{ f.size|filesizeformat }}){% endif %}</small>
-                                                {% else %}
-                                                    <span class="text-muted">{{ f.filename }}</span>
-                                                {% endif %}
-                                            </li>
-                                        {% endfor %}
-                                        </ul>
-                                    {% else %}
-                                        {{ field.value }}
-                                    {% endif %}
+                            {% if field.type == 'section' %}
+                            <tr class="table-light">
+                                <td colspan="2" class="pt-3 pb-2 px-3">
+                                    <h5 class="mb-0">{{ field.label }}</h5>
                                 </td>
                             </tr>
+                            {% else %}
+                            <tr>
+                                <th style="width: 30%; vertical-align: top;">{{ field.label }}</th>
+                                <td>{% include "django_forms_workflows/_field_value.html" with entry=field %}</td>
+                            </tr>
+                            {% endif %}
                             {% endfor %}
                         </table>
                     </div>

{django_forms_workflows-0.64.0 → django_forms_workflows-0.64.2}/django_forms_workflows/templates/django_forms_workflows/submission_pdf.html

@@ -284,10 +284,16 @@
     </colgroup>
     <tbody>
     {% for field in section.fields %}
+    {% if field.type == 'section' %}
+    <tr>
+        <td colspan="4" class="step-section-header">{{ field.label }}</td>
+    </tr>
+    {% else %}
     <tr>
         <th>{{ field.label }}</th>
         <td colspan="3">{% with v=field.value %}{% if v|is_signature %}<img src="{{ v }}" style="max-width:360px;max-height:120px;">{% elif v.filename %}{{ v.filename }}{% else %}{{ v }}{% endif %}{% endwith %}</td>
     </tr>
+    {% endif %}
     {% endfor %}
     </tbody>
 </table>

{django_forms_workflows-0.64.0 → django_forms_workflows-0.64.2}/django_forms_workflows/views.py

@@ -3208,12 +3208,11 @@ def _build_approval_step_sections(submission):
 
     # Fields keyed by workflow_stage_id.  Store enough metadata to resolve
     # choice labels (select/radio/multiselect/checkboxes) at display time.
+    # Section headers are included so they render in completed-step displays.
     fields_by_stage: dict = defaultdict(list)
-    for field in (
-        submission.form_definition.fields.filter(workflow_stage__isnull=False)
-        .exclude(field_type="section")
-        .order_by("order")
-    ):
+    for field in submission.form_definition.fields.filter(
+        workflow_stage__isnull=False
+    ).order_by("order"):
         fields_by_stage[field.workflow_stage_id].append(
             {
                 "label": field.field_label,
@@ -3248,6 +3247,9 @@ def _build_approval_step_sections(submission):
 
         visible_fields = []
         for f in field_defs:
+            if f.get("field_type") == "section":
+                visible_fields.append({"label": f["label"], "type": "section"})
+                continue
             lookup_key = f"{f['key']}_{swi_index}" if swi_index else f["key"]
             if lookup_key in form_data:
                 raw_value = form_data[lookup_key]

{django_forms_workflows-0.64.0 → django_forms_workflows-0.64.2}/pyproject.toml

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