fix: environmental form submission, and minor touch ups to form

hopetambala · Aug 27, 2021 · 1284884 · 1284884
1 parent 777440e
commit 1284884
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 28 deletions.
diff --git a/domains/DataCollection/Forms/SupplementaryForm/configs/envhealth.config.js b/domains/DataCollection/Forms/SupplementaryForm/configs/envhealth.config.js
@@ -62,7 +62,7 @@ const configArray = {
   },
   {
     label: 'environmentalHealth.biggestProblemComm.label',
-    formikKey: 'biggestproblemofcommunity',
+    formikKey: 'biggestproblemofcommunity_v2',
     value: '',
     fieldType: 'selectMulti',
     options: [
@@ -83,14 +83,14 @@ const configArray = {
         value: 'AccessToBathrooms'
       },
       {
-        label: 'environmentalHealth.biggestProblemComm.HouseArrangement',
-        value: 'HouseArrangement'
+        label: 'environmentalHealth.biggestProblemComm.HouseRepairs',
+        value: 'HouseRepairs'
       },
       {
         label: 'global.other',
         value: 'other',
         text: true,
-        textKey: '__biggestproblemofcommunity__other'
+        textKey: '__biggestproblemofcommunity_v2__other'
       }
     ],
     validation: false
@@ -151,7 +151,7 @@ const configArray = {
   },
   {
     label: 'environmentalHealth.bathroomAccess.label',
-    formikKey: 'bathroomAccess',
+    formikKey: 'bathroomAccess_v2',
     value: '',
     fieldType: 'selectMulti',
     options: [
@@ -171,7 +171,7 @@ const configArray = {
         label: 'global.other',
         value: 'other',
         text: true,
-        textKey: '__bathroomAccess__other'
+        textKey: '__bathroomAccess_v2__other'
       }
     ],
     validation: false
@@ -195,7 +195,7 @@ const configArray = {
   },
   {
     label: 'environmentalHealth.clinicAccess.label',
-    formikKey: 'clinicAccess',
+    formikKey: 'clinicAccess_v2',
     value: '',
     fieldType: 'selectMulti',
     options: [
@@ -219,7 +219,7 @@ const configArray = {
         label: 'global.other',
         value: 'other',
         text: true,
-        textKey: '__clinicAccess__other'
+        textKey: '__clinicAccess_v2__other'
       }
     ],
     validation: false
@@ -486,27 +486,30 @@ const configArray = {
   },
   {
     label: 'environmentalHealth.numberChildrenUnder5.label',
-    formikKey: 'numberofChildrenLivinginHouseUndertheAgeof5',
+    formikKey: 'numberofChildrenLivinginHouseUndertheAgeof5_v2',
     value: '',
     fieldType: 'selectMulti',
     options: [
       {
         label: 'environmentalHealth.numberChildrenUnder5.under_5',
-        value: 'under_5'
+        value: 'under_5',
+        text: true,
+        textKey: '__numberofChildrenLivinginHouseUndertheAgeof5_v2__under_5',
+        textQuestion: 'environmentalHealth.numberChildrenUnder5.under_5_textQuestion'
       },
       {
         label: 'environmentalHealth.numberChildrenUnder5.6_12',
-        value: '6_12'
+        value: '6_12',
+        text: true,
+        textKey: '__numberofChildrenLivinginHouseUndertheAgeof5_v2__6_12',
+        textQuestion: 'environmentalHealth.numberChildrenUnder5.6_12_textQuestion'
       },
       {
         label: 'environmentalHealth.numberChildrenUnder5.13_18',
-        value: '13_18'
-      },
-      {
-        label: 'global.other',
-        value: 'other',
+        value: '13_18',
         text: true,
-        textKey: '__numberofChildrenLivinginHouseUndertheAgeof5__other'
+        textKey: '__numberofChildrenLivinginHouseUndertheAgeof5_v2__13_18',
+        textQuestion: 'environmentalHealth.numberChildrenUnder5.13_18_textQuestion'
       }
     ],
     validation: true

diff --git a/domains/DataCollection/Forms/SupplementaryForm/index.js b/domains/DataCollection/Forms/SupplementaryForm/index.js
@@ -104,7 +104,8 @@ const SupplementaryForm = ({
 
         postSupplementaryForm(postParams).then(() => {
           submitAction();
-        }, () => {
+        }, (error) => {
+          console.log(error)
           // perhaps an alert to let the user know there was an error
           setSubmitting(false);
         });

diff --git a/modules/i18n/english/en.json b/modules/i18n/english/en.json
@@ -152,7 +152,7 @@
       "Trash": "Trash",
       "Street": "Street",
       "AccessToBathrooms": "Access to Bathrooms",
-      "HouseArrangement": "House Arrangement"
+      "HouseRepairs": "House Repairs"
     },
     "waterAccess": {
       "label": "Water Access",
@@ -184,7 +184,7 @@
       "None": "None"
     },
     "medicalProblemsGo": "Where do you go for medical problems?",
-    "dentalAccess": "Where do you go for dental problems?",
+    "dentalAccess": "Do you have access to a dentist?",
     "timesPerWeekTrash": {
       "label": "Times per Week Trash is Collected",
       "Never": "Never",
@@ -243,10 +243,13 @@
     },
     "numberIndividualsHouse": "Number of Individuals Living in the House",
     "numberChildrenUnder5": {
-      "label": "Number of children living in this House under age of 5",
+      "label": "Are there any children living in the house in the following age groups?",
       "under_5":"Less than 5",
       "6_12": "6-12",
-      "13_18": "13-18"
+      "13_18": "13-18",
+      "under_5_textQuestion": "How many children under the age of 5?",
+      "6_12_textQuestion": "How many children between the ages of 6 - 12?",
+      "13_18_textQuestion": "How many children between the ages of 13 - 18?"
     }
   },
   "evaluationMedical": {

diff --git a/modules/i18n/kreyol/hk.json b/modules/i18n/kreyol/hk.json
@@ -152,7 +152,7 @@
       "Trash": "Fatra",
       "Street": "Lari",
       "AccessToBathrooms": "Aksè nan twalèt",
-      "HouseArrangement": "Aranjman kay la"
+      "HouseRepairs": "Reparasyon kay"
     },
     "waterAccess": {
       "label": "Akse ak dlo",
@@ -184,7 +184,7 @@
       "None": "Okenn"
     },
     "medicalProblemsGo": "Lew gen problem dokè ki kote wale?",
-    "dentalAccess": "Lew gen problem dan ki kote wale?",
+    "dentalAccess": "Èske ou gen aksè a yon dantis?",
     "timesPerWeekTrash": {
       "label": "Konbyen fwa yo ranmase fatra pa semèn",
       "Never": "Pa janm",
@@ -246,7 +246,10 @@
       "label": "Kantite timoun k ap viv nan kay sa a ki poko gen laj 5 an",
       "under_5":"Mwens pase 5",
       "6_12": "6-12",
-      "13_18": "13-18"
+      "13_18": "13-18",
+      "under_5_textQuestion": "Konbyen timoun ki poko gen 5 an?",
+      "6_12_textQuestion": "Konbyen timoun ki gen laj ant 6 - 12?",
+      "13_18_textQuestion": "Konbyen timoun ki gen laj 13 - 18?"
     }
   },
   "evaluationMedical": {

diff --git a/modules/i18n/spanish/es.json b/modules/i18n/spanish/es.json
@@ -152,7 +152,7 @@
       "Trash": "La Basura",
       "Street": "La Calle",
       "AccessToBathrooms": "El Acceso a Baños",
-      "HouseArrangement": "El Arreglo de casas"
+      "HouseRepairs": "Reparaciones de la casa"
     },
     "waterAccess": {
       "label": "Acceso al agua",
@@ -184,7 +184,7 @@
       "None": "Ninguno"
     },
     "medicalProblemsGo": "¿A dónde vas por problemas médicos?",
-    "dentalAccess": "¿A dónde vas por problemas dentales?",
+    "dentalAccess": "¿Tienes acceso a un dentista?",
     "timesPerWeekTrash": {
       "label": "Veces por semana que se recolecta la basura",
       "Never": "Nunca",
@@ -246,7 +246,10 @@
       "label": "Número de niños menores de 5 años que viven en esta casa",
       "under_5":"Bajo 5",
       "6_12": "6-12",
-      "13_18": "13-18"
+      "13_18": "13-18",
+      "under_5_textQuestion": "¿Cuántos niños menores de 5 años?",
+      "6_12_textQuestion": "¿Cuántos niños entre las edades de 6 a 12 años?",
+      "13_18_textQuestion": "¿Cuántos niños entre las edades de 13 a 18 años?"
     }
   },
   "evaluationMedical": {