Add submit button

rcpch · Oct 16, 2024 · febbc94 · febbc94
1 parent 2d500a2
commit febbc94
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 3 deletions.
diff --git a/epilepsy12/migrations/0038_historicalorganisationalauditsubmission_submitted_and_more.py b/epilepsy12/migrations/0038_historicalorganisationalauditsubmission_submitted_and_more.py
@@ -0,0 +1,26 @@
+# Generated by Django 5.1 on 2024-10-16 10:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "epilepsy12",
+            "0037_alter_historicalorganisationalauditsubmission_s01wteconsultants_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicalorganisationalauditsubmission",
+            name="submitted",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="organisationalauditsubmission",
+            name="submitted",
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/epilepsy12/models_folder/organisational_audit.py b/epilepsy12/models_folder/organisational_audit.py
@@ -63,6 +63,8 @@ class OrganisationalAuditSubmission(TimeStampAbstractBaseClass, UserStampAbstrac
 
     history = HistoricalRecords()
 
+    submitted = models.BooleanField(default=False)
+
     @property
     def _history_user(self):
         return self.updated_by

diff --git a/epilepsy12/views/organisational_audit_views.py b/epilepsy12/views/organisational_audit_views.py
@@ -84,6 +84,9 @@ def group_form_fields(form):
     total_questions = 0
 
     for field in form:
+        if field.name == "submitted":
+            continue
+
         if field.value() is not None and field.value() != "" and field.value() != [] and not field.errors:
             completed = True
             number_completed += 1
@@ -229,9 +232,14 @@ def _organisational_audit(request, group_id, group_model, group_field):
         questions_by_section, number_completed, total_questions = group_form_fields(
             form
         )
+
+        if number_completed != total_questions:
+            form.instance.submitted = False
+
         context["questions_by_section"] = questions_by_section
         context["number_completed"] = number_completed
         context["total_questions"] = total_questions
+        context["submitted"] = submission.submitted if submission else False
         context["percentage_completed"] = int(
             (number_completed / total_questions) * 100
         )
@@ -249,9 +257,11 @@ def _organisational_audit(request, group_id, group_model, group_field):
     form = get_submission_form(submission, last_submission)
 
     questions_by_section, number_completed, total_questions = group_form_fields(form)
+
     context["questions_by_section"] = questions_by_section
     context["number_completed"] = number_completed
     context["total_questions"] = total_questions
+    context["submitted"] = submission.submitted if submission else False
     context["percentage_completed"] = int((number_completed / total_questions) * 100)
     context["form"] = form
 

diff --git a/static/styles/buttons.css b/static/styles/buttons.css
@@ -300,6 +300,10 @@ a.ui.button {
   color: var(--rcpch_pink);
 }
 
+.rcpch_strong_green.icon {
+  color: var(--rcpch_strong_green);
+}
+
 .rcpch_red.icon {
   color: var(--rcpch_red_light_tint2);
 }

diff --git a/templates/epilepsy12/organisational_audit.html b/templates/epilepsy12/organisational_audit.html
@@ -3,7 +3,7 @@
 <div class="ui rcpch container main_content">
     {% if submission_period.is_open %}
         <h2 class="org-audit-header">Organisational Audit {{submission_period.year}} - {{group_name}}</h2>
-        <form class="ui rcpch form" method="POST" hx-post="{{ request.path }}" hx-trigger="input delay:0.5s">
+        <form class="ui rcpch form" method="POST" hx-post="{{ request.path }}" hx-trigger="input delay:0.5s,submit">
             {% include 'epilepsy12/partials/organisational_audit_form.html' %}
         </form>
     {% else %}

diff --git a/templates/epilepsy12/partials/organisational_audit_form.html b/templates/epilepsy12/partials/organisational_audit_form.html
@@ -4,10 +4,22 @@
 
 <div class="org-audit-progress">
     <div class="org-audit-progress--label">
-        {{number_completed}} of {{total_questions}} complete
+        <div>
+            {% if submitted %}
+                <i class="rcpch_strong_green check circle outline icon"></i> Complete
+            {% else %}
+                {{number_completed}} of {{total_questions}} complete
+            {% endif %}
+        </div>
+        <div>
+            {% if not submitted and number_completed == total_questions %}
+                <input type="hidden" value="true" name="submitted" />
+                <input class="ui rcpch_primary button" type="submit" value="Submit">
+            {% endif %}
+        </div>
     </div>
 </div>
-
+    
 {% for section, questions in questions_by_section.items %}
     <div>
         <h3 class="org-audit-section-title">