Skip to content

Template Builder Geometric Shape #43

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

Open
jr-527 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Template Builder Geometric Shape #43

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
5fc0301
Hide Geometric Shape field for imaging observations
jr-527 Apr 9, 2023
b83b1ff
CSS changes
jr-527 Apr 9, 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
Binary file added .vs/template-builder/FileContentIndex/cfce438f-c91f-4dfd-95ac-c2921ea69022.vsidx
View file
Open in desktop
Binary file not shown.
Binary file added .vs/template-builder/FileContentIndex/e6cb0543-85c0-4dc3-858d-3e6653e1c4af.vsidx
View file
Open in desktop
Binary file not shown.
57 changes: 34 additions & 23 deletions src/components/questionCreation/QuestionForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ const materialUseStyles = makeStyles(theme => ({
},
answerTermGroup: {
display: 'flex',
width: 430,
justifyContent: 'space-between',
width: 'auto',
// justifyContent: 'space-between',
alignItems: 'baseline'
},
button: {
Expand Down Expand Up @@ -986,6 +986,7 @@ const QuestionForm = props => {
<IconButton
// size="small"
className={classes.iconButton}
style={{ top: '6px' }}
onClick={() => {
// Objects are ordered:
// https://stackoverflow.com/questions/30076219/does-es6-introduce-a-well-defined-order-of-enumeration-for-object-properties
Expand Down Expand Up @@ -1024,6 +1025,7 @@ const QuestionForm = props => {
<IconButton
// size="small"
className={classes.iconButton}
style={{ top: '6px' }}
onClick={() => {
// The same code as above, but the sorted array has its order swapped.
// This is for demonstration purposes, as I can't imagine anyone needs
Expand All @@ -1050,27 +1052,36 @@ const QuestionForm = props => {
</Tooltip>
</>
)}
<FormControl className={classes.geometricShape}>
<InputLabel id="GeometricShape">Geometric Shape</InputLabel>
<Select
labelId="GeometricShape"
value={GeometricShape}
onChange={e => {
postQuestion({ ...formInput, GeometricShape: e.target.value });
setGeometricShape(e.target.value);
}}
disabled={selectedTerms && Object.keys(selectedTerms).length > 0}
>
<MenuItem value="">
<em>None</em>
</MenuItem>
{Object.keys(geometricShapes).map(el => (
<MenuItem value={el} key={el}>
{geometricShapes[el]}
</MenuItem>
))}
</Select>
</FormControl>
{questionType === 'anatomic' && (
<>
<FormControl className={classes.geometricShape}>
<InputLabel id="GeometricShape">Geometric Shape</InputLabel>
<Select
labelId="GeometricShape"
value={GeometricShape}
onChange={e => {
postQuestion({
...formInput,
GeometricShape: e.target.value
});
setGeometricShape(e.target.value);
}}
disabled={
selectedTerms && Object.keys(selectedTerms).length > 0
}
>
<MenuItem value="">
<em>None</em>
</MenuItem>
{Object.keys(geometricShapes).map(el => (
<MenuItem value={el} key={el}>
{geometricShapes[el]}
</MenuItem>
))}
</Select>
</FormControl>
</>
)}
</div>
{/* </div> */}
{/* {answerType === 'scale' && characteristic && (
Expand Down