Commit 85ef5dcd authored by randi480's avatar randi480

Final Fixes of mental chronometry

parent 3a2f0968
import React from "react"; import React from "react";
import CodingContainer from "./CodingContainer"; import CodingContainer from "./CodingContainer";
const Coding = () => { const Coding = ({nextActivity}) => {
return ( return (
<div> <div>
<CodingContainer /> <CodingContainer nextActivity={nextActivity}/>
</div> </div>
); );
}; };
......
...@@ -5,7 +5,7 @@ import SignaturePad from "react-signature-canvas"; ...@@ -5,7 +5,7 @@ import SignaturePad from "react-signature-canvas";
import DeleteForeverIcon from "@mui/icons-material/DeleteForever"; import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
import API from "../../../../config/api"; import API from "../../../../config/api";
const CodingContainer = () => { const CodingContainer = ({ nextActivity }) => {
const sigCanvas = useRef({}); const sigCanvas = useRef({});
const [time, setTime] = useState({ const [time, setTime] = useState({
seconds: 0, seconds: 0,
...@@ -185,9 +185,19 @@ const CodingContainer = () => { ...@@ -185,9 +185,19 @@ const CodingContainer = () => {
setIsCancelled(true); setIsCancelled(true);
generateScore(); generateScore();
setActivityCompleted(true); setActivityCompleted(true);
saveScore(); setTimeout(() => {
saveScore();
}, 5000);
} }
}; };
useEffect(() => {
if (activityCompleted) {
nextActivity();
}
}, [activityCompleted, nextActivity]);
return ( return (
<div className="justify-items-center h-full"> <div className="justify-items-center h-full">
{!activityCompleted && ( {!activityCompleted && (
...@@ -304,7 +314,7 @@ const CodingContainer = () => { ...@@ -304,7 +314,7 @@ const CodingContainer = () => {
</div> </div>
)} )}
{activityCompleted && ( {/* {activityCompleted && (
<div className="grid grid-cols-1 m-4"> <div className="grid grid-cols-1 m-4">
<div className="grid justify-items-center"> <div className="grid justify-items-center">
<img <img
...@@ -327,7 +337,7 @@ const CodingContainer = () => { ...@@ -327,7 +337,7 @@ const CodingContainer = () => {
</h1> </h1>
</div> </div>
</div> </div>
)} )} */}
</div> </div>
); );
}; };
......
...@@ -13,7 +13,7 @@ const LetterPattern = ({ nextActivity }) => { ...@@ -13,7 +13,7 @@ const LetterPattern = ({ nextActivity }) => {
return ( return (
<div className="h-full "> <div className="h-full ">
<LetterPatternContainer /> <LetterPatternContainer nextActivity={nextActivity} />
</div> </div>
); );
}; };
......
...@@ -157,10 +157,19 @@ const LetterPatternContainer = ({ nextActivity }) => { ...@@ -157,10 +157,19 @@ const LetterPatternContainer = ({ nextActivity }) => {
setIsCancelled(true); setIsCancelled(true);
generateScore(); generateScore();
setActivityCompleted(true); setActivityCompleted(true);
saveScore(); setTimeout(() => {
saveScore();
}, 5000);
} }
}; };
useEffect(() => {
if (activityCompleted) {
nextActivity();
}
}, [activityCompleted, nextActivity]);
return ( return (
<div className="justify-items-center h-full"> <div className="justify-items-center h-full">
{!activityCompleted && ( {!activityCompleted && (
...@@ -237,7 +246,7 @@ const LetterPatternContainer = ({ nextActivity }) => { ...@@ -237,7 +246,7 @@ const LetterPatternContainer = ({ nextActivity }) => {
</div> </div>
)} )}
{activityCompleted && ( {/* {activityCompleted && (
<div className="grid grid-cols-1 m-4"> <div className="grid grid-cols-1 m-4">
<div className="grid justify-items-center"> <div className="grid justify-items-center">
<img <img
...@@ -260,7 +269,7 @@ const LetterPatternContainer = ({ nextActivity }) => { ...@@ -260,7 +269,7 @@ const LetterPatternContainer = ({ nextActivity }) => {
</h1> </h1>
</div> </div>
</div> </div>
)} )} */}
</div> </div>
); );
}; };
......
import React from "react"; import React from "react";
import PairCancerlationContainer from "./PairCancerlationContainer"; import PairCancerlationContainer from "./PairCancerlationContainer";
const PairCancerlation = () => { const PairCancerlation = ({nextActivity}) => {
return ( return (
<div> <div>
<PairCancerlationContainer /> <PairCancerlationContainer nextActivity={nextActivity}/>
</div> </div>
); );
}; };
......
...@@ -12,7 +12,7 @@ import PCA4 from "./img/PCA4.png"; ...@@ -12,7 +12,7 @@ import PCA4 from "./img/PCA4.png";
// import { PCA1, PCB1 } from "./img/"; // import { PCA1, PCB1 } from "./img/";
import axios from "axios"; import axios from "axios";
const PairCancerlationContainer = () => { const PairCancerlationContainer = ({nextActivity}) => {
const [src, selectFile] = useState(null); const [src, selectFile] = useState(null);
const [activityCompleted, setActivityCompleted] = useState(false); const [activityCompleted, setActivityCompleted] = useState(false);
const [Pair, setPair] = useState([PCA1, PCA3, PCA4]); const [Pair, setPair] = useState([PCA1, PCA3, PCA4]);
...@@ -171,7 +171,6 @@ const PairCancerlationContainer = () => { ...@@ -171,7 +171,6 @@ const PairCancerlationContainer = () => {
for (let i = 0; i < actualResult.length; i++) { for (let i = 0; i < actualResult.length; i++) {
if (JSON.stringify(actualResult[i]) === JSON.stringify(predResult[i])) { if (JSON.stringify(actualResult[i]) === JSON.stringify(predResult[i])) {
res += 1; res += 1;
alert(res);
// setFinalScore(result); // setFinalScore(result);
} }
} }
...@@ -179,9 +178,17 @@ const PairCancerlationContainer = () => { ...@@ -179,9 +178,17 @@ const PairCancerlationContainer = () => {
// finalResult = result; // finalResult = result;
setFinalScore(res); setFinalScore(res);
console.log(res); console.log(res);
saveScore(res); setTimeout(() => {
saveScore(res);
}, 5000);
}; };
useEffect(() => {
if (activityCompleted) {
nextActivity();
}
}, [activityCompleted, nextActivity]);
return ( return (
<div className="justify-items-center h-full"> <div className="justify-items-center h-full">
{!activityCompleted && ( {!activityCompleted && (
...@@ -190,7 +197,10 @@ const PairCancerlationContainer = () => { ...@@ -190,7 +197,10 @@ const PairCancerlationContainer = () => {
{" "} {" "}
<div> <div>
{" "} {" "}
<img src={Pair[activityIndex]}/>{" "} <img style={{
width: "15rem",
height: "6rem",
}} src={Pair[activityIndex]}/>{" "}
</div> </div>
</div> </div>
<div className="grid grid-cols-1 h-fit m-10"> <div className="grid grid-cols-1 h-fit m-10">
...@@ -220,8 +230,8 @@ const PairCancerlationContainer = () => { ...@@ -220,8 +230,8 @@ const PairCancerlationContainer = () => {
<button onClick={getCroppedImg}> <button onClick={getCroppedImg}>
<img <img
style={{ style={{
width: "250px", width: "100%",
height: "80px", height: "100%",
}} }}
src="https://i.ibb.co/Hz254BT/Screenshot-2022-10-02-093444.png" src="https://i.ibb.co/Hz254BT/Screenshot-2022-10-02-093444.png"
alt="pattern" alt="pattern"
...@@ -245,7 +255,7 @@ const PairCancerlationContainer = () => { ...@@ -245,7 +255,7 @@ const PairCancerlationContainer = () => {
</div> </div>
)} )}
{activityCompleted && ( {/* {activityCompleted && (
<div className="grid grid-cols-1 m-4"> <div className="grid grid-cols-1 m-4">
<div className="grid justify-items-center"> <div className="grid justify-items-center">
<img <img
...@@ -268,7 +278,7 @@ const PairCancerlationContainer = () => { ...@@ -268,7 +278,7 @@ const PairCancerlationContainer = () => {
</h1> </h1>
</div> </div>
</div> </div>
)} )} */}
</div> </div>
); );
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment