Skip to content

Commit

Permalink
Merge branch 'develop' into fix-1006-provider-management-rewrite
Browse files Browse the repository at this point in the history
  • Loading branch information
@mozzy11
mozzy11 authored Jun 6, 2024
2 parents 039e6d8 + f31dbd8 commit 2d41e17
Show file tree
Hide file tree
Showing 5 changed files with 147 additions and 138 deletions.
8 changes: 3 additions & 5 deletions frontend/src/components/admin/calculatedValue/CalculatedValueForm.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -590,11 +590,9 @@ const CalculatedValue: React.FC<CalculatedValueProps> = () => {
<Grid>
<Column lg={16}>
<Section>
<Section>
<Heading>
<FormattedMessage id="sidenav.label.admin.testmgt.calculated" />
</Heading>
</Section>
<Heading>
<FormattedMessage id="sidenav.label.admin.testmgt.calculated" />
</Heading>
</Section>
</Column>
</Grid>
Expand Down
8 changes: 3 additions & 5 deletions frontend/src/components/admin/labNumber/LabNumberManagement.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,9 @@ function LabNumberManagement() {
<Grid>
<Column lg={16}>
<Section>
<Section>
<Heading>
<FormattedMessage id="configure.labNumber.title" />
</Heading>
</Section>
<Heading>
<FormattedMessage id="configure.labNumber.title" />
</Heading>
</Section>
</Column>
</Grid>
Expand Down
14 changes: 6 additions & 8 deletions frontend/src/components/admin/menu/CommonProperties.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,12 @@ export const CommonProperties = () => {
<Grid fullWidth={true}>
<Column lg={16} md={8} sm={4}>
<Section>
<Section>
<Heading>
<FormattedMessage
id="ewfggwgewgewgweg"
defaultMessage="Common Properties"
/>
</Heading>
</Section>
<Heading>
<FormattedMessage
id="ewfggwgewgewgweg"
defaultMessage="Common Properties"
/>
</Heading>
</Section>
</Column>
</Grid>
Expand Down
247 changes: 132 additions & 115 deletions frontend/src/components/admin/program/ProgramManagement.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,127 +175,144 @@ function ProgramManagement() {
<Grid>
<Column lg={16}>
<Section>
<Section>
<Heading>
<FormattedMessage id="edit.add.program.title" />
</Heading>
</Section>
<Heading>
<FormattedMessage id="edit.add.program.title" />
</Heading>
</Section>
</Column>
</Grid>
<Form onSubmit={handleSubmit}>
<div className="formInlineDiv">
<Select
id="additionalQuestionsSelect"
labelText="Program"
onChange={handleProgramSelection}
>
<SelectItem
value=""
text={intl.formatMessage({ id: "new.program.label" })}
/>
{programs.map((program) => {
return (
<SelectItem
key={program.id}
value={program.id}
text={program.value}
/>
);
})}
</Select>
{loading && <Loading />}
</div>
<Grid>
<Column lg={8}>
<Select
id="additionalQuestionsSelect"
labelText="Program"
onChange={handleProgramSelection}
>
<SelectItem
value=""
text={intl.formatMessage({ id: "new.program.label" })}
/>
{programs.map((program) => {
return (
<SelectItem
key={program.id}
value={program.id}
text={program.value}
/>
);
})}
</Select>
{loading && <Loading />}
</Column>
<Column lg={16}>
<br></br>
</Column>

<div className="formInlineDiv">
<input
type="hidden"
name="program.id"
value={programValues.program.id}
onChange={handleFieldChange}
/>
<TextInput
type="text"
name="program.programName"
id="program.programName"
labelText={intl.formatMessage({ id: "program.name.label" })}
value={programValues.program.programName}
onChange={handleFieldChange}
/>
<TextInput
type="text"
name="program.questionnaireUUID"
id="program.questionnaireUUID"
labelText="UUID"
disabled={programValues.program.id !== "" ? true : false}
value={programValues.program.questionnaireUUID}
onChange={handleFieldChange}
/>
</div>
<div className="formInlineDiv">
<TextInput
type="text"
name="program.code"
id="program.code"
labelText="Code"
maxLength="10"
value={programValues.program.code}
onChange={handleFieldChange}
/>
<Select
id="test_section"
labelText={intl.formatMessage({ id: "test.section.label" })}
name="testSectionId"
value={programValues.testSectionId}
onChange={handleFieldChange}
>
<SelectItem value="" text="" />
{testSections.map((testSection) => {
return (
<SelectItem
key={testSection.id}
value={testSection.id}
text={testSection.value}
/>
);
})}
</Select>
</div>
<div className="formInlineDiv">
<TextArea
name="additionalOrderEntryQuestions"
id="additionalOrderEntryQuestions"
labelText="Questionnaire"
value={programValues.additionalOrderEntryQuestions || ""}
onChange={handleFieldChange}
invalid={
!additionalOrderEntryQuestionsAreJson &&
programValues.additionalOrderEntryQuestions !== ""
}
invalidText={intl.formatMessage({ id: "invalid.json" })}
/>
{additionalOrderEntryQuestionsAreJson && (
<div>
<FormLabel>
<FormattedMessage id="example" />
</FormLabel>
<div className="exampleDiv">
<Questionnaire
questionnaire={JSON.parse(
programValues.additionalOrderEntryQuestions,
)}
/>
<Column lg={8}>
<input
type="hidden"
name="program.id"
value={programValues.program.id}
onChange={handleFieldChange}
/>
<TextInput
type="text"
name="program.programName"
id="program.programName"
labelText={intl.formatMessage({ id: "program.name.label" })}
value={programValues.program.programName}
onChange={handleFieldChange}
/>
</Column>
<Column lg={8}>
<TextInput
type="text"
name="program.questionnaireUUID"
id="program.questionnaireUUID"
labelText="UUID"
disabled={programValues.program.id !== "" ? true : false}
value={programValues.program.questionnaireUUID}
onChange={handleFieldChange}
/>
</Column>
<Column lg={16}>
<br></br>
</Column>
<Column lg={8}>
<TextInput
type="text"
name="program.code"
id="program.code"
labelText="Code"
maxLength="10"
value={programValues.program.code}
onChange={handleFieldChange}
/>
</Column>
<Column lg={8}>
<Select
id="test_section"
labelText={intl.formatMessage({ id: "test.section.label" })}
name="testSectionId"
value={programValues.testSectionId}
onChange={handleFieldChange}
>
<SelectItem value="" text="" />
{testSections.map((testSection) => {
return (
<SelectItem
key={testSection.id}
value={testSection.id}
text={testSection.value}
/>
);
})}
</Select>
</Column>
<Column lg={16}>
<br></br>
</Column>
<Column lg={8}>
<TextArea
name="additionalOrderEntryQuestions"
id="additionalOrderEntryQuestions"
labelText="Questionnaire"
value={programValues.additionalOrderEntryQuestions || ""}
onChange={handleFieldChange}
invalid={
!additionalOrderEntryQuestionsAreJson &&
programValues.additionalOrderEntryQuestions !== ""
}
invalidText={intl.formatMessage({ id: "invalid.json" })}
/>
</Column>
<Column lg={8}>
{additionalOrderEntryQuestionsAreJson && (
<div>
<FormLabel>
<FormattedMessage id="example" />
</FormLabel>
<div className="exampleDiv">
<Questionnaire
questionnaire={JSON.parse(
programValues.additionalOrderEntryQuestions,
)}
/>
</div>
</div>
</div>
)}
</div>
<br></br>
<div>
<Button type="submit">
<FormattedMessage id="label.button.submit" />
{isSubmitting && <Loading small={true} />}
</Button>
</div>
)}
</Column>
<Column lg={16}>
<br></br>
</Column>
<Column lg={3}>
<Button type="submit">
<FormattedMessage id="label.button.submit" />
{isSubmitting && <Loading small={true} />}
</Button>
</Column>
</Grid>
</Form>
</div>
</>
Expand Down
8 changes: 3 additions & 5 deletions frontend/src/components/admin/reflexTests/ReflexTestManagement.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@ function ReflexTestManagement() {
<Grid>
<Column lg={16}>
<Section>
<Section>
<Heading>
<FormattedMessage id="sidenav.label.admin.testmgt.reflex" />
</Heading>
</Section>
<Heading>
<FormattedMessage id="sidenav.label.admin.testmgt.reflex" />
</Heading>
</Section>
</Column>
</Grid>
Expand Down

0 comments on commit 2d41e17

Please sign in to comment.