Skip to content

2
2022-073
Commit 6c82a518 authored by AdithyaKahawanugoda's avatar AdithyaKahawanugoda
Browse files
Options

double rendering patch for pc activity

parent c0ed14a6
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 90 deletions
web-app/frontend/src/components/activities/reasoningIqEval/arithmetic/Arithmetic.jsx
View file @ 6c82a518
......@@ -25,6 +25,12 @@ const Arithmetic = ({ nextActivity }) => {
RecordingHandler(`AR.wav`, activityIndex, "ar");
}, [activityIndex]);
useEffect(() => {
if (allCompleted) {
nextActivity();
}
}, [allCompleted, nextActivity]);
return (
<div>
{!allCompleted && (
......
web-app/frontend/src/components/activities/reasoningIqEval/pictureConcept/PictureConcept.jsx
View file @ 6c82a518
import React, { useState, useRef } from "react";
import { useEffect } from "react";
import React, { useState, useEffect, useRef } from "react";
import { ImageRow } from "../../../index";
import { RecordingHandler } from "../recorder/Recorder";
import { tempImgSrc1, tempImgSrc2 } from "./imageSet";
import Timer from "../timer/Timer";
const PictureConcept = ({ nextActivity }) => {
const effectRan = useRef(false);
const [img, setImg] = useState(4);
const [allCompleted, setAllCompleted] = useState(false);
const [activityIndex, setActivityIndex] = useState(1);
......@@ -17,71 +18,6 @@ const PictureConcept = ({ nextActivity }) => {
"https://i.ibb.co/x64QVYx/image-22.png",
]);
var 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",
];
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",
];
const imageSwitcher = () => {
var urlCount = 2;
......@@ -119,12 +55,29 @@ const PictureConcept = ({ nextActivity }) => {
setActivityIndex(activityNo);
setImg(img + 4);
imageSwitcher();
RecordingHandler(`PC.wav`, activityIndex + 1, "pc");
};
useEffect(() => {
RecordingHandler(`PC.wav`, activityIndex, "pc");
if (effectRan.current === false) {
RecordingHandler(`PC.wav`, activityIndex, "pc");
return () => {
console.log("unmounted");
effectRan.current = true;
};
}
// console.log(activityIndex);
// RecordingHandler(`PC.wav`, activityIndex, "pc");
}, [activityIndex]);
useEffect(() => {
if (allCompleted) {
nextActivity();
}
}, [allCompleted, nextActivity]);
return (
<div className="mt-11">
{!allCompleted && imgSrc1 && <ImageRow tempImgSrc={imgSrc1} />}
......@@ -150,7 +103,12 @@ const PictureConcept = ({ nextActivity }) => {
Next Activity
</button>
)}
{!allCompleted && <Timer switchActivity={switchActivityHandler} />}
{!allCompleted && (
<Timer
activityIndex={activityIndex}
switchActivity={switchActivityHandler}
/>
)}
{!allCompleted && <div></div>}
</div>
);
......
web-app/frontend/src/components/activities/reasoningIqEval/pictureConcept/imageSet.js 0 → 100644
View file @ 6c82a518
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",
];
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",
];
web-app/frontend/src/components/activities/reasoningIqEval/recorder/Recorder.js
View file @ 6c82a518
......@@ -6,22 +6,27 @@ export const RecordingHandler = async (
questionIndex,
activityName
) => {
console.log("Recording Activity Index: ", questionIndex);
let stream = await navigator.mediaDevices.getUserMedia({
video: false,
audio: true,
});
let recorder = new RecordRTC.StereoAudioRecorder(stream, {
type: "audio",
mimeType: "audio/wav",
numberOfAudioChannels: 1,
sampleRate: 44100,
});
recorder.record();
const sleep = (m) => new Promise((r) => setTimeout(r, m));
await sleep(15000);
sleep(15000); //await
await recorder.stop(function () {
//await
recorder.stop(function () {
console.log("Stopped Activity Index: ", questionIndex);
let blob = recorder.blob;
processRecording(blob, fileName, questionIndex, activityName);
});
......@@ -36,6 +41,7 @@ const processRecording = (blob, fileName, questionIndex, activityName) => {
};
const uploadRecording = async (file, fileName, questionIndex, activityName) => {
console.log("Uploading Activity Index: ", questionIndex);
let data = new FormData();
let candidateID = 0;
if (localStorage) {
......@@ -52,22 +58,22 @@ const uploadRecording = async (file, fileName, questionIndex, activityName) => {
},
};
// if (activityName === "pc") {
// await API.post(`predictPictureConcept`, data, config)
// .then((res) => {
// console.log(res, "DONE" + new Date().toISOString);
// })
// .catch((err) => {
// console.log(err, "ERROR" + new Date().toISOString);
// });
// }
// 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);
// });
// }
if (activityName === "pc") {
// await API.post(`predictPictureConcept`, data, config)
// .then((res) => {
// console.log(res.data);
// })
// .catch((err) => {
// console.log(err, "ERROR");
// });
}
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);
// });
}
};
web-app/frontend/src/components/activities/reasoningIqEval/timer/Timer.jsx
View file @ 6c82a518
import React from "react";
import { CountdownCircleTimer } from "react-countdown-circle-timer";
import "./Timer.css";
const Timer = ({ switchActivity }) => {
......@@ -22,7 +21,13 @@ 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
......
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