Skip to content

Diego fix logic display questions #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 27, 2020
Merged

Diego fix logic display questions #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fdf5b48
change logic, goes from lv1 to lvl 2
DiegoOTdC Aug 27, 2020
af96132
dispatch action to update store when updateCompletedExercise
DiegoOTdC Aug 27, 2020
609ea31
add remove exercise and question from homepage/store, remove dispatch…
DiegoOTdC Aug 27, 2020
072ff15
remove unnecessary code
DiegoOTdC Aug 27, 2020
c792630
Merge branch 'development' into diego-fixLogicDisplayQuestions
DiegoOTdC Aug 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
281 changes: 154 additions & 127 deletions src/components/QuizCards/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

import React, { useState } from "react"
import { Card, Button, Form, Container, Row, Col, Spinner } from "react-bootstrap"
import { useDispatch, useSelector } from "react-redux"
Expand All @@ -22,136 +23,161 @@ export default function QuizCards(props){
const userNeeded = useSelector(selectUser)
console.log("here is the user", userNeeded)

if(quizQuestions === undefined){
return <Spinner animation="border" variant="warning" />
}
if (quizQuestions === undefined) {
return <Spinner animation="border" variant="warning" />;
}

function correctOrNot(){
if(review === ""){
return "info"
} else if(review === "incorrect"){
return "danger"
} else if(review === "correct"){
return "success"
} else {
return "warning"
}
function correctOrNot() {
if (review === "") {
return "info";
} else if (review === "incorrect") {
return "danger";
} else if (review === "correct") {
return "success";
} else {
return "warning";
}
console.log("variant test", correctOrNot())
}

if(answered === 2){
history.push("/homepage")
function randomAnswers(randomNum) {
if (randomNum <= 2.5) {
return (
<Form>
<Form.Group controlId="ControlSelect">
<Form.Label>Possible Solutions:</Form.Label>
<Form.Control as="select" multiple>
<option
value="correct"
onClick={(event) => set_Review(event.target.value)}
>
1) {quizQuestions.answer}
</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}
>
2) {quizQuestions.incorrect1}
</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}
>
3) {quizQuestions.incorrect2}
</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}
>
4) {quizQuestions.incorrect3}
</option>
</Form.Control>
</Form.Group>
</Form>
);
} else if (2.5 <= randomNum && randomNum <= 5) {
return (
<Form>
<Form.Group controlId="ControlSelect">
<Form.Label>Possible Solutions:</Form.Label>
<Form.Control as="select" multiple>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}
>
1) {quizQuestions.incorrect1}
</option>
<option
value="correct"
onClick={(event) => set_Review(event.target.value)}
>
2) {quizQuestions.answer}
</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}
>
3) {quizQuestions.incorrect2}
</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}
>
4) {quizQuestions.incorrect3}
</option>
</Form.Control>
</Form.Group>
</Form>
);
} else if (5 <= randomNum && randomNum <= 7.5) {
return (
<Form>
<Form.Group controlId="ControlSelect">
<Form.Label>Possible Solutions:</Form.Label>
<Form.Control as="select" multiple>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}
>
1) {quizQuestions.incorrect1}
</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}
>
2) {quizQuestions.incorrect2}
</option>
<option
value="correct"
onClick={(event) => set_Review(event.target.value)}
>
3) {quizQuestions.answer}
</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}
>
4) {quizQuestions.incorrect3}
</option>
</Form.Control>
</Form.Group>
</Form>
);
} else {
return (
<Form>
<Form.Group controlId="ControlSelect">
<Form.Label>Possible Solutions:</Form.Label>
<Form.Control as="select" multiple>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}
>
1) {quizQuestions.incorrect1}
</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}
>
2) {quizQuestions.incorrect2}
</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}
>
3) {quizQuestions.incorrect3}
</option>
<option
value="correct"
onClick={(event) => set_Review(event.target.value)}
>
4) {quizQuestions.answer}
</option>
</Form.Control>
</Form.Group>
</Form>
);
}
console.log("answered test", answered)

function randomAnswers(randomNum){
// console.log("randome number test", randomNum)
if(randomNum <= 2.5){
return (
<Form>
<Form.Group controlId="ControlSelect">
<Form.Label>
Possible Solutions:
</Form.Label>
<Form.Control
as="select"
multiple>
<option
value="correct"
onClick={(event) => set_Review(event.target.value)}>1) {quizQuestions.answer}</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}>2) {quizQuestions.incorrect1}</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}>3) {quizQuestions.incorrect2}</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}>4) {quizQuestions.incorrect3}</option>
</Form.Control>
</Form.Group>
</Form>
)
} else if(2.5 <= randomNum && randomNum <= 5){
return (
<Form>
<Form.Group controlId="ControlSelect">
<Form.Label>
Possible Solutions:
</Form.Label>
<Form.Control
as="select"
multiple>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}>1) {quizQuestions.incorrect1}</option>
<option
value="correct"
onClick={(event) => set_Review(event.target.value)}>2) {quizQuestions.answer}</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}>3) {quizQuestions.incorrect2}</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}>4) {quizQuestions.incorrect3}</option>
</Form.Control>
</Form.Group>
</Form>
)
} else if(5 <= randomNum&& randomNum <=7.5){
return (
<Form>
<Form.Group controlId="ControlSelect">
<Form.Label>
Possible Solutions:
</Form.Label>
<Form.Control
as="select"
multiple>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}>1) {quizQuestions.incorrect1}</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}>2) {quizQuestions.incorrect2}</option>
<option
value="correct"
onClick={(event) => set_Review(event.target.value)}>3) {quizQuestions.answer}</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}>4) {quizQuestions.incorrect3}</option>
</Form.Control>
</Form.Group>
</Form>
)
} else {
return (
<Form>
<Form.Group controlId="ControlSelect">
<Form.Label>
Possible Solutions:
</Form.Label>
<Form.Control
as="select"
multiple>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}>1) {quizQuestions.incorrect1}</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}>2) {quizQuestions.incorrect2}</option>
<option
value="incorrect"
onClick={(event) => set_Review(event.target.value)}>3) {quizQuestions.incorrect3}</option>
<option
value="correct"
onClick={(event) => set_Review(event.target.value)}>4) {quizQuestions.answer}</option>
</Form.Control>
</Form.Group>
</Form>
)
}
}
}

return (
<Container>
Expand Down Expand Up @@ -193,4 +219,5 @@ export default function QuizCards(props){
</Row>
</Container>
)
}
}

8 changes: 2 additions & 6 deletions src/components/QuizCode/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React, { useState, useEffect } from "react";
import { useDispatch } from "react-redux";
import { getExerciseById } from "../../store/exercise/actions";
import { updateCompletedExercise } from "../../store/user/actions";

import { Controlled as CodeMirror } from "react-codemirror2";
import "codemirror/lib/codemirror.css";
import "codemirror/mode/javascript/javascript";
Expand All @@ -22,10 +20,6 @@ export default function QuizCode(props) {
const minutes = date.getMinutes();
const seconds = date.getSeconds();

useEffect(() => {
dispatch(getExerciseById(1));
}, [dispatch]);

const codeMirrorOptions = {
theme: "material",
lineNumbers: true,
Expand Down Expand Up @@ -116,6 +110,8 @@ export default function QuizCode(props) {
}
};

console.log("we get here?");

finish &&
dispatch(
updateCompletedExercise(exerciseId, id, finalTime(), experience())
Expand Down
Loading