Merge branch 'master' into attention_new_ui

web-app/backend/server.py

@@ -414,23 +414,24 @@ def predictArithmetic():
         candidateID = request.form.get('candidateID')
         print(questionIndex)
         if file is None or file.filename == "":
-            return jsonify({'error: no file'})
+            return jsonify({"error": "no file"})
 
         try:
-
             file.save("./"+file.filename)
             prediction = transform_audio(file.filename)
-            data = {'prediction': prediction}
+            activityName = "Arithmetic"
+            analysis = reasoningIQScoreCalculator(activityName,questionIndex,prediction)
             db.db['reasoningIQScore'].insert_one({
-                "activityName": "Arithmetic",
+                "activityName": activityName,
                 "candidateID": candidateID,
                 "questionIndex": questionIndex,
                 "transcription": prediction,
+                "score":analysis[0],
+                "expectedAnswer":analysis[1]
             })
-            return jsonify(data)
+            return jsonify({"msg": "Prediction completed"})
         except:
-            return jsonify({'error: Error during pipeline execution'})
-    return jsonify({'result: test'})
+            return jsonify({"error": "Error during pipeline execution"})
 
 # Mental Chronometry data management
 

web-app/frontend/src/components/activities/reasoningIqEval/arithmetic/Arithmetic.jsx

-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useRef } from "react";
 import "./Arithmetic.css";
 import Timer from "../timer/Timer";
 import { RecordingHandler } from "../recorder/Recorder";
+import { imgSrcArray } from "./imageSet";
 
 const Arithmetic = ({ nextActivity }) => {
+  const effectRan = useRef(false);
   const [allCompleted, setAllCompleted] = useState(false);
   const [activityIndex, setActivityIndex] = useState(1);
-  const imgSrcArray = [
-    "https://i.ibb.co/10pQ5gp/image-27.png",
-    "https://i.ibb.co/4KGpx50/Screenshot-2022-10-10-232236.jpg",
-    "https://i.ibb.co/Bckx5FR/arithmatic3.png",
-  ];
 
   const switchActivityHandler = () => {
     if (activityIndex < 3) {
       let activityNo = activityIndex + 1;
       setActivityIndex(activityNo);
+      RecordingHandler(`PC.wav`, activityNo, "pc");
     } else {
       setAllCompleted(true);
     }
   };
 
   useEffect(() => {
-    RecordingHandler(`AR.wav`, activityIndex, "ar");
+    // RecordingHandler(`AR.wav`, activityIndex, "ar");
+    if (effectRan.current === false) {
+      RecordingHandler(`AR.wav`, activityIndex, "ar");
+      return () => {
+        console.log("unmounted");
+        effectRan.current = true;
+      };
+    }
   }, [activityIndex]);
 
   useEffect(() => {
@@ -42,27 +47,6 @@ const Arithmetic = ({ nextActivity }) => {
           />
         </div>
       )}
-      {allCompleted && (
-        <div className="w-4/6 h-4/6 m-auto">
-          {" "}
-          <img
-            className="m-auto"
-            src="https://i.ibb.co/sJWJZsD/completed.png"
-            alt="pattern"
-          />
-        </div>
-      )}
-      {allCompleted && (
-        <button
-          className="float-right bg-transparent hover:bg-red-500 text-red-700 font-semibold hover:text-white py-2 px-4 border border-red-500 hover:border-transparent rounded"
-          onClick={() => {
-            nextActivity();
-          }}
-        >
-          Next Activity
-        </button>
-      )}
-
       {!allCompleted && <Timer switchActivity={switchActivityHandler} />}
     </div>
   );

web-app/frontend/src/components/activities/reasoningIqEval/arithmetic/imageSet.js

+export const imgSrcArray = [
+  "https://i.ibb.co/10pQ5gp/image-27.png",
+  "https://i.ibb.co/4KGpx50/Screenshot-2022-10-10-232236.jpg",
+  "https://i.ibb.co/Bckx5FR/arithmatic3.png",
+];

web-app/frontend/src/components/activities/reasoningIqEval/pictureConcept/PictureConcept.jsx

@@ -99,12 +99,7 @@ const PictureConcept = ({ nextActivity }) => {
           Next Activity
         </button>
       )}
-      {!allCompleted && (
-        <Timer
-          activityIndex={activityIndex}
-          switchActivity={switchActivityHandler}
-        />
-      )}
+      {!allCompleted && <Timer switchActivity={switchActivityHandler} />}
       {!allCompleted && <div></div>}
     </div>
   );

web-app/frontend/src/components/activities/reasoningIqEval/recorder/Recorder.js

@@ -67,12 +67,12 @@ const uploadRecording = async (file, fileName, questionIndex, activityName) => {
       });
   }
   if (activityName === "ar") {
-    // await API.post(`predictArithmetic`, data, config)
-    //   .then((res) => {
-    //     console.log(res, "DONE" + new Date().toISOString);
-    //   })
-    //   .catch((err) => {
-    //     console.log(err, "ERROR" + new Date().toISOString);
-    //   });
+    await API.post(`predictArithmetic`, data, config)
+      .then((res) => {
+        console.log(res, "DONE");
+      })
+      .catch((err) => {
+        console.log(err, "ERROR");
+      });
   }
 };

web-app/frontend/src/components/activities/reasoningIqEval/timer/Timer.jsx

@@ -21,13 +21,7 @@ const Timer = ({ switchActivity }) => {
           rotation={"counterclockwise"}
           size={100}
           strokeWidth={8}
-          onUpdate={(remainingTime) => {
-            if (remainingTime === 15) {
-              console.log("TIMER START");
-            }
-          }}
           onComplete={() => {
-            console.log("TIMER STOP");
             // change activity
             switchActivity();
             return { shouldRepeat: true, delay: 0 }; // repeat animation in 1.5 seconds