#129 Code refactoring

KrisTheCanadian · Mar 27, 2022 · f62794f · f62794f
1 parent 7f358f6
commit f62794f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/src/components/formLayout/FormLayout.tsx b/src/components/formLayout/FormLayout.tsx
@@ -12,7 +12,6 @@ import { UserContext } from '../../context/UserContext';
 
 export default function FormLayout({ changeState }: any) {
   const [status, setStatus] = useState('1');
-  const [symptomsDone, setSymptomsDone] = useState(false);
   const [count, setCount] = useState(4);
   const [points, setPoints] = useState(0);
   const [symptomsPoints, setSymptomsPoints] = useState(0);
@@ -34,7 +33,7 @@ export default function FormLayout({ changeState }: any) {
     setUserAnswers([...userAnswers, childData]);
   };
 
-  const addSymptoms = (childSymptom: any, childPoint: number, symptomsStatus: boolean) => {
+  const addSymptoms = (childSymptom: any, childPoint: number) => {
     setSymptomsPoints(symptomsPoints + childPoint);
     if (userSymptoms.length === 0) {
       if (Array.isArray(childSymptom)) {
@@ -46,7 +45,6 @@ export default function FormLayout({ changeState }: any) {
     } else {
       setUserSymptoms([...userSymptoms, childSymptom]);
     }
-    setSymptomsDone(symptomsStatus);
   };
 
   const requestDoctor = async () => {

diff --git a/src/components/formLayout/QuestionsDesign/Question3Layout.tsx b/src/components/formLayout/QuestionsDesign/Question3Layout.tsx
@@ -75,16 +75,13 @@ export default function Question3Layout({ changeStatus, changePoints, changeSymp
       setError(true);
     } else {
       changePoints(pointValue);
+      if (symptomsArray.length !== 0) {
+        addSymptoms(symptomsArray, pointValue);
+      }
       if (nextQuestions.length !== 0) {
-        if (symptomsArray.length !== 0) {
-          addSymptoms(symptomsArray, pointValue, false);
-        }
         setValue('4');
         changeSymptoms(nextQuestions);
       } else {
-        if (symptomsArray.length !== 0) {
-          addSymptoms(symptomsArray, pointValue, true);
-        }
         setValue('5');
       }
     }

diff --git a/src/components/formLayout/QuestionsDesign/Question4Layout.tsx b/src/components/formLayout/QuestionsDesign/Question4Layout.tsx
@@ -85,13 +85,12 @@ export default function Question4Layout(
       setAnsTwo(false);
       setAnsThree(false);
       changePoints(pointValue);
+      addSymptoms(symptoms, pointValue);
       if (selection.length - 1 > id) {
         setId(id + 1);
         setCounter(counter + 1);
-        addSymptoms(symptoms, pointValue, false);
       } else {
         changeCount(counter + 1);
-        addSymptoms(symptoms, pointValue, true);
         setValue('5');
       }
     }