Skip to content

Feature/77 format validator #671

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
ddelpiano merged 2 commits into from
Feb 1, 2023
Merged

Feature/77 format validator #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52cdeaa
Change experiment edit textfield numbers format
enicolasgomez Jan 30, 2023
fa81dbf
Removed ny model added by mistake
enicolasgomez Jan 30, 2023
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
17 changes: 9 additions & 8 deletions webapp/components/experiments/ExperimentEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ const ParameterRow = (parameter, index, handleParamSelection, handleChange, hand
id={`${parameter.name}-from`}
label="From"
variant="filled"
type="number"
type="text" inputMode="numeric"
value={parameter?.minVal || parameter?.min}
onChange={(e) => handleRangeInput(e.target.value, index, parameter, 'min')}
onChange={(e) => handleRangeInput(e.target, index, parameter, 'min')}
error={parameter?.minerror}
helperText={parameter?.minhelperText}
autoComplete="off"
Expand All @@ -115,9 +115,9 @@ const ParameterRow = (parameter, index, handleParamSelection, handleChange, hand
id={`${parameter.name}-to`}
label="To"
variant="filled"
type="number"
type="text" inputMode="numeric"
value={parameter?.maxVal || parameter?.max}
onChange={(e) => handleRangeInput(e.target.value, index, parameter, 'max')}
onChange={(e) => handleRangeInput(e.target, index, parameter, 'max')}
error={parameter?.maxerror}
helperText={parameter?.maxhelperText}
autoComplete="off"
Expand All @@ -128,9 +128,8 @@ const ParameterRow = (parameter, index, handleParamSelection, handleChange, hand
id={`${parameter.name}-step`}
label="Step"
variant="filled"
type="number"
value={parameter?.stepVal || parameter?.step}
onChange={(e) => handleRangeInput(e.target.value, index, parameter, 'step')}
type="text" inputMode="numeric"
onChange={(e) => handleRangeInput(e.target, index, parameter, 'step')}
error={parameter?.steperror}
helperText={parameter?.stephelperText}
autoComplete="off"
Expand Down Expand Up @@ -463,10 +462,12 @@ const ExperimentEdit = (props) => {
setGroupParameters(newGroupParams);
};

const handleRangeInput = (val, index, parameter, key) => {
const handleRangeInput = (input, index, parameter, key) => {
const val = input.value ;
const newParameters = parameter.inGroup ? [...groupParameters] : [...parameters];
newParameters[index] = ExperimentHelper.validateRangeParameter(parameter, val, key);
setParamChange(parameter.inGroup, newParameters);
input.value = val ;
};

const handleInputValues = (val, index, parameter) => {
Expand Down
13 changes: 13 additions & 0 deletions webapp/components/experiments/ExperimentHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,26 @@ export const convertFieldValue = (field, value) => {
case REAL_TYPE.BOOL:
return Boolean(value);

case REAL_TYPE_FLOAT:
return validLocale(value);

default:
// .. handling of more types
// list(float), dict, list(list(float)), func
return value;
}
};

function getLocale() {
if (navigator.languages != undefined)
return navigator.languages[0];
return navigator.language;
}
function validLocale(num) {
const locale = getLocale();
return Intl.NumberFormat(locale).format(num);
}

export const isValidValue = (value, type) => {
if (type == null) {
return false;
Expand Down
4 changes: 2 additions & 2 deletions webapp/components/general/Dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ const AboutContent = withStyles(styles)(({ classes }) => (
<img width="250" src={logoNetpyne} />
<Box m={1}>
<Link variant="h5" style={{ display: 'block' }} href="https://github.com/MetaCell/NetPyNE-UI" target="_blank">
NetPyNE-UI v0.9.0
NetPyNE-UI v0.9.1
</Link>
<Link variant="h5" style={{ display: 'block' }} href="https://github.com/Neurosim-lab/netpyne" target="_blank">
NetPyNE v1.0.3
NetPyNE v1.0.3.1
</Link>
<Link variant="h5" style={{ display: 'block' }} href="https://www.neuron.yale.edu/neuron/" target="_blank">
NEURON v8.0.2
Expand Down