django-forms-workflows 0.33.2__tar.gz → 0.34.0__tar.gz

{django_forms_workflows-0.33.2 → django_forms_workflows-0.34.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.33.2
+Version: 0.34.0
 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.33.2 → django_forms_workflows-0.34.0}/django_forms_workflows/forms.py

@@ -13,7 +13,9 @@ from datetime import date, datetime
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import HTML, Column, Div, Field, Layout, Row, Submit
 from django import forms
-from django.core.validators import RegexValidator
+from django.core.exceptions import ValidationError
+from django.core.validators import FileExtensionValidator, RegexValidator
+from django.utils.deconstruct import deconstructible
 
 logger = logging.getLogger(__name__)
 
@@ -38,6 +40,52 @@ def _evaluate_formula(formula: str, data: dict) -> str:
     )
 
 
+# ---------------------------------------------------------------------------
+# File upload validators
+# ---------------------------------------------------------------------------
+
+
+@deconstructible
+class MaxFileSizeValidator:
+    """Validate that a file does not exceed a given size in megabytes."""
+
+    message = "File size must not exceed %(max_size)s MB."
+    code = "file_too_large"
+
+    def __init__(self, max_size_mb):
+        self.max_size_mb = max_size_mb
+
+    def __call__(self, value):
+        if hasattr(value, "size") and value.size > self.max_size_mb * 1024 * 1024:
+            raise ValidationError(
+                self.message,
+                code=self.code,
+                params={"max_size": self.max_size_mb},
+            )
+
+    def __eq__(self, other):
+        return (
+            isinstance(other, MaxFileSizeValidator)
+            and self.max_size_mb == other.max_size_mb
+        )
+
+
+def _build_file_validators(field_def):
+    """Return a list of validators for file fields based on field definition."""
+    validators = []
+    if field_def.allowed_extensions:
+        exts = [
+            e.strip().lower()
+            for e in field_def.allowed_extensions.split(",")
+            if e.strip()
+        ]
+        if exts:
+            validators.append(FileExtensionValidator(allowed_extensions=exts))
+    if field_def.max_file_size_mb:
+        validators.append(MaxFileSizeValidator(field_def.max_file_size_mb))
+    return validators
+
+
 # ---------------------------------------------------------------------------
 # Multi-file upload support
 # ---------------------------------------------------------------------------
@@ -373,7 +421,22 @@ class DynamicForm(forms.Form):
             )
 
         elif field_def.field_type == "file":
-            self.fields[field_def.field_name] = forms.FileField(**field_args)
+            file_validators = _build_file_validators(field_def)
+            accept_attrs = {}
+            if field_def.allowed_extensions:
+                exts = ",".join(
+                    f".{e.strip()}"
+                    for e in field_def.allowed_extensions.split(",")
+                    if e.strip()
+                )
+                accept_attrs["accept"] = exts
+            self.fields[field_def.field_name] = forms.FileField(
+                validators=file_validators,
+                widget=forms.ClearableFileInput(attrs=accept_attrs)
+                if accept_attrs
+                else forms.ClearableFileInput(),
+                **field_args,
+            )
 
         elif field_def.field_type == "multifile":
             self.fields[field_def.field_name] = MultipleFileField(
@@ -679,6 +742,32 @@ class DynamicForm(forms.Form):
                     }
                 )
 
+            # File type / size validation rules
+            if field.field_type in ("file", "multifile") and field.allowed_extensions:
+                exts = [
+                    e.strip().lower()
+                    for e in field.allowed_extensions.split(",")
+                    if e.strip()
+                ]
+                if exts:
+                    readable = ", ".join(f".{e}" for e in exts)
+                    validation_rules.append(
+                        {
+                            "type": "file_type",
+                            "value": ",".join(exts),
+                            "message": f"Allowed file types: {readable}",
+                        }
+                    )
+
+            if field.field_type in ("file", "multifile") and field.max_file_size_mb:
+                validation_rules.append(
+                    {
+                        "type": "file_size",
+                        "value": field.max_file_size_mb,
+                        "message": f"File size must not exceed {field.max_file_size_mb} MB",
+                    }
+                )
+
             # Custom validation rules from field config
             if hasattr(field, "validation_rules") and field.validation_rules:
                 if isinstance(field.validation_rules, str):
