Skip to content

Commit

Permalink
Merge pull request #56 from UCSF-GP-Namibia/dev
Browse files Browse the repository at this point in the history 
Dev -> Working
  • Loading branch information
@alaboso
alaboso authored Aug 24, 2023
2 parents a8c9f9d + 4e19b8e commit 1f2c741
Show file tree
Hide file tree
Showing 7 changed files with 114 additions and 24 deletions.
2 changes: 1 addition & 1 deletion distro/configuration/ampathforms/pmtct_antenatal_v1.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_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'"
}
Expand Down
41 changes: 40 additions & 1 deletion distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,52 @@
{
"intent":"*",
"required":"true",
"readonly": "mode == 'edit' && anc_latest_hiv_test_result !== '138571AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' ? 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",
Expand Down
41 changes: 40 additions & 1 deletion distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
{
"intent":"*",
"required":"true",
"readonly": "mode == 'edit' && ancHivTestResult !== '138571AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' ? 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'"
},
Expand All @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions frontend/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
Expand Down
Binary file added frontend/namibia_ohri_logo_darkbg.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/namibia_ohri_logo_lightbg.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 31 additions & 21 deletions frontend/ohri-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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" }
]
},

Expand All @@ -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": {
Expand Down

0 comments on commit 1f2c741

Please sign in to comment.