-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Repeating obs to re-display more consistently (#101)
* Repeating obs to re-display more consistently * Remove empty files
- Loading branch information
1 parent
e535be1
commit ae36707
Showing
15 changed files
with
1,457 additions
and
526 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| { | ||
| "resourceType": "Patient", | ||
| "id": "0c044d55-6bbb-4809-979c-8322d3095765", | ||
| "meta": { | ||
| "lastUpdated": "2023-05-17T17:10:01.000+00:00", | ||
| "tag": [ | ||
| { | ||
| "system": "http://terminology.hl7.org/CodeSystem/v3-ObservationValue", | ||
| "code": "SUBSETTED", | ||
| "display": "Resource encoded in summary mode" | ||
| } | ||
| ] | ||
| }, | ||
| "identifier": [ | ||
| { | ||
| "id": "1fc8ba6f-e311-46cd-89f5-4ab76b251049", | ||
| "extension": [ | ||
| { | ||
| "url": "http://fhir.openmrs.org/ext/patient/identifier#location", | ||
| "valueReference": { | ||
| "reference": "Location/44c3efb0-2583-4c80-a79e-1f756a03c0a1", | ||
| "type": "Location", | ||
| "display": "Outpatient Clinic" | ||
| } | ||
| } | ||
| ], | ||
| "use": "official", | ||
| "type": { | ||
| "coding": [ | ||
| { | ||
| "code": "05a29f94-c0ed-11e2-94be-8c13b969e334" | ||
| } | ||
| ], | ||
| "text": "OpenMRS ID" | ||
| }, | ||
| "value": "10014EW" | ||
| } | ||
| ], | ||
| "active": true, | ||
| "name": [ | ||
| { | ||
| "id": "3ef34554-056e-4284-95b6-ea796b965896", | ||
| "family": "Wills", | ||
| "given": [ | ||
| "smith", | ||
| "Kimoti" | ||
| ] | ||
| } | ||
| ], | ||
| "gender": "male", | ||
| "birthDate": "1956", | ||
| "deceasedBoolean": false, | ||
| "address": [ | ||
| { | ||
| "id": "54859289-a35a-498e-b84d-2c8ba375fdb8", | ||
| "extension": [ | ||
| { | ||
| "url": "http://fhir.openmrs.org/ext/address", | ||
| "extension": [ | ||
| { | ||
| "url": "http://fhir.openmrs.org/ext/address#address1", | ||
| "valueString": "Kampala" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "use": "home", | ||
| "city": "Kitale", | ||
| "district": "Central", | ||
| "country": "Uganda" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/components/repeat/ohri-repeat.test.ts → src/components/repeat/helpers.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| import { getConcept } from '../../api/api'; | ||
| import { OHRIFormField } from '../../api/types'; | ||
| import { cloneDeep } from 'lodash-es'; | ||
| import dayjs from 'dayjs'; | ||
| import { ConceptTrue } from '../../constants'; | ||
|
|
||
| export function cloneObsGroup( | ||
| srcField: OHRIFormField, | ||
| obsGroup: any, | ||
| idSuffix: number, | ||
| allFieldValues: Record<string, any>, | ||
| ) { | ||
| const originalGroupMembersIds: string[] = []; | ||
| const clonedField = cloneDeep(srcField) as OHRIFormField; | ||
| clonedField.questionOptions.repeatOptions = { ...(clonedField.questionOptions.repeatOptions ?? {}), isCloned: true }; | ||
| clonedField.value = obsGroup; | ||
| clonedField.id = `${clonedField.id}_${idSuffix}`; | ||
| clonedField.questions.forEach(childField => { | ||
| originalGroupMembersIds.push(childField.id); | ||
| childField.id = `${childField.id}_${idSuffix}`; | ||
| childField['groupId'] = clonedField.id; | ||
| childField.value = null; | ||
| const initialValue = obsGroup ? getInitialValueFromObs(childField, obsGroup) : null; | ||
| allFieldValues[`${childField.id}`] = initialValue | ||
| ? initialValue | ||
| : childField.questionOptions.rendering == 'checkbox' | ||
| ? [] | ||
| : ''; | ||
|
|
||
| // cleanup expressions | ||
|
|
||
| if (childField['hide'] && childField['hide'].hideWhenExpression) { | ||
| childField['hide'].hideWhenExpression = updateFieldIdInExpression( | ||
| childField['hide'].hideWhenExpression, | ||
| idSuffix, | ||
| originalGroupMembersIds, | ||
| ); | ||
| } | ||
| if (childField.validators?.length) { | ||
| childField.validators.forEach(validator => { | ||
| if (validator.type === 'js_expression') { | ||
| validator.failsWhenExpression = updateFieldIdInExpression( | ||
| validator.failsWhenExpression, | ||
| idSuffix, | ||
| originalGroupMembersIds, | ||
| ); | ||
| } | ||
| }); | ||
| } | ||
| if (childField.questionOptions.calculate?.calculateExpression) { | ||
| childField.questionOptions.calculate.calculateExpression = updateFieldIdInExpression( | ||
| childField.questionOptions.calculate?.calculateExpression, | ||
| idSuffix, | ||
| originalGroupMembersIds, | ||
| ); | ||
| } | ||
| }); | ||
| return clonedField; | ||
| } | ||
|
|
||
| export const getInitialValueFromObs = (field: OHRIFormField, obsGroup: any) => { | ||
| const rendering = field.questionOptions.rendering; | ||
| const obs = obsGroup.groupMembers.filter(o => o.concept.uuid == field.questionOptions.concept); | ||
| if (obs.length) { | ||
| field.value = obs[0]; | ||
| if (rendering == 'radio' || rendering == 'content-switcher') { | ||
| // TODO: Now that concepts are fetched at initialization, we don't need to perform this API call. | ||
| // Link the concepts with the associated form fields for future references | ||
| getConcept(field.questionOptions.concept, 'custom:(uuid,display,datatype:(uuid,display,name))').subscribe( | ||
| result => { | ||
| if (result.datatype.name == 'Boolean') { | ||
| field.value.value = obs[0].value.uuid; | ||
| } | ||
| }, | ||
| ); | ||
| } | ||
| if (typeof obs[0].value == 'string' || typeof obs[0].value == 'number') { | ||
| return field.questionOptions.rendering == 'date' ? dayjs(obs[0].value).toDate() : obs[0].value; | ||
| } | ||
| if (field.questionOptions.rendering == 'checkbox') { | ||
| field.value = obs; | ||
| return field.value.map(o => o.value.uuid); | ||
| } | ||
| if (field.questionOptions.rendering == 'toggle') { | ||
| field.value.value = obs[0].value.uuid; | ||
| return obs[0].value == ConceptTrue; | ||
| } | ||
| return obs[0].value?.uuid; | ||
| } | ||
| return ''; | ||
| }; | ||
|
|
||
| export const updateFieldIdInExpression = (expression: string, index: number, questionIds: string[]) => { | ||
| let uniqueQuestionIds = [...new Set(questionIds)]; | ||
| uniqueQuestionIds.forEach(id => { | ||
| if (expression.match(id)) { | ||
| expression = expression.replace(new RegExp(id, 'g'), `${id}_${index}`); | ||
| } | ||
| }); | ||
| return expression; | ||
| }; |
Oops, something went wrong.