Merge branch 'Last-Fixes-of-MC' into 'master'

Final fixes of MC

See merge request !48

web-app/backend/server.py

@@ -269,7 +269,7 @@ def predict():
         fh.write(base64.decodebytes(decoded))
 
     pil_image = Image.open(io.BytesIO(decoded)).resize(
-        (224, 224), Image.LANCZOS).convert("RGB")
+        (224, 224), Image.Resampling.LANCZOS).convert("RGB")
 
     image = pil_image
 
@@ -466,7 +466,7 @@ def mentalChromScores():
     score = body['score']
     actualResult = body['actualResult']
     predResult = body['predResult']
-    createdTime = body['createdTime']
+    createdTime = datetime.now().strftime("%d/%m/%Y %H:%M:%S")
     totalTime = body['totalTime']
     candidateID = body['candidateID']
     answerImage = body['answerImage']
@@ -633,7 +633,7 @@ def getattentionSpanscores():
 # Running app
 if __name__ == "__main__":
     app.secret_key = os.urandom(24)
-    app.run(host="172.20.10.7", ssl_context='adhoc',
+    app.run(host="192.168.120.144", ssl_context='adhoc',
             debug=True, use_reloader=False)
 
 flask_cors.CORS(app, expose_headers='Authorization')

web-app/frontend/src/components/activities/mentalChronometryEval/coding/CodingContainer.jsx

@@ -23,34 +23,16 @@ const CodingContainer = ({ nextActivity }) => {
   const [answerImage] = useState([]);
   const [actualResult, setActualResul] = useState([
     "square",
-    // "circle",
-    // "triangle",
-    // "circle",
     "circle",
-    // "triangle",
-    // "circle",
-    // "square",
     "circle",
-    // "circle",
-    // "square",
-    // "triangle",
     "triangle",
   ]);
   const [isCancelled, setIsCancelled] = useState(false);
 
   const [drawingPad, setDrawingPad] = useState([
     "c",
-    // "s",
-    // "c",
-    // "r",
     "s",
-    // "c",
-    // "r",
-    // "c",
     "c",
-    // "s",
-    // "c",
-    // "s",
     "s",
   ]);
 
@@ -134,7 +116,7 @@ const CodingContainer = ({ nextActivity }) => {
         setFinalScore(result);
       }
     }
-    finalResult = result;
+    finalResult = result-1;
     console.log(result);
   };
 
@@ -183,11 +165,13 @@ const CodingContainer = ({ nextActivity }) => {
       setPatternNo(patternNo + 1);
     } else {
       setIsCancelled(true);
-      generateScore();
+      setTimeout(() => {
+        generateScore();
+    }, 5000);
       setActivityCompleted(true);
       setTimeout(() => {
         saveScore();
-    }, 5000);
+    }, 7000);
     }
   };
 

web-app/frontend/src/components/activities/mentalChronometryEval/letterPattern/LetterPatternContainer.jsx

@@ -93,7 +93,7 @@ const LetterPatternContainer = ({ nextActivity }) => {
 
   const generateScore = () => {
     let result = 0;
-    for (let i = 0; i <= actualResult.length; i++) {
+    for (let i = 0; i <= letterPatternANswers.length; i++) {
       console.log(actualResult[i]);
       console.log(letterPatternANswers[i]);
 
@@ -102,7 +102,7 @@ const LetterPatternContainer = ({ nextActivity }) => {
         setFinalScore(result);
       }
     }
-    finalResult = result;
+    finalResult = result-1;
     console.log(result);
   };
 
@@ -155,11 +155,14 @@ const LetterPatternContainer = ({ nextActivity }) => {
       setPatternNo(patternNo + 1);
     } else {
       setIsCancelled(true);
+      setTimeout(() => {
+        generateScore();
+    }, 5000);
       generateScore();
       setActivityCompleted(true);
       setTimeout(() => {
         saveScore();
-    }, 5000);
+    }, 7000);
       
     }
   };

web-app/frontend/src/components/activities/mentalChronometryEval/pairCancerlation/PairCancerlationContainer.jsx

@@ -176,11 +176,14 @@ const PairCancerlationContainer = ({nextActivity}) => {
     }
 
     // finalResult = result;
-    setFinalScore(res);
+    setTimeout(() => {
+      setFinalScore(res);
+  }, 5000);
+    // setFinalScore(res);
     console.log(res);
     setTimeout(() => {
       saveScore(res);
-  }, 5000);
+  }, 7000);
   };
 
   useEffect(() => {