Skip to content

#1606 | Fix: Pass formType to RuleDesigner for Program Encounter elig… #1612

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

Closed
wants to merge 1 commit into from
Closed

#1606 | Fix: Pass formType to RuleDesigner for Program Encounter elig… #1612

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
71 changes: 37 additions & 34 deletions src/adminApp/EncounterType/EditEncounterTypeFields.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
findEncounterCancellationForms,
findEncounterForms,
findProgramEncounterCancellationForms,
findProgramEncounterForms
findProgramEncounterForms,
} from "../domain/formMapping";

const EditEncounterTypeFields = ({
Expand All @@ -29,7 +29,7 @@ const EditEncounterTypeFields = ({
ruleValidationError,
formMappings,
setProgram,
allPrograms
allPrograms,
}) => {
function getCancellationForms() {
return _.isEmpty(programT)
Expand All @@ -46,17 +46,17 @@ const EditEncounterTypeFields = ({
useEffect(() => {
if (!_.isEmpty(subjectT)) {
const matchingFormMappings = formMappings.filter(
formMapping =>
(formMapping) =>
formMapping.subjectTypeUUID === subjectT.uuid &&
!_.isNil(formMapping.programUUID)
!_.isNil(formMapping.programUUID),
);
setProgram(
allPrograms.filter(program =>
allPrograms.filter((program) =>
_.includes(
matchingFormMappings.map(formMapping => formMapping.programUUID),
program.uuid
)
)
matchingFormMappings.map((formMapping) => formMapping.programUUID),
program.uuid,
),
),
);
}
}, [subjectT]);
Expand All @@ -68,7 +68,7 @@ const EditEncounterTypeFields = ({
label="Name*"
autoComplete="off"
value={encounterType.name}
onChange={event =>
onChange={(event) =>
dispatch({ type: "name", payload: event.target.value })
}
toolTipKey={"APP_DESIGNER_ENCOUNTER_TYPE_NAME"}
Expand All @@ -77,34 +77,34 @@ const EditEncounterTypeFields = ({
<AvniSelect
label="Select subject type"
value={_.isEmpty(subjectT) ? "" : subjectT?.uuid}
onChange={event => {
onChange={(event) => {
const selectedSubject = subjectType.find(
s => s.uuid === event.target.value
(s) => s.uuid === event.target.value,
);
setSubjectT(selectedSubject);
}}
style={{ width: "200px" }}
required
options={subjectType.map(option => ({
options={subjectType.map((option) => ({
value: option.uuid,
label: option.name
label: option.name,
}))}
toolTipKey={"APP_DESIGNER_ENCOUNTER_TYPE_SUBJECT"}
/>
<p />
<AvniSelect
label="Select Program"
value={_.isEmpty(programT) ? "" : programT?.uuid || programT}
onChange={event => {
onChange={(event) => {
const selectedProgram = program.find(
p => p.uuid === event.target.value
(p) => p.uuid === event.target.value,
);
updateProgram(selectedProgram);
}}
style={{ width: "200px" }}
options={program.map(option => ({
options={program.map((option) => ({
value: option.uuid,
label: option.name
label: option.name,
}))}
toolTipKey={"APP_DESIGNER_ENCOUNTER_TYPE_PROGRAM"}
isClearable={true}
Expand All @@ -113,10 +113,10 @@ const EditEncounterTypeFields = ({
<AvniSelectForm
label={"Select Encounter Form"}
value={_.get(encounterType, "programEncounterForm.formName")}
onChange={selectedForm =>
onChange={(selectedForm) =>
dispatch({
type: "programEncounterForm",
payload: selectedForm
payload: selectedForm,
})
}
formList={getEncounterForms()}
Expand All @@ -127,12 +127,12 @@ const EditEncounterTypeFields = ({
label={"Select Encounter Cancellation Form"}
value={_.get(
encounterType,
"programEncounterCancellationForm.formName"
"programEncounterCancellationForm.formName",
)}
onChange={selectedForm =>
onChange={(selectedForm) =>
dispatch({
type: "programEncounterCancellationForm",
payload: selectedForm
payload: selectedForm,
})
}
formList={getCancellationForms()}
Expand All @@ -147,38 +147,41 @@ const EditEncounterTypeFields = ({
<Box sx={{ maxWidth: "75%" }}>
<RuleDesigner
rulesJson={encounterType.encounterEligibilityCheckDeclarativeRule}
onValueChange={jsonData =>
onValueChange={(jsonData) =>
dispatch({
type: "encounterEligibilityCheckDeclarativeRule",
payload: jsonData
payload: jsonData,
})
}
updateJsCode={declarativeRuleHolder =>
updateJsCode={(declarativeRuleHolder) =>
dispatch({
type: "encounterEligibilityCheckRule",
payload: declarativeRuleHolder.generateEligibilityRule()
payload: declarativeRuleHolder.generateEligibilityRule(),
})
}
jsCode={encounterType.encounterEligibilityCheckRule}
error={ruleValidationError}
subjectType={subjectT}
getApplicableActions={state =>
form={{
formType: _.isEmpty(programT) ? "Encounter" : "ProgramEncounter",
}}
getApplicableActions={(state) =>
state.getApplicableEncounterEligibilityActions()
}
sampleRule={sampleEncounterEligibilityCheckRule()}
onJsCodeChange={event => {
onJsCodeChange={(event) => {
confirmBeforeRuleEdit(
encounterType.encounterEligibilityCheckDeclarativeRule,
() =>
dispatch({
type: "encounterEligibilityCheckRule",
payload: event
payload: event,
}),
() =>
dispatch({
type: "encounterEligibilityCheckDeclarativeRule",
payload: null
})
payload: null,
}),
);
}}
/>
Expand All @@ -188,10 +191,10 @@ const EditEncounterTypeFields = ({
<AvniSwitch
toolTipKey={"APP_DESIGNER_ENCOUNTER_TYPE_IMMUTABLE"}
name={"Immutable"}
onChange={e =>
onChange={(e) =>
dispatch({
type: "setImmutable",
payload: e.target.checked
payload: e.target.checked,
})
}
checked={!!encounterType.immutable}
Expand Down