Survey: clean up, fixes

FixMyBerlin · May 22, 2024 · c1d5145 · c1d5145
1 parent 619919f
commit c1d5145
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/src/survey-public/components/feedback/Feedback.tsx b/src/survey-public/components/feedback/Feedback.tsx
@@ -106,9 +106,10 @@ export const Feedback: React.FC<Props> = ({
   }
 
   const handleSubmit = (values: Record<string, any>, submitterId?: string) => {
-    if (values[isUserLocationQuestionId!] === "2") values[userLocationQuestionId!] = "" // if "no location" is chosen, set location value to empty string
-    delete values[isUserLocationQuestionId!] // delete map ja/nein response
+    if (values[`single-${isUserLocationQuestionId}`] === "2")
+      values[`map-${userLocationQuestionId}`] = "" // if "no location" is chosen, set location value to empty string
     values = transformValues(values)
+    delete values[isUserLocationQuestionId!] // delete map ja/nein response
     onSubmit({ ...values }, submitterId)
   }
 
@@ -138,14 +139,13 @@ export const Feedback: React.FC<Props> = ({
     ],
   )
 
-  // show map: inital value of is location is set to true
-  const initialValuesKey = `single-${isUserLocationQuestionId}`
-
   return (
     <PublicSurveyForm
       onSubmit={handleSubmit}
       // inital value of is location is set to true
-      initialValues={{ [initialValuesKey]: "1" }}
+      initialValues={{
+        [`single-${isUserLocationQuestionId}`]: "1",
+      }}
       onChangeValues={handleChange}
     >
       {/* clean up BB remove setIsCompleted from FeedbackFirstPage props */}

diff --git a/src/survey-public/components/maps/SurveyMapLine.tsx b/src/survey-public/components/maps/SurveyMapLine.tsx
@@ -99,7 +99,6 @@ export const SurveyMapLine: React.FC<SurveyMapProps> = ({
           layers: ["Netzentwurf"],
         })[0]
       : undefined
-    console.log(line?.properties)
     const lineId = line?.properties["Verbindungs_ID"]
     const lineGeometry = line?.geometry
 

diff --git a/...rvey-public/radnetz-brandenburg/data/Startseite_Platzhalter_Radverkehrstlas.png b/...rvey-public/radnetz-brandenburg/data/Startseite_Platzhalter_Radverkehrstlas.png
diff --git a/src/survey-public/rs8/data/feedback.ts b/src/survey-public/rs8/data/feedback.ts
@@ -42,6 +42,19 @@ export const feedbackDefinition: TFeedback = {
             ],
           },
         },
+      ],
+      buttons: [
+        { label: { de: "Weiter" }, color: "primaryColor", onClick: { action: "nextPage" } },
+        { label: { de: "Zurück" }, color: "white", onClick: { action: "previousPage" } },
+      ],
+    },
+    {
+      id: 2,
+      title: { de: "Ihr Hinweis" },
+      description: {
+        de: "Formulieren Sie hier Ihre Gedanken, Ideen, Anregungen oder Wünsche *",
+      },
+      questions: [
         {
           id: 23,
 
@@ -57,19 +70,6 @@ export const feedbackDefinition: TFeedback = {
             },
           },
         },
-      ],
-      buttons: [
-        { label: { de: "Weiter" }, color: "primaryColor", onClick: { action: "nextPage" } },
-        { label: { de: "Zurück" }, color: "white", onClick: { action: "previousPage" } },
-      ],
-    },
-    {
-      id: 2,
-      title: { de: "Ihr Hinweis" },
-      description: {
-        de: "Formulieren Sie hier Ihre Gedanken, Ideen, Anregungen oder Wünsche *",
-      },
-      questions: [
         {
           id: 31,
           label: { de: "Kategorie" },