Merge pull request #386 from RSE-Sheffield/fix/save-demography

Don't populate pages using default config

Author: Joe-Heffer-Shef

survey/migrations/0021_remove_survey_consent_config_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.1.4 on 2025-09-19 08:19
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("home", "0011_rename_created_on_project_created_at"),
+        ("survey", "0020_alter_survey_project_alter_survey_survey_body_path"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="survey",
+            name="consent_config",
+        ),
+        migrations.RemoveField(
+            model_name="survey",
+            name="demography_config",
+        ),
+    ]

survey/models.py

@@ -87,6 +87,22 @@ def consent_config_default(self) -> dict:
         with self.consent_config_path.open() as file:
             return json.load(file)
 
+    @property
+    def consent_config(self) -> dict:
+        """
+        This survey's welcome/consent question configuration.
+        """
+        # Get the first section
+        return dict(sections=[self.survey_config["sections"][0]])
+
+    @property
+    def demography_config(self) -> dict:
+        """
+        This survey's demographics question configuration.
+        """
+        # Get the final section
+        return dict(sections=[self.survey_config["sections"][-1]])
+
     @property
     def demography_config_default(self) -> dict:
         """

survey/services/survey.py

@@ -88,8 +88,6 @@ def update_consent_demography_config(
         if survey.has_responses:
             raise PermissionDenied("Cannot modify survey with responses")
 
-        survey.consent_config = consent_config
-        survey.demography_config = demography_config
         survey.survey_body_path = survey_body_path
 
         survey.update(consent_config=consent_config, demography_config=demography_config)
@@ -111,8 +109,8 @@ def duplicate_survey(self, user: User, survey: Survey):
         self.update_consent_demography_config(
             user,
             new_survey,
-            consent_config=survey.consent_config_default,
-            demography_config=survey.demography_config_default,
+            consent_config=survey.consent_config,
+            demography_config=survey.demography_config,
             survey_body_path=survey.survey_body_path,
         )
 

survey/templates/survey/survey_configure.html

@@ -12,7 +12,8 @@
                     <i class="bx bxs-buildings"></i> <a href="{% url 'myorganisation' %}">My Organisation</a>
                 </li>
                 <li class="breadcrumb-item" aria-current="page">
-                    <i class="bx bxs-folder-open"></i> <a href="{% url 'project' survey.project.id %}">Project: {{ survey.project.name }}</a>
+                    <i class="bx bxs-folder-open"></i> <a
+                        href="{% url 'project' survey.project.id %}">Project: {{ survey.project.name }}</a>
                 </li>
                 <li class="breadcrumb-item" aria-current="page">
                     <i class="bx bxs-chart"></i> <a href="{% url 'survey' survey.id %}"> Survey: {{ survey.name }}</a>
@@ -35,8 +36,8 @@ <h3>Configure {{ survey.name }}</h3>
         ></div>
     </div>
     {{ csrf | json_script:"csrf" }}
-    {{ survey.consent_config_default | json_script:"consentConfig" }}
-    {{ survey.demography_config_default | json_script:"demographyConfig" }}
+    {{ survey.consent_config | json_script:"consentConfig" }}
+    {{ survey.demography_config | json_script:"demographyConfig" }}
     {{ survey.survey_config | json_script:"configData" }}
     {% vite_client %}
     {% vite_asset "src/main.ts" %}