Skip to content

2
2022-073
Commit 14890c91 authored by NilanDMeegoda's avatar NilanDMeegoda
Browse files
Options

Merge branch 'master' into attention_new_ui

parents 124b97e5 85ef5dcd
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 85 deletions
web-app/frontend/src/components/activities/mentalChronometryEval/coding/Coding.jsx
View file @ 14890c91
import React from "react";
import CodingContainer from "./CodingContainer";
const Coding = () => {
const Coding = ({nextActivity}) => {
return (
<div>
<CodingContainer />
<CodingContainer nextActivity={nextActivity}/>
</div>
);
};
......
web-app/frontend/src/components/activities/mentalChronometryEval/coding/CodingContainer.jsx
View file @ 14890c91
......@@ -5,7 +5,7 @@ import SignaturePad from "react-signature-canvas";
import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
import API from "../../../../config/api";
const CodingContainer = () => {
const CodingContainer = ({ nextActivity }) => {
const sigCanvas = useRef({});
const [time, setTime] = useState({
seconds: 0,
......@@ -185,9 +185,19 @@ const CodingContainer = () => {
setIsCancelled(true);
generateScore();
setActivityCompleted(true);
saveScore();
setTimeout(() => {
saveScore();
}, 5000);
}
};
useEffect(() => {
if (activityCompleted) {
nextActivity();
}
}, [activityCompleted, nextActivity]);
return (
<div className="justify-items-center h-full">
{!activityCompleted && (
......@@ -304,7 +314,7 @@ const CodingContainer = () => {
</div>
)}
{activityCompleted && (
{/* {activityCompleted && (
<div className="grid grid-cols-1 m-4">
<div className="grid justify-items-center">
<img
......@@ -327,7 +337,7 @@ const CodingContainer = () => {
</h1>
</div>
</div>
)}
)} */}
</div>
);
};
......
web-app/frontend/src/components/activities/mentalChronometryEval/letterPattern/LetterPattern.jsx
View file @ 14890c91
......@@ -13,7 +13,7 @@ const LetterPattern = ({ nextActivity }) => {
return (
<div className="h-full ">
<LetterPatternContainer />
<LetterPatternContainer nextActivity={nextActivity} />
</div>
);
};
......
web-app/frontend/src/components/activities/mentalChronometryEval/letterPattern/LetterPatternContainer.jsx
View file @ 14890c91
......@@ -157,10 +157,19 @@ const LetterPatternContainer = ({ nextActivity }) => {
setIsCancelled(true);
generateScore();
setActivityCompleted(true);
saveScore();
setTimeout(() => {
saveScore();
}, 5000);
}
};
useEffect(() => {
if (activityCompleted) {
nextActivity();
}
}, [activityCompleted, nextActivity]);
return (
<div className="justify-items-center h-full">
{!activityCompleted && (
......@@ -237,7 +246,7 @@ const LetterPatternContainer = ({ nextActivity }) => {
</div>
)}
{activityCompleted && (
{/* {activityCompleted && (
<div className="grid grid-cols-1 m-4">
<div className="grid justify-items-center">
<img
......@@ -260,7 +269,7 @@ const LetterPatternContainer = ({ nextActivity }) => {
</h1>
</div>
</div>
)}
)} */}
</div>
);
};
......
web-app/frontend/src/components/activities/mentalChronometryEval/pairCancerlation/PairCancerlation.jsx
View file @ 14890c91
import React from "react";
import PairCancerlationContainer from "./PairCancerlationContainer";
const PairCancerlation = () => {
const PairCancerlation = ({nextActivity}) => {
return (
<div>
<PairCancerlationContainer />
<PairCancerlationContainer nextActivity={nextActivity}/>
</div>
);
};
......
web-app/frontend/src/components/activities/mentalChronometryEval/pairCancerlation/PairCancerlationContainer.jsx
View file @ 14890c91
......@@ -12,7 +12,7 @@ import PCA4 from "./img/PCA4.png";
// import { PCA1, PCB1 } from "./img/";
import axios from "axios";
const PairCancerlationContainer = () => {
const PairCancerlationContainer = ({nextActivity}) => {
const [src, selectFile] = useState(null);
const [activityCompleted, setActivityCompleted] = useState(false);
const [Pair, setPair] = useState([PCA1, PCA3, PCA4]);
......@@ -171,7 +171,6 @@ const PairCancerlationContainer = () => {
for (let i = 0; i < actualResult.length; i++) {
if (JSON.stringify(actualResult[i]) === JSON.stringify(predResult[i])) {
res += 1;
alert(res);
// setFinalScore(result);
}
}
......@@ -179,9 +178,17 @@ const PairCancerlationContainer = () => {
// finalResult = result;
setFinalScore(res);
console.log(res);
saveScore(res);
setTimeout(() => {
saveScore(res);
}, 5000);
};
useEffect(() => {
if (activityCompleted) {
nextActivity();
}
}, [activityCompleted, nextActivity]);
return (
<div className="justify-items-center h-full">
{!activityCompleted && (
......@@ -190,7 +197,10 @@ const PairCancerlationContainer = () => {
{" "}
<div>
{" "}
<img src={Pair[activityIndex]}/>{" "}
<img style={{
width: "15rem",
height: "6rem",
}} src={Pair[activityIndex]}/>{" "}
</div>
</div>
<div className="grid grid-cols-1 h-fit m-10">
......@@ -220,8 +230,8 @@ const PairCancerlationContainer = () => {
<button onClick={getCroppedImg}>
<img
style={{
width: "250px",
height: "80px",
width: "100%",
height: "100%",
}}
src="https://i.ibb.co/Hz254BT/Screenshot-2022-10-02-093444.png"
alt="pattern"
......@@ -245,7 +255,7 @@ const PairCancerlationContainer = () => {
</div>
)}
{activityCompleted && (
{/* {activityCompleted && (
<div className="grid grid-cols-1 m-4">
<div className="grid justify-items-center">
<img
......@@ -268,7 +278,7 @@ const PairCancerlationContainer = () => {
</h1>
</div>
</div>
)}
)} */}
</div>
);
};
......
web-app/frontend/src/components/activities/reasoningIqEval/arithmetic/Arithmetic.jsx
View file @ 14890c91
......@@ -41,9 +41,9 @@ const Arithmetic = ({ nextActivity }) => {
{!allCompleted && (
<div className="arithmetic-img-container w-5/6 h-4/6 m-auto p-11 mb-9 mt-9">
<img
alt="img-row-item"
src={imgSrcArray[activityIndex - 1]}
className="arithmetic-img-item"
alt="img-row-item"
/>
</div>
)}
......
web-app/frontend/src/components/activities/reasoningIqEval/arithmetic/imageSet.js
View file @ 14890c91
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",
];
import img1 from "./imgs/img1.png";
import img2 from "./imgs/img2.png";
import img3 from "./imgs/img3.png";
export const imgSrcArray = [img1, img2, img3];
web-app/frontend/src/components/activities/reasoningIqEval/pictureConcept/imageSet.js
View file @ 14890c91
import img1 from "./imgs/img (1).png";
import img2 from "./imgs/img (2).png";
import img3 from "./imgs/img (3).png";
import img4 from "./imgs/img (4).png";
import img5 from "./imgs/img (5).png";
import img6 from "./imgs/img (6).png";
import img7 from "./imgs/img (7).png";
import img8 from "./imgs/img (8).png";
import img9 from "./imgs/img (9).png";
import img10 from "./imgs/img (10).png";
import img11 from "./imgs/img (11).png";
import img12 from "./imgs/img (12).png";
import img13 from "./imgs/img (13).png";
import img14 from "./imgs/img (14).png";
import img15 from "./imgs/img (15).png";
import img16 from "./imgs/img (16).png";
import img17 from "./imgs/img (17).png";
import img18 from "./imgs/img (18).png";
import img19 from "./imgs/img (19).png";
import img20 from "./imgs/img (20).png";
import img21 from "./imgs/img (21).png";
import img22 from "./imgs/img (22).png";
import img23 from "./imgs/img (23).png";
import img24 from "./imgs/img (24).png";
import img25 from "./imgs/img (25).png";
import img26 from "./imgs/img (26).png";
import img27 from "./imgs/img (27).png";
import img28 from "./imgs/img (28).png";
import img29 from "./imgs/img (29).png";
import img30 from "./imgs/img (30).png";
import img31 from "./imgs/img (31).png";
import img32 from "./imgs/img (32).png";
import img33 from "./imgs/img (33).png";
import img34 from "./imgs/img (34).png";
import img35 from "./imgs/img (35).png";
import img36 from "./imgs/img (36).png";
import img37 from "./imgs/img (37).png";
import img38 from "./imgs/img (38).png";
import img39 from "./imgs/img (39).png";
import img40 from "./imgs/img (40).png";
import img41 from "./imgs/img (41).png";
import img42 from "./imgs/img (42).png";
import img43 from "./imgs/img (43).png";
import img44 from "./imgs/img (44).png";
import img45 from "./imgs/img (45).png";
import img46 from "./imgs/img (46).png";
import img47 from "./imgs/img (47).png";
import img48 from "./imgs/img (48).png";
import img49 from "./imgs/img (49).png";
export const tempImgSrc1 = [
"https://i.ibb.co/C0tnLps/8i-E69x-XBT.png",
"https://i.ibb.co/VVgQTww/dress-PNG167.png",
"https://i.ibb.co/nDKF3XD/pencil-png.webp",
"https://i.ibb.co/ch6C0pL/Sports-Football-Transparent-PNG.png",
"https://i.ibb.co/3MJmSX6/clipart2176395.png",
"https://i.ibb.co/x52kNYP/Png-Item-6058158.png",
"https://i.ibb.co/C0tnLps/8i-E69x-XBT.png",
"https://i.ibb.co/ynds2bm/5i-RX84y4-T.png",
"https://i.ibb.co/dtHhCMT/image-21.png",
"https://i.ibb.co/ykc1Q1m/2-2-plane-png-clipart.png",
"https://i.ibb.co/Ttb94JX/2cd43b-4782bec951ad4e96a466f79025e49511-mv2-d-2000-1331-s-2.png",
"https://i.ibb.co/7ydtf2H/4-48879-fruit-png-fruits-png.png",
"https://i.ibb.co/rmRfQNz/5c3227c8a97bc40295eb8431.png",
"https://i.ibb.co/wdcPgGT/37-375163-transparent-girl-in-dress-png-maroon-dress-for.jpg",
"https://i.ibb.co/Cs2XP8X/Single-Red-Apple-PNG.png",
"https://i.ibb.co/6sQxVBT/175-1754413-park-swing-png-clip-art-swing-clipart.png",
"https://i.ibb.co/XSjV9R2/Aci-Y35-carrot-transparent-picture.png",
"https://i.ibb.co/8xPn43s/415-4156737-oil-lamp-clip-art.png",
"https://i.ibb.co/gRzxj1f/580b585b2edbce24c47b264c.png",
"https://i.ibb.co/RYyd9zP/1203.png",
"https://i.ibb.co/XjFfgwB/2425.png",
"https://i.ibb.co/GMqTSS3/5522c0e93dfaa6d683cfc534fdeefab2.png",
"https://i.ibb.co/VLkqXLY/6298b026a65cf80bcf9dce061e9b79c9.png",
"https://i.ibb.co/T0LzCvZ/03598764d04b6422eaffd9614e9cefbc.png",
img1,
img2,
img3,
img4,
img5,
img6,
img7,
img8,
img9,
img10,
img11,
img12,
img13,
img14,
img15,
img16,
img17,
img18,
img19,
img20,
img21,
img22,
img23,
img24,
];
export const tempImgSrc2 = [
"https://i.ibb.co/fDxJsDR/amazing-lion-png-clipart-6.png",
"https://i.ibb.co/xG0v92S/bee-png.webp",
"https://i.ibb.co/phHMFz6/birdpng-parspng-com-7.webp",
"https://i.ibb.co/JrW5q2w/dance-shoes-png-transparent-dance-shoes-images-5.png",
"https://i.ibb.co/C7jB8qg/Doll-PNG-Picture.png",
"https://i.ibb.co/VphHmk9/Duck-PNG-2.png",
"https://i.ibb.co/Tr7SHJg/fc357254541c2886a4a8722cbfa9631e.png",
"https://i.ibb.co/VWSXVq7/fish-png-clipart-stormdesignz-16.png",
"https://i.ibb.co/Tr7SHJg/fc357254541c2886a4a8722cbfa9631e.png",
"https://i.ibb.co/MBnbjzX/ice-png-0.png",
"https://i.ibb.co/ynds2bm/5i-RX84y4-T.png",
"https://i.ibb.co/J7mn0B9/light-bulb-png-bulb-png1247-12.png",
"https://i.ibb.co/DwdxcfW/orangepng-parspng-com-1.webp",
"https://i.ibb.co/nDKF3XD/pencil-png.webp",
"https://i.ibb.co/QpsR760/purepng-com-glassesglasseseyeglassesspectaclesplastic-lensesmounted-1421526499387mxav8.png",
"https://i.ibb.co/HBG1fwP/purepng-com-sockssockscovering-the-anklemattedanimalhair-14215263983517qbfn.png",
"https://i.ibb.co/JmgvfxK/purepng-com-tea-kettleobjectssteelobjectteateapotkettle-631521882784cp3pk.png",
"https://i.ibb.co/Y0HjgBv/purepng-com-tomatotomatotomatossalad-fruitred-fruit-1701527315950ajwrj.png",
"https://i.ibb.co/0J4Hc6L/purepng-com-wall-clockclockbelltimewall-clockwhiteblacksquareround-1421526463157kwtma.png",
"https://i.ibb.co/yBRGSVJ/red-umbrella-png-19.png",
"https://i.ibb.co/3zp0QMs/scales-uaw-kobol-9.png",
"https://i.ibb.co/rQS963q/tiger-PNG23230.png",
"https://i.ibb.co/Cs2XP8X/Single-Red-Apple-PNG.png",
"https://i.ibb.co/ch6C0pL/Sports-Football-Transparent-PNG.png",
"https://i.ibb.co/94Mmmjy/Vector-Ant-Transparent-PNG.png",
img25,
img26,
img27,
img28,
img29,
img30,
img31,
img32,
img33,
img34,
img35,
img36,
img37,
img38,
img39,
img40,
img41,
img42,
img43,
img44,
img45,
img46,
img47,
img48,
img49,
];
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