Skip to content

Fix input handling #249

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 1 commit into from
Feb 24, 2022
Merged

Fix input handling #249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 deletions web/src/components/predictions/questions/interval-choice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { calculateScore, displayMessage, displayScore } from "../utils";
import Spacer from "../../core/spacer.js";

function IntervalChoice(props) {
const { uid, qid, answer, lower, upper } = props;
const { uid, qid, answer, lower, upper, step } = props;
const date_expired = new Date(props.date_expired);
const [values, setValues] = useState(
props.prediction ? props.prediction : [lower, upper]
Expand All @@ -28,6 +28,10 @@ function IntervalChoice(props) {
event.preventDefault();
};

const parseValue = (value) => {
return step === 1 ? parseInt(value) : parseFloat(value);
}

// Updates Firebase with final values
const updateFirebase = () => {
const updates = {};
Expand All @@ -42,7 +46,7 @@ function IntervalChoice(props) {

const validateLower = (e) => {
const bound = Math.min(values[1], upper);
let value = parseFloat(e.target.value);
let value = parseValue(e.target.value);
if (value < lower || e.target.value === "") {
value = lower;
} else if (value > bound) {
Expand All @@ -54,7 +58,7 @@ function IntervalChoice(props) {

const validateUpper = (e) => {
const bound = Math.max(values[0], lower);
let value = parseFloat(e.target.value);
let value = parseValue(e.target.value);
if (value > upper || e.target.value === "") {
value = upper;
} else if (value < bound) {
Expand Down Expand Up @@ -95,13 +99,6 @@ function IntervalChoice(props) {
}
}

function update(value, values, step) {
if (step === 1) {
setValues([value && parseInt(value), values[1]])
}
setValues([value && parseFloat(value), values[1]]);
}

return (
<form onSubmit={(event) => afterSubmission(event)}>
<Grid mt={1} mx={3} gap={0} columns={[2, "3fr 5fr"]}>
Expand Down Expand Up @@ -159,7 +156,9 @@ function IntervalChoice(props) {
max={upper}
value={values[0]}
disabled={props.disabled}
onChange={(e) => update(e.target.value, values, props.step)}
onChange={(e) =>
setValues([e.target.value && parseValue(e.target.value), values[1]])
}
onBlur={validateLower}
onKeyDown={(e) => {
if (e.key === "Enter") e.target.blur();
Expand All @@ -177,7 +176,9 @@ function IntervalChoice(props) {
max={upper}
value={values[1]}
disabled={props.disabled}
onChange={(e) => update(e.target.value, values, props.step)}
onChange={(e) =>
setValues([values[0], e.target.value && parseValue(e.target.value)])
}
onBlur={validateUpper}
onKeyDown={(e) => {
if (e.key === "Enter") e.target.blur();
Expand Down