From 7c37457d0c2cccf4bf0ea4b25c594c0b8ffae81a Mon Sep 17 00:00:00 2001 From: Hero Date: Wed, 23 Aug 2023 07:54:43 +0200 Subject: [PATCH 1/8] allow read only for hiv test when latest hiv test status is empty for ANC, LND and PNC --- distro/configuration/ampathforms/pmtct_antenatal_v1.0.json | 2 +- .../ampathforms/pmtct_labour_and_delivery_v1.0.json | 2 +- .../configuration/ampathforms/pmtct_mother_postnatal_v1.0.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json b/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json index 8eb0acb18..fc1b58a4e 100644 --- a/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json +++ b/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json @@ -283,7 +283,7 @@ { "intent":"*", "required":"true", - "readonly": "mode == 'edit' && latest_hiv_test_result !== '138571AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_hiv_test_status == '8b8951a8-e8d6-40ca-ad70-89e8f8f71fa8' ? true : false", + "readonly": "mode == 'edit' && !isEmpty(latest_hiv_test_result) || !isEmpty(latest_hiv_test_status) ? true : false", "hide":{ "hideWhenExpression":"latest_hiv_test_result == '138571AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_hiv_test_status == '8b8951a8-e8d6-40ca-ad70-89e8f8f71fa8' || latest_art_initiation == '160119AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160120AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } diff --git a/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json b/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json index ac6b4797a..a9196bfe8 100644 --- a/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json +++ b/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json @@ -244,7 +244,7 @@ { "intent":"*", "required":"true", - "readonly": "mode == 'edit' && anc_latest_hiv_test_result !== '138571AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' ? true : false", + "readonly": "mode == 'edit' && !isEmpty(anc_latest_hiv_test_result) ? true : false", "hide":{ "hideWhenExpression":"anc_latest_hiv_test_result == '138571AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160119AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160120AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } diff --git a/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json b/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json index 0b80d0de6..81f960a26 100644 --- a/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json +++ b/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json @@ -239,7 +239,7 @@ { "intent":"*", "required":"true", - "readonly": "mode == 'edit' && ancHivTestResult !== '138571AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' ? true : false", + "readonly": "mode == 'edit' !isEmpty(ancHivTestResult) ? true : false", "hide":{ "hideWhenExpression":"testStatusAtANC == '8b8951a8-e8d6-40ca-ad70-89e8f8f71fa8' || ancHivTestResult == '138571AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160119AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160120AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" }, From d9f83dcaa16ffa57a1934faee1b8bfc133747ea6 Mon Sep 17 00:00:00 2001 From: pirupius Date: Wed, 23 Aug 2023 09:06:11 +0300 Subject: [PATCH 2/8] (chore) move logo config to distro --- frontend/Dockerfile | 2 + frontend/namibia_ohri_logo_darkbg.png | Bin 0 -> 22506 bytes frontend/namibia_ohri_logo_lightbg.png | Bin 0 -> 23085 bytes frontend/ohri-config.json | 52 +++++++++++++++---------- 4 files changed, 33 insertions(+), 21 deletions(-) create mode 100644 frontend/namibia_ohri_logo_darkbg.png create mode 100644 frontend/namibia_ohri_logo_lightbg.png diff --git a/frontend/Dockerfile b/frontend/Dockerfile index ff26fac39..c396db531 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -11,6 +11,8 @@ COPY spa-build-config.json . ARG CACHE_BUST RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} assemble --manifest --mode config --config spa-build-config.json --target ./spa RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} build --build-config spa-build-config.json --target ./spa +COPY namibia_ohri_logo_darkbg.svg ./spa/namibia_ohri_logo_darkbg.svg +COPY namibia_ohri_logo_lightbg.svg ./spa/namibia_ohri_logo_lightbg.svg COPY ohri-config.json ./spa/ohri-config.json FROM nginx:1.23-alpine diff --git a/frontend/namibia_ohri_logo_darkbg.png b/frontend/namibia_ohri_logo_darkbg.png new file mode 100644 index 0000000000000000000000000000000000000000..943df535836d08ce8861b7556f247f6a67542db3 GIT binary patch literal 22506 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 PK8UTQqeUauFZKTbWUVB) literal 0 HcmV?d00001 diff --git a/frontend/ohri-config.json b/frontend/ohri-config.json index b6c943b87..d22686eb0 100644 --- a/frontend/ohri-config.json +++ b/frontend/ohri-config.json @@ -28,32 +28,32 @@ ] }, "action-menu-non-chart-items-slot": { - "remove":[ - "patient-list-action-menu" - ] + "remove": ["patient-list-action-menu"] } }, - "notesConceptUuids": ["161011AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "437d1e25-e7ab-481c-aabc-01f21c6cdef1"] + "notesConceptUuids": [ + "161011AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "437d1e25-e7ab-481c-aabc-01f21c6cdef1" + ], + "logo": { + "src": "namibia_ohri_logo_darkbg.png" + } }, "@ohri/openmrs-esm-ohri-core-app": { "extensionSlots": { - "dashboard-links-slot":{ - "remove":[ - "appointments-ohri-dashboard-ext", - "dispensing-ohri-dashboard-ext", - "service-queues-ohri-dashboard-ext" + "dashboard-links-slot": { + "remove": [ + "appointments-ohri-dashboard-ext", + "dispensing-ohri-dashboard-ext", + "service-queues-ohri-dashboard-ext" ] }, "ohri-dashboard-appointments-slot": { - "add": [ - "clinical-appointments-dashboard" - ] + "add": ["clinical-appointments-dashboard"] }, "ohri-dashboard-dispensing-slot": { - "add": [ - "dispensing-dashboard" - ] - } + "add": ["dispensing-dashboard"] + } } }, "@openmrs/esm-patient-banner-app": { @@ -120,8 +120,12 @@ ], "sections": ["demographics", "contact", "nextofkin", "relationships"], "sectionDefinitions": [ - { "id": "nextofkin", "name": "Next of Kin", "fields":["nextOfKinName", "nextOfKinContactNo"] }, - { "id": "relationships", "name": "Create relationship" } + { + "id": "nextofkin", + "name": "Next of Kin", + "fields": ["nextOfKinName", "nextOfKinContactNo"] + }, + { "id": "relationships", "name": "Create relationship" } ] }, @@ -133,10 +137,16 @@ "@openmrs/esm-primary-navigation-app": { "extensionSlots": { "app-menu-slot": { - "remove": [ - "dispensing-link" - ] + "remove": ["dispensing-link"] } + }, + "logo": { + "src": "namibia_ohri_logo_darkbg.png" + } + }, + "@openmrs/esm-login-app": { + "logo": { + "src": "namibia_ohri_logo_lightbg.png" } }, "@ohri/openmrs-esm-ohri-pmtct": { From fee38d5b3131af34a816ec91dbd4adc33965e059 Mon Sep 17 00:00:00 2001 From: Hero Date: Wed, 23 Aug 2023 11:27:16 +0200 Subject: [PATCH 3/8] correction of the check --- .../ampathforms/pmtct_antenatal_v1.0.json | 2 +- .../pmtct_labour_and_delivery_v1.0.json | 41 ++++++++++++++++++- .../pmtct_mother_postnatal_v1.0.json | 41 ++++++++++++++++++- 3 files changed, 81 insertions(+), 3 deletions(-) diff --git a/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json b/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json index fc1b58a4e..5f044664e 100644 --- a/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json +++ b/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json @@ -283,7 +283,7 @@ { "intent":"*", "required":"true", - "readonly": "mode == 'edit' && !isEmpty(latest_hiv_test_result) || !isEmpty(latest_hiv_test_status) ? true : false", + "readonly": "mode == 'edit' && isEmpty(latest_hiv_test_status) && isEmpty(hiv_test) ? true : false", "hide":{ "hideWhenExpression":"latest_hiv_test_result == '138571AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_hiv_test_status == '8b8951a8-e8d6-40ca-ad70-89e8f8f71fa8' || latest_art_initiation == '160119AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160120AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } diff --git a/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json b/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json index a9196bfe8..52fe068d5 100644 --- a/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json +++ b/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json @@ -244,13 +244,52 @@ { "intent":"*", "required":"true", - "readonly": "mode == 'edit' && !isEmpty(anc_latest_hiv_test_result) ? true : false", + "readonly": "mode == 'edit' && isEmpty(latest_hiv_test_status) || isEmpty(anc_hiv_test_status) ? true : false", "hide":{ "hideWhenExpression":"anc_latest_hiv_test_result == '138571AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160119AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160120AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } } ] }, + { + "label": "Latest HIV Test Status", + "type": "obs", + "id": "latest_hiv_test_status", + "questionOptions": { + "concept": "164401AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "rendering": "fixed-value", + "calculate": { + "calculateExpression": "resolve(api.getLatestObs(patient.id, '164401AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '2678423c-0523-4d76-b0da-18177b439eed'))?.valueCodeableConcept?.coding[0]?.code" + }, + "answers": [ + { + "concept": "6f041992-f0fd-4ec7-b7b6-c06b0f60bf3f", + "label": "Tested for HIV during this visit" + }, + { + "concept": "8b8951a8-e8d6-40ca-ad70-89e8f8f71fa8", + "label": "Previously known positive" + }, + { + "concept": "d18fa331-f158-47d0-b344-cf147c7125a4", + "label": "Not tested for HIV during this visit" + }, + { + "concept": "54b96458-6585-4c4c-a5b1-b3ca7f1be351", + "label": "Missing" + } + ] + }, + "behaviours":[ + { + "intent":"*", + "required":"false", + "hide":{ + "hideWhenExpression":"true" + } + } + ] + }, { "label": "HIV Test Status at maternity/delivery", "type": "obs", diff --git a/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json b/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json index 81f960a26..e6aea9cce 100644 --- a/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json +++ b/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json @@ -239,7 +239,7 @@ { "intent":"*", "required":"true", - "readonly": "mode == 'edit' !isEmpty(ancHivTestResult) ? true : false", + "readonly": "mode == 'edit' && !isEmpty(latest_hiv_test_status) || isEmpty(hiv_test_status_pnc) ? true : false", "hide":{ "hideWhenExpression":"testStatusAtANC == '8b8951a8-e8d6-40ca-ad70-89e8f8f71fa8' || ancHivTestResult == '138571AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160119AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160120AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" }, @@ -249,6 +249,45 @@ } ] }, + { + "label": "Latest HIV Test Status", + "type": "obs", + "id": "latest_hiv_test_status", + "questionOptions": { + "concept": "164401AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "rendering": "fixed-value", + "calculate": { + "calculateExpression": "resolve(api.getLatestObs(patient.id, '164401AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '269bcc7f-04f8-4ddc-883d-7a3a0d569aad'))?.valueCodeableConcept?.coding[0]?.code" + }, + "answers": [ + { + "concept": "6f041992-f0fd-4ec7-b7b6-c06b0f60bf3f", + "label": "Tested for HIV during this visit" + }, + { + "concept": "8b8951a8-e8d6-40ca-ad70-89e8f8f71fa8", + "label": "Previously known positive" + }, + { + "concept": "d18fa331-f158-47d0-b344-cf147c7125a4", + "label": "Not tested for HIV during this visit" + }, + { + "concept": "54b96458-6585-4c4c-a5b1-b3ca7f1be351", + "label": "Missing" + } + ] + }, + "behaviours":[ + { + "intent":"*", + "required":"false", + "hide":{ + "hideWhenExpression":"true" + } + } + ] + }, { "label":"HIV Test Result", "type":"obs", From e88b3212a3425adc6abcf39d4abe08fde3b0b8bb Mon Sep 17 00:00:00 2001 From: pirupius Date: Thu, 24 Aug 2023 09:38:36 +0300 Subject: [PATCH 4/8] (chore) fixes logo name typo --- frontend/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index c396db531..ccc4458e0 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -11,8 +11,8 @@ COPY spa-build-config.json . ARG CACHE_BUST RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} assemble --manifest --mode config --config spa-build-config.json --target ./spa RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} build --build-config spa-build-config.json --target ./spa -COPY namibia_ohri_logo_darkbg.svg ./spa/namibia_ohri_logo_darkbg.svg -COPY namibia_ohri_logo_lightbg.svg ./spa/namibia_ohri_logo_lightbg.svg +COPY namibia_ohri_logo_darkbg.png ./spa/namibia_ohri_logo_darkbg.png +COPY namibia_ohri_logo_lightbg.png ./spa/namibia_ohri_logo_lightbg.png COPY ohri-config.json ./spa/ohri-config.json FROM nginx:1.23-alpine From 8247eaf81bb56781f5a53868b5cf544876b93146 Mon Sep 17 00:00:00 2001 From: Amos Laboso Date: Thu, 24 Aug 2023 10:47:23 +0300 Subject: [PATCH 5/8] Fixed version for platform to 2.6.1 from nightly. Latest nightly needs to be tested before being rolled out --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f77982418..b256cf042 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ### Dev Stage -FROM openmrs/openmrs-core:dev as dev +FROM openmrs/openmrs-core:2.6.1 as dev WORKDIR /openmrs_distro ARG MVN_ARGS_SETTINGS="-s /usr/share/maven/ref/settings-docker.xml -U" @@ -25,7 +25,7 @@ RUN mvn clean $MVN_ARGS_SETTINGS ### Run Stage # Replace 'nightly' with the exact version of openmrs-core built for production (if available) -FROM openmrs/openmrs-core:nightly +FROM openmrs/openmrs-core:2.6.1 # Do not copy the war if using the correct openmrs-core image version COPY --from=dev /openmrs/distribution/openmrs_core/openmrs.war /openmrs/distribution/openmrs_core/ From 69a8f8b006cefd393db9bae9569e2fc56e83d4fa Mon Sep 17 00:00:00 2001 From: Amos Laboso Date: Thu, 24 Aug 2023 10:54:53 +0300 Subject: [PATCH 6/8] Fixed version for platform to 2.6.1 from nightly. Latest nightly needs to be tested before being rolled out --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b256cf042..7bee6dd73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ### Dev Stage -FROM openmrs/openmrs-core:2.6.1 as dev +FROM openmrs/openmrs-core:dev as dev WORKDIR /openmrs_distro ARG MVN_ARGS_SETTINGS="-s /usr/share/maven/ref/settings-docker.xml -U" From b3c5ba1be65de2f04c6a0afe4bf7d0f97ee80225 Mon Sep 17 00:00:00 2001 From: Amos Laboso Date: Thu, 24 Aug 2023 11:12:42 +0300 Subject: [PATCH 7/8] Fixed version for platform to 2.6.1 from nightly. Latest nightly needs to be tested before being rolled out --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7bee6dd73..8895927dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ### Dev Stage -FROM openmrs/openmrs-core:dev as dev +FROM openmrs/openmrs-core:2.6.1-dev as dev WORKDIR /openmrs_distro ARG MVN_ARGS_SETTINGS="-s /usr/share/maven/ref/settings-docker.xml -U" From 4e19b8e5d5b90bd8ea6afb599e05ea3e0a6f3a39 Mon Sep 17 00:00:00 2001 From: Amos Laboso Date: Thu, 24 Aug 2023 12:04:59 +0300 Subject: [PATCH 8/8] Revert dev version for platform --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8895927dc..f77982418 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ### Dev Stage -FROM openmrs/openmrs-core:2.6.1-dev as dev +FROM openmrs/openmrs-core:dev as dev WORKDIR /openmrs_distro ARG MVN_ARGS_SETTINGS="-s /usr/share/maven/ref/settings-docker.xml -U" @@ -25,7 +25,7 @@ RUN mvn clean $MVN_ARGS_SETTINGS ### Run Stage # Replace 'nightly' with the exact version of openmrs-core built for production (if available) -FROM openmrs/openmrs-core:2.6.1 +FROM openmrs/openmrs-core:nightly # Do not copy the war if using the correct openmrs-core image version COPY --from=dev /openmrs/distribution/openmrs_core/openmrs.war /openmrs/distribution/openmrs_core/