Commit d0746737 authored by randi480's avatar randi480

Final fixes of MC

parent 16a6db13
...@@ -269,7 +269,7 @@ def predict(): ...@@ -269,7 +269,7 @@ def predict():
fh.write(base64.decodebytes(decoded)) fh.write(base64.decodebytes(decoded))
pil_image = Image.open(io.BytesIO(decoded)).resize( pil_image = Image.open(io.BytesIO(decoded)).resize(
(224, 224), Image.LANCZOS).convert("RGB") (224, 224), Image.Resampling.LANCZOS).convert("RGB")
image = pil_image image = pil_image
...@@ -466,7 +466,7 @@ def mentalChromScores(): ...@@ -466,7 +466,7 @@ def mentalChromScores():
score = body['score'] score = body['score']
actualResult = body['actualResult'] actualResult = body['actualResult']
predResult = body['predResult'] predResult = body['predResult']
createdTime = body['createdTime'] createdTime = datetime.now().strftime("%d/%m/%Y %H:%M:%S")
totalTime = body['totalTime'] totalTime = body['totalTime']
candidateID = body['candidateID'] candidateID = body['candidateID']
answerImage = body['answerImage'] answerImage = body['answerImage']
...@@ -633,7 +633,7 @@ def getattentionSpanscores(): ...@@ -633,7 +633,7 @@ def getattentionSpanscores():
# Running app # Running app
if __name__ == "__main__": if __name__ == "__main__":
app.secret_key = os.urandom(24) 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) debug=True, use_reloader=False)
flask_cors.CORS(app, expose_headers='Authorization') flask_cors.CORS(app, expose_headers='Authorization')
...@@ -23,34 +23,16 @@ const CodingContainer = ({ nextActivity }) => { ...@@ -23,34 +23,16 @@ const CodingContainer = ({ nextActivity }) => {
const [answerImage] = useState([]); const [answerImage] = useState([]);
const [actualResult, setActualResul] = useState([ const [actualResult, setActualResul] = useState([
"square", "square",
// "circle",
// "triangle",
// "circle",
"circle", "circle",
// "triangle",
// "circle",
// "square",
"circle", "circle",
// "circle",
// "square",
// "triangle",
"triangle", "triangle",
]); ]);
const [isCancelled, setIsCancelled] = useState(false); const [isCancelled, setIsCancelled] = useState(false);
const [drawingPad, setDrawingPad] = useState([ const [drawingPad, setDrawingPad] = useState([
"c", "c",
// "s",
// "c",
// "r",
"s", "s",
// "c",
// "r",
// "c",
"c", "c",
// "s",
// "c",
// "s",
"s", "s",
]); ]);
...@@ -134,7 +116,7 @@ const CodingContainer = ({ nextActivity }) => { ...@@ -134,7 +116,7 @@ const CodingContainer = ({ nextActivity }) => {
setFinalScore(result); setFinalScore(result);
} }
} }
finalResult = result; finalResult = result-1;
console.log(result); console.log(result);
}; };
...@@ -183,11 +165,13 @@ const CodingContainer = ({ nextActivity }) => { ...@@ -183,11 +165,13 @@ const CodingContainer = ({ nextActivity }) => {
setPatternNo(patternNo + 1); setPatternNo(patternNo + 1);
} else { } else {
setIsCancelled(true); setIsCancelled(true);
generateScore(); setTimeout(() => {
generateScore();
}, 5000);
setActivityCompleted(true); setActivityCompleted(true);
setTimeout(() => { setTimeout(() => {
saveScore(); saveScore();
}, 5000); }, 7000);
} }
}; };
......
...@@ -93,7 +93,7 @@ const LetterPatternContainer = ({ nextActivity }) => { ...@@ -93,7 +93,7 @@ const LetterPatternContainer = ({ nextActivity }) => {
const generateScore = () => { const generateScore = () => {
let result = 0; 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(actualResult[i]);
console.log(letterPatternANswers[i]); console.log(letterPatternANswers[i]);
...@@ -102,7 +102,7 @@ const LetterPatternContainer = ({ nextActivity }) => { ...@@ -102,7 +102,7 @@ const LetterPatternContainer = ({ nextActivity }) => {
setFinalScore(result); setFinalScore(result);
} }
} }
finalResult = result; finalResult = result-1;
console.log(result); console.log(result);
}; };
...@@ -155,11 +155,14 @@ const LetterPatternContainer = ({ nextActivity }) => { ...@@ -155,11 +155,14 @@ const LetterPatternContainer = ({ nextActivity }) => {
setPatternNo(patternNo + 1); setPatternNo(patternNo + 1);
} else { } else {
setIsCancelled(true); setIsCancelled(true);
setTimeout(() => {
generateScore();
}, 5000);
generateScore(); generateScore();
setActivityCompleted(true); setActivityCompleted(true);
setTimeout(() => { setTimeout(() => {
saveScore(); saveScore();
}, 5000); }, 7000);
} }
}; };
......
...@@ -176,11 +176,14 @@ const PairCancerlationContainer = ({nextActivity}) => { ...@@ -176,11 +176,14 @@ const PairCancerlationContainer = ({nextActivity}) => {
} }
// finalResult = result; // finalResult = result;
setFinalScore(res); setTimeout(() => {
setFinalScore(res);
}, 5000);
// setFinalScore(res);
console.log(res); console.log(res);
setTimeout(() => { setTimeout(() => {
saveScore(res); saveScore(res);
}, 5000); }, 7000);
}; };
useEffect(() => { useEffect(() => {
......
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