@@ -940,6 +1029,7 @@ class ApprovalStepForm(forms.Form):
             )
 
         elif field_def.field_type == "file":
+            file_validators = _build_file_validators(field_def)
             accept_attrs = {}
             if field_def.allowed_extensions:
                 exts = ",".join(
@@ -952,6 +1042,7 @@ class ApprovalStepForm(forms.Form):
                 required=field_args.get("required", False),
                 label=field_def.field_label,
                 help_text=field_def.help_text,
+                validators=file_validators,
                 widget=forms.ClearableFileInput(attrs=accept_attrs),
             )
 

{django_forms_workflows-0.33.2 → django_forms_workflows-0.34.0}/django_forms_workflows/static/django_forms_workflows/js/form-enhancements.js

@@ -115,6 +115,8 @@ class FormEnhancements {
         } else if (field.type === 'radio') {
             const checked = this.form.querySelector(`input[name="${field.name}"]:checked`);
             return checked ? checked.value : null;
+        } else if (field.type === 'file') {
+            return field.files && field.files.length > 0 ? field.files : null;
         } else if (field.multiple) {
             const values = Array.from(field.selectedOptions).map(opt => opt.value);
             return values.length > 0 ? values : null;
@@ -444,6 +446,9 @@ class FormEnhancements {
     validateRule(value, rule) {
         switch (rule.type) {
             case 'required':
+                if (value instanceof FileList) {
+                    return value.length > 0;
+                }
                 return value !== null && value !== undefined && value !== '' &&
                        (!Array.isArray(value) || value.length > 0);
             case 'email':
@@ -465,6 +470,30 @@ class FormEnhancements {
                 return parseFloat(value) <= parseFloat(rule.value);
             case 'pattern':
                 return new RegExp(rule.value).test(value);
+            case 'file_type': {
+                // rule.value is a comma-separated list of allowed extensions (e.g. "pdf,doc,docx")
+                if (!value || !(value instanceof FileList) || value.length === 0) return true;
+                const allowed = rule.value.split(',').map(ext => ext.trim().toLowerCase().replace(/^\./, ''));
+                for (let i = 0; i < value.length; i++) {
+                    const fileName = value[i].name || '';
+                    const ext = fileName.split('.').pop().toLowerCase();
+                    if (!allowed.includes(ext)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+            case 'file_size': {
+                // rule.value is maximum size in MB
+                if (!value || !(value instanceof FileList) || value.length === 0) return true;
+                const maxBytes = rule.value * 1024 * 1024;
+                for (let i = 0; i < value.length; i++) {
+                    if (value[i].size > maxBytes) {
+                        return false;
+                    }
+                }
+                return true;
+            }
             case 'custom':
                 return rule.validator(value);
             default:

{django_forms_workflows-0.33.2 → django_forms_workflows-0.34.0}/django_forms_workflows/templates/django_forms_workflows/approve.html

@@ -210,34 +210,108 @@
             </div>
         </div>
 
+        {% if resolved_attachments %}
+        <div class="card mb-4">
+            <div class="card-header">
+                <h5 class="mb-0"><i class="bi bi-paperclip"></i> Attachments</h5>
+            </div>
+            <div class="card-body">
+                <ul class="list-unstyled mb-0">
+                {% for att in resolved_attachments %}
+                    <li class="mb-2">
+                        {% if att.url %}
+                            <a href="{{ att.url }}" target="_blank" class="btn btn-sm btn-outline-primary">
+                                <i class="bi bi-download"></i> {{ att.filename }}
+                            </a>
+                        {% else %}
+                            <span class="text-muted"><i class="bi bi-file-earmark"></i> {{ att.filename }}</span>
+                        {% endif %}
+                    </li>
+                {% endfor %}
+                </ul>
+            </div>
+        </div>
+        {% endif %}
+
         <!-- Completed Approval Steps (show previous approvals) -->
-        {% for step in approval_steps %}
-            {% if step.is_completed %}
-            <div class="card mb-4 border-success">
-                <div class="card-header bg-success text-white">
-                    <h5 class="mb-0"><i class="bi bi-check-circle"></i> Step {{ step.number }}: {{ step.group_name }}
-                        <span class="badge bg-light text-success float-end">Completed</span>
-                    </h5>
+        {% if approval_step_sections %}
+        {% for section in approval_step_sections %}
+        <div class="card mb-4 {% if section.status == 'approved' %}border-success{% elif section.status == 'rejected' %}border-danger{% endif %}">
+            <div class="card-header {% if section.status == 'approved' %}bg-success{% elif section.status == 'rejected' %}bg-danger{% else %}bg-secondary{% endif %} text-white">
+                <h5 class="mb-0">
+                    <i class="bi {% if section.status == 'approved' %}bi-check-circle{% elif section.status == 'rejected' %}bi-x-circle{% else %}bi-hourglass{% endif %}"></i>
+                    {{ section.step_name }}
+                    {% if section.status == 'approved' %}
+                    <span class="badge bg-light text-success float-end">Approved</span>
+                    {% elif section.status == 'rejected' %}
+                    <span class="badge bg-light text-danger float-end">Rejected</span>
+                    {% endif %}
+                </h5>
+            </div>
+            <div class="card-body">
+                {% if section.completed_by %}
+                <div class="text-muted small mb-2">
+                    by <strong>{{ section.completed_by }}</strong>{% if section.completed_at %} &middot; {{ section.completed_at|date:"N j, Y \a\t g:i a" }}{% endif %}
                 </div>
-                <div class="card-body">
-                    <table class="table table-bordered table-sm mb-0">
-                        {% for field_info in step.fields %}
-                            {% with field_name=field_info.field_name %}
-                                {% if field_name in form_data %}
-                                <tr>
-                                    <th style="width: 30%;">{{ field_info.field_label }}</th>
-                                    <td>{{ form_data|get_item:field_name }}</td>
-                                </tr>
+                {% endif %}
+                {% if section.comments %}
+                <p class="mb-2 small fst-italic text-secondary">&#8220;{{ section.comments }}&#8221;</p>
+                {% endif %}
+                {% 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 %}
-                            {% endwith %}
-                        {% empty %}
-                            <tr><td colspan="2" class="text-muted">No fields recorded for this step.</td></tr>
-                        {% endfor %}
-                    </table>
-                </div>
+                                <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.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 %}
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </table>
+                {% else %}
+                <p class="text-muted mb-0">No fields recorded for this step.</p>
+                {% endif %}
             </div>
-            {% endif %}
+        </div>
         {% endfor %}
+        {% endif %}
 
         <!-- Approval Form with Step Fields -->
         <form method="post" enctype="multipart/form-data" data-loading-message="Processing your decision...">
@@ -325,22 +399,6 @@
         </div>
         {% endif %}
 
-        <!-- Future Steps Preview (greyed out) -->
-        {% for step in approval_steps %}
-            {% if step.number > current_step_number %}
-            <div class="card mb-4 border-secondary opacity-50">
-                <div class="card-header bg-light text-muted">
-                    <h5 class="mb-0"><i class="bi bi-hourglass"></i> Step {{ step.number }}: {{ step.group_name }}
-                        <span class="badge bg-secondary float-end">Pending</span>
-                    </h5>
-                </div>
-                <div class="card-body">
-                    <p class="text-muted mb-0"><em>This step will be available after all previous steps are approved.</em></p>
-                </div>
-            </div>
-            {% endif %}
-        {% endfor %}
-
         {% else %}
         <!-- Standard Approval (No Step Fields) -->
         <!-- Submission Data -->
@@ -380,6 +438,115 @@
                 </table>
             </div>
         </div>
+        {% if resolved_attachments %}
+        <div class="card mb-4">
+            <div class="card-header">
+                <h5 class="mb-0"><i class="bi bi-paperclip"></i> Attachments</h5>
+            </div>
+            <div class="card-body">
+                <ul class="list-unstyled mb-0">
+                {% for att in resolved_attachments %}
+                    <li class="mb-2">
+                        {% if att.url %}
+                            <a href="{{ att.url }}" target="_blank" class="btn btn-sm btn-outline-primary">
+                                <i class="bi bi-download"></i> {{ att.filename }}
+                            </a>
+                        {% else %}
+                            <span class="text-muted"><i class="bi bi-file-earmark"></i> {{ att.filename }}</span>
+                        {% endif %}
+                    </li>
+                {% endfor %}
+                </ul>
+            </div>
+        </div>
+        {% endif %}
+
+        <!-- Prior Approval Step Responses (standard approval path) -->
+        {% if approval_step_sections %}
+        <div class="card mb-4">
+            <div class="card-header bg-light">
+                <h5 class="mb-0"><i class="bi bi-pencil-square"></i> Prior Approval Step Responses</h5>
+            </div>
+            <div class="card-body p-0">
+                {% for section in approval_step_sections %}
+                <div {% if not forloop.last %}class="border-bottom"{% endif %}>
+                    <div class="px-3 pt-3 pb-1 d-flex justify-content-between align-items-start flex-wrap gap-2">
+                        <div>
+                            <div class="d-flex align-items-center gap-2 mb-1">
+                                <h6 class="mb-0 fw-bold">{{ section.step_name }}</h6>
+                                {% if section.status == "approved" %}
+                                <span class="badge bg-success">&#10003; Approved</span>
+                                {% elif section.status == "rejected" %}
+                                <span class="badge bg-danger">&#10007; Rejected</span>
+                                {% endif %}
+                            </div>
+                            {% if section.completed_by %}
+                            <div class="text-muted small">
+                                by <strong>{{ section.completed_by }}</strong>{% if section.completed_at %} &middot; {{ section.completed_at|date:"N j, Y \a\t g:i a" }}{% endif %}
+                            </div>
+                            {% endif %}
+                            {% if section.comments %}
+                            <p class="mb-0 mt-1 small fst-italic text-secondary">&#8220;{{ section.comments }}&#8221;</p>
+                            {% endif %}
+                        </div>
+                    </div>
+                    {% if section.fields %}
+                    <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 %}
+                                        {% 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.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 %}
+                                </td>
+                            </tr>
+                            {% endfor %}
+                        </table>
+                    </div>
+                    {% endif %}
+                </div>
+                {% endfor %}
+            </div>
+        </div>
+        {% endif %}
+
         <!-- Approval Decision -->
         <div class="card mb-4 border-success">
             <div class="card-header bg-light">

{django_forms_workflows-0.33.2 → django_forms_workflows-0.34.0}/django_forms_workflows/templates/django_forms_workflows/submission_detail.html

@@ -136,6 +136,31 @@
             </div>
         </div>
 
+        <!-- Model-level Attachments (e.g. migrated SharePoint documents) -->
+        {% if resolved_attachments %}
+        <div class="card mb-4">
+            <div class="card-header">
+                <h5 class="mb-0"><i class="bi bi-paperclip"></i> Attachments</h5>
+            </div>
+            <div class="card-body">
+                <ul class="list-unstyled mb-0">
+                {% for att in resolved_attachments %}
+                    <li class="mb-2">
+                        {% if att.url %}
+                            <a href="{{ att.url }}" target="_blank" class="btn btn-sm btn-outline-primary">
+                                <i class="bi bi-download"></i> {{ att.filename }}
+                            </a>
+                        {% else %}
+                            <span class="text-muted"><i class="bi bi-file-earmark"></i> {{ att.filename }}</span>
+                            <small class="text-muted ms-2">(URL unavailable)</small>
+                        {% endif %}
+                    </li>
+                {% endfor %}
+                </ul>
+            </div>
+        </div>
+        {% endif %}
+
         <!-- Approval Step Responses (fields filled in by each approver, separate from original submission) -->
         {% if approval_step_sections and not hide_approval_history %}
         <div class="card mb-4">
@@ -171,7 +196,49 @@
                             {% for field in section.fields %}
                             <tr>
                                 <th style="width: 30%;">{{ field.label }}</th>
-                                <td>{{ field.value }}</td>
+                                <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.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 %}
+                                </td>
                             </tr>
                             {% endfor %}
                         </table>

{django_forms_workflows-0.33.2 → django_forms_workflows-0.34.0}/django_forms_workflows/templates/django_forms_workflows/submission_pdf.html

@@ -250,6 +250,15 @@
     </tbody>
 </table>
 
+{% if resolved_attachments %}
+<h3 style="margin-top: 20px;">Attachments</h3>
+<ul>
+{% for att in resolved_attachments %}
+    <li>{{ att.filename }}</li>
+{% endfor %}
+</ul>
+{% endif %}
+
 {% for section in approval_step_sections %}
 <div class="step-section-header">
     <span class="step-name-cell">{{ section.step_name }}</span>