Skip to content

Commit 3a6994a

Browse files
pgorrindopgorrindo
authored
Merge pull request #39 from Salcedo-HDF/1dev
Dev into Test - 2025-02-07a
2 parents f528435 + bcdca88 commit 3a6994a

10 files changed

+157
-100
lines changed

‎docker-compose-sdh.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
- frontend
1111
- backend
1212
ports:
13-
- ${PORTS}
13+
- "${ENVT_PORT}:80"
1414

1515
frontend:
1616
image: openmrs/openmrs-reference-application-3-frontend:${TAG:-qa}
@@ -21,7 +21,7 @@ services:
2121
SPA_CONFIG_URLS: /openmrs/spa/config-core-sdh-${ENVT}.json
2222
SPA_DEFAULT_LOCALE:
2323
healthcheck:
24-
test: ["CMD", "curl", "-f", "http://localhost/"]
24+
test: ["CMD", "curl", "-f", "http://localhost:${ENVT_PORT}/"]
2525
timeout: 5s
2626
depends_on:
2727
- backend
@@ -40,7 +40,7 @@ services:
4040
OMRS_CONFIG_CONNECTION_USERNAME: ${OPENMRS_DB_USER:-openmrs}
4141
OMRS_CONFIG_CONNECTION_PASSWORD: ${OPENMRS_DB_PASSWORD:-openmrs}
4242
healthcheck:
43-
test: ["CMD", "curl", "-f", "http://localhost:8080/openmrs"]
43+
test: ["CMD", "curl", "-f", "http://localhost:${ENVT_PORT}/openmrs"]
4444
timeout: 5s
4545
volumes:
4646
- openmrs-data:/openmrs/data

‎frontend/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#--------------------------------------------
55
FROM --platform=$BUILDPLATFORM node:18-alpine as dev
66

7-
ARG APP_SHELL_VERSION=next
7+
ARG APP_SHELL_VERSION=latest
88

99
RUN mkdir -p /app
1010
WORKDIR /app

‎frontend/config-core-sdh-1dev.json‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@
3636
"@openmrs/esm-styleguide": {
3737
"Brand color #1": "#2196F3",
3838
"Brand color #2": "#64B5F6",
39-
"Brand color #3": "#1976D2"
39+
"Brand color #3": "#1976D2",
40+
"implementationName": "SDH-dev",
41+
"preferredCalendar": {
42+
"en": "gregory"
43+
}
4044
},
4145
"@openmrs/esm-login-app": {
4246
"logo": {
@@ -47,5 +51,15 @@
4751
"logo": {
4852
"name": "SDH-Dev"
4953
}
54+
},
55+
"@openmrs/esm-patient-banner-app": {
56+
"extensionSlots": {
57+
"patient-actions-slot": {
58+
"remove": ["mark-patient-deceased-button"]
59+
}
60+
}
61+
},
62+
"@openmrs/esm-patient-registration-app": {
63+
"sections": ["demographics", "contact", "relationships", "death"]
5064
}
5165
}

‎frontend/config-core-sdh-2test.json‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@
3636
"@openmrs/esm-styleguide": {
3737
"Brand color #1": "#FFD53E",
3838
"Brand color #2": "#FDC43F",
39-
"Brand color #3": "#FDB833"
39+
"Brand color #3": "#FDB833",
40+
"implementationName": "SDH-test",
41+
"preferredCalendar": {
42+
"en": "gregory"
43+
}
4044
},
4145
"@openmrs/esm-login-app": {
4246
"logo": {
@@ -47,5 +51,15 @@
4751
"logo": {
4852
"name": "SDH-Test"
4953
}
54+
},
55+
"@openmrs/esm-patient-banner-app": {
56+
"extensionSlots": {
57+
"patient-actions-slot": {
58+
"remove": ["mark-patient-deceased-button"]
59+
}
60+
}
61+
},
62+
"@openmrs/esm-patient-registration-app": {
63+
"sections": ["demographics", "contact", "relationships", "death"]
5064
}
5165
}

‎frontend/config-core-sdh-3stage.json‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@
3636
"@openmrs/esm-styleguide": {
3737
"Brand color #1": "#2b9348",
3838
"Brand color #2": "#55A630",
39-
"Brand color #3": "#388E3C"
39+
"Brand color #3": "#388E3C",
40+
"implementationName": "SDH-stage",
41+
"preferredCalendar": {
42+
"en": "gregory"
43+
}
4044
},
4145
"@openmrs/esm-login-app": {
4246
"logo": {
@@ -47,5 +51,15 @@
4751
"logo": {
4852
"name": "SDH-Stage"
4953
}
54+
},
55+
"@openmrs/esm-patient-banner-app": {
56+
"extensionSlots": {
57+
"patient-actions-slot": {
58+
"remove": ["mark-patient-deceased-button"]
59+
}
60+
}
61+
},
62+
"@openmrs/esm-patient-registration-app": {
63+
"sections": ["demographics", "contact", "relationships", "death"]
5064
}
5165
}

‎frontend/config-core-sdh-4prod.json‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@
3636
"@openmrs/esm-styleguide": {
3737
"Brand color #1": "#E91E63",
3838
"Brand color #2": "#F06292",
39-
"Brand color #3": "#C2185B"
39+
"Brand color #3": "#C2185B",
40+
"implementationName": "SDH",
41+
"preferredCalendar": {
42+
"en": "gregory"
43+
}
4044
},
4145
"@openmrs/esm-login-app": {
4246
"logo": {
@@ -47,5 +51,15 @@
4751
"logo": {
4852
"src": "https://salcedodoctorshospital.org/assets/sdh-logo.png"
4953
}
54+
},
55+
"@openmrs/esm-patient-banner-app": {
56+
"extensionSlots": {
57+
"patient-actions-slot": {
58+
"remove": ["mark-patient-deceased-button"]
59+
}
60+
}
61+
},
62+
"@openmrs/esm-patient-registration-app": {
63+
"sections": ["demographics", "contact", "relationships", "death"]
5064
}
5165
}

‎frontend/spa-assemble-config-sdh-1dev.json‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
{
22
"frontendModules": {
33
"@openmrs/esm-active-visits-app": "next",
4-
"@openmrs/esm-appointments-app": "next",
5-
"@openmrs/esm-bed-management-app": "next",
64
"@openmrs/esm-cohort-builder-app": "next",
75
"@openmrs/esm-devtools-app": "next",
86
"@openmrs/esm-dispensing-app": "next",
9-
"@openmrs/esm-fast-data-entry-app": "next",
107
"@openmrs/esm-form-builder-app": "next",
118
"@openmrs/esm-form-engine-app": "next",
129
"@openmrs/esm-generic-patient-widgets-app": "next",
@@ -37,10 +34,14 @@
3734
"@openmrs/esm-primary-navigation-app": "next",
3835
"@openmrs/esm-service-queues-app": "next",
3936
"@openmrs/esm-system-admin-app": "next",
40-
"@openmrs/esm-user-onboarding-app": "next",
41-
"@openmrs/esm-ward-app": "next",
42-
"@openmrs/esm-stock-management-app": "next",
43-
"@openmrs/esm-billing-app": "next"
37+
"@openmrs/esm-user-onboarding-app": "next"
4438
},
45-
"excludedFrontendModules": []
39+
"excludedFrontendModules": {
40+
"@openmrs/esm-stock-management-app": "next",
41+
"@openmrs/esm-billing-app": "next",
42+
"@openmrs/esm-fast-data-entry-app": "next",
43+
"@openmrs/esm-bed-management-app": "next",
44+
"@openmrs/esm-ward-app": "next",
45+
"@openmrs/esm-appointments-app": "next"
46+
}
4647
}

‎frontend/spa-assemble-config-sdh-2test.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"frontendModules": {
33
"@openmrs/esm-active-visits-app": "next",
4-
"@openmrs/esm-appointments-app": "next",
54
"@openmrs/esm-cohort-builder-app": "next",
65
"@openmrs/esm-devtools-app": "next",
76
"@openmrs/esm-dispensing-app": "next",
@@ -42,6 +41,7 @@
4241
"@openmrs/esm-billing-app": "next",
4342
"@openmrs/esm-fast-data-entry-app": "next",
4443
"@openmrs/esm-bed-management-app": "next",
45-
"@openmrs/esm-ward-app": "next"
44+
"@openmrs/esm-ward-app": "next",
45+
"@openmrs/esm-appointments-app": "next"
4646
}
4747
}

‎frontend/spa-assemble-config-sdh-3stage.json‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
{
22
"frontendModules": {
3-
"@openmrs/esm-active-visits-app": "next",
4-
"@openmrs/esm-appointments-app": "next",
5-
"@openmrs/esm-cohort-builder-app": "next",
6-
"@openmrs/esm-dispensing-app": "next",
7-
"@openmrs/esm-form-builder-app": "next",
8-
"@openmrs/esm-form-engine-app": "next",
9-
"@openmrs/esm-generic-patient-widgets-app": "next",
10-
"@openmrs/esm-help-menu-app": "next",
11-
"@openmrs/esm-home-app": "next",
12-
"@openmrs/esm-laboratory-app": "next",
13-
"@openmrs/esm-login-app": "next",
14-
"@openmrs/esm-openconceptlab-app": "next",
15-
"@openmrs/esm-patient-allergies-app": "next",
16-
"@openmrs/esm-patient-attachments-app": "next",
17-
"@openmrs/esm-patient-banner-app": "next",
18-
"@openmrs/esm-patient-chart-app": "next",
19-
"@openmrs/esm-patient-conditions-app": "next",
20-
"@openmrs/esm-patient-flags-app": "next",
21-
"@openmrs/esm-patient-forms-app": "next",
22-
"@openmrs/esm-patient-immunizations-app": "next",
23-
"@openmrs/esm-patient-list-management-app": "next",
24-
"@openmrs/esm-patient-lists-app": "next",
25-
"@openmrs/esm-patient-medications-app": "next",
26-
"@openmrs/esm-patient-notes-app": "next",
27-
"@openmrs/esm-patient-orders-app": "next",
28-
"@openmrs/esm-patient-programs-app": "next",
29-
"@openmrs/esm-patient-registration-app": "next",
30-
"@openmrs/esm-patient-search-app": "next",
31-
"@openmrs/esm-patient-tests-app": "next",
32-
"@openmrs/esm-patient-vitals-app": "next",
33-
"@openmrs/esm-primary-navigation-app": "next",
34-
"@openmrs/esm-service-queues-app": "next",
35-
"@openmrs/esm-system-admin-app": "next",
36-
"@openmrs/esm-user-onboarding-app": "next"
3+
"@openmrs/esm-active-visits-app": "latest",
4+
"@openmrs/esm-cohort-builder-app": "latest",
5+
"@openmrs/esm-dispensing-app": "latest",
6+
"@openmrs/esm-form-builder-app": "latest",
7+
"@openmrs/esm-form-engine-app": "latest",
8+
"@openmrs/esm-generic-patient-widgets-app": "latest",
9+
"@openmrs/esm-help-menu-app": "latest",
10+
"@openmrs/esm-home-app": "latest",
11+
"@openmrs/esm-laboratory-app": "latest",
12+
"@openmrs/esm-login-app": "latest",
13+
"@openmrs/esm-openconceptlab-app": "latest",
14+
"@openmrs/esm-patient-allergies-app": "latest",
15+
"@openmrs/esm-patient-attachments-app": "latest",
16+
"@openmrs/esm-patient-banner-app": "latest",
17+
"@openmrs/esm-patient-chart-app": "latest",
18+
"@openmrs/esm-patient-conditions-app": "latest",
19+
"@openmrs/esm-patient-flags-app": "latest",
20+
"@openmrs/esm-patient-forms-app": "latest",
21+
"@openmrs/esm-patient-immunizations-app": "latest",
22+
"@openmrs/esm-patient-list-management-app": "latest",
23+
"@openmrs/esm-patient-lists-app": "latest",
24+
"@openmrs/esm-patient-medications-app": "latest",
25+
"@openmrs/esm-patient-notes-app": "latest",
26+
"@openmrs/esm-patient-orders-app": "latest",
27+
"@openmrs/esm-patient-programs-app": "latest",
28+
"@openmrs/esm-patient-registration-app": "latest",
29+
"@openmrs/esm-patient-search-app": "latest",
30+
"@openmrs/esm-patient-tests-app": "latest",
31+
"@openmrs/esm-patient-vitals-app": "latest",
32+
"@openmrs/esm-primary-navigation-app": "latest",
33+
"@openmrs/esm-service-queues-app": "latest",
34+
"@openmrs/esm-system-admin-app": "latest",
35+
"@openmrs/esm-user-onboarding-app": "latest"
3736
},
3837
"excludedFrontendModules": {
39-
"@openmrs/esm-stock-management-app": "next",
40-
"@openmrs/esm-billing-app": "next",
41-
"@openmrs/esm-devtools-app": "next",
42-
"@openmrs/esm-implementer-tools-app": "next",
43-
"@openmrs/esm-fast-data-entry-app": "next",
44-
"@openmrs/esm-bed-management-app": "next",
45-
"@openmrs/esm-ward-app": "next"
38+
"@openmrs/esm-stock-management-app": "latest",
39+
"@openmrs/esm-billing-app": "latest",
40+
"@openmrs/esm-devtools-app": "latest",
41+
"@openmrs/esm-implementer-tools-app": "latest",
42+
"@openmrs/esm-fast-data-entry-app": "latest",
43+
"@openmrs/esm-bed-management-app": "latest",
44+
"@openmrs/esm-ward-app": "latest",
45+
"@openmrs/esm-appointments-app": "latest"
4646
}
4747
}

‎frontend/spa-assemble-config-sdh-4prod.json‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
{
22
"frontendModules": {
3-
"@openmrs/esm-active-visits-app": "next",
4-
"@openmrs/esm-appointments-app": "next",
5-
"@openmrs/esm-cohort-builder-app": "next",
6-
"@openmrs/esm-dispensing-app": "next",
7-
"@openmrs/esm-form-builder-app": "next",
8-
"@openmrs/esm-form-engine-app": "next",
9-
"@openmrs/esm-generic-patient-widgets-app": "next",
10-
"@openmrs/esm-help-menu-app": "next",
11-
"@openmrs/esm-home-app": "next",
12-
"@openmrs/esm-laboratory-app": "next",
13-
"@openmrs/esm-login-app": "next",
14-
"@openmrs/esm-openconceptlab-app": "next",
15-
"@openmrs/esm-patient-allergies-app": "next",
16-
"@openmrs/esm-patient-attachments-app": "next",
17-
"@openmrs/esm-patient-banner-app": "next",
18-
"@openmrs/esm-patient-chart-app": "next",
19-
"@openmrs/esm-patient-conditions-app": "next",
20-
"@openmrs/esm-patient-flags-app": "next",
21-
"@openmrs/esm-patient-forms-app": "next",
22-
"@openmrs/esm-patient-immunizations-app": "next",
23-
"@openmrs/esm-patient-list-management-app": "next",
24-
"@openmrs/esm-patient-lists-app": "next",
25-
"@openmrs/esm-patient-medications-app": "next",
26-
"@openmrs/esm-patient-notes-app": "next",
27-
"@openmrs/esm-patient-orders-app": "next",
28-
"@openmrs/esm-patient-programs-app": "next",
29-
"@openmrs/esm-patient-registration-app": "next",
30-
"@openmrs/esm-patient-search-app": "next",
31-
"@openmrs/esm-patient-tests-app": "next",
32-
"@openmrs/esm-patient-vitals-app": "next",
33-
"@openmrs/esm-primary-navigation-app": "next",
34-
"@openmrs/esm-service-queues-app": "next",
35-
"@openmrs/esm-system-admin-app": "next",
36-
"@openmrs/esm-user-onboarding-app": "next"
3+
"@openmrs/esm-active-visits-app": "latest",
4+
"@openmrs/esm-cohort-builder-app": "latest",
5+
"@openmrs/esm-dispensing-app": "latest",
6+
"@openmrs/esm-form-builder-app": "latest",
7+
"@openmrs/esm-form-engine-app": "latest",
8+
"@openmrs/esm-generic-patient-widgets-app": "latest",
9+
"@openmrs/esm-help-menu-app": "latest",
10+
"@openmrs/esm-home-app": "latest",
11+
"@openmrs/esm-laboratory-app": "latest",
12+
"@openmrs/esm-login-app": "latest",
13+
"@openmrs/esm-openconceptlab-app": "latest",
14+
"@openmrs/esm-patient-allergies-app": "latest",
15+
"@openmrs/esm-patient-attachments-app": "latest",
16+
"@openmrs/esm-patient-banner-app": "latest",
17+
"@openmrs/esm-patient-chart-app": "latest",
18+
"@openmrs/esm-patient-conditions-app": "latest",
19+
"@openmrs/esm-patient-flags-app": "latest",
20+
"@openmrs/esm-patient-forms-app": "latest",
21+
"@openmrs/esm-patient-immunizations-app": "latest",
22+
"@openmrs/esm-patient-list-management-app": "latest",
23+
"@openmrs/esm-patient-lists-app": "latest",
24+
"@openmrs/esm-patient-medications-app": "latest",
25+
"@openmrs/esm-patient-notes-app": "latest",
26+
"@openmrs/esm-patient-orders-app": "latest",
27+
"@openmrs/esm-patient-programs-app": "latest",
28+
"@openmrs/esm-patient-registration-app": "latest",
29+
"@openmrs/esm-patient-search-app": "latest",
30+
"@openmrs/esm-patient-tests-app": "latest",
31+
"@openmrs/esm-patient-vitals-app": "latest",
32+
"@openmrs/esm-primary-navigation-app": "latest",
33+
"@openmrs/esm-service-queues-app": "latest",
34+
"@openmrs/esm-system-admin-app": "latest",
35+
"@openmrs/esm-user-onboarding-app": "latest"
3736
},
3837
"excludedFrontendModules": {
39-
"@openmrs/esm-stock-management-app": "next",
40-
"@openmrs/esm-billing-app": "next",
41-
"@openmrs/esm-devtools-app": "next",
42-
"@openmrs/esm-implementer-tools-app": "next",
43-
"@openmrs/esm-fast-data-entry-app": "next",
44-
"@openmrs/esm-bed-management-app": "next",
45-
"@openmrs/esm-ward-app": "next"
38+
"@openmrs/esm-stock-management-app": "latest",
39+
"@openmrs/esm-billing-app": "latest",
40+
"@openmrs/esm-devtools-app": "latest",
41+
"@openmrs/esm-implementer-tools-app": "latest",
42+
"@openmrs/esm-fast-data-entry-app": "latest",
43+
"@openmrs/esm-bed-management-app": "latest",
44+
"@openmrs/esm-ward-app": "latest",
45+
"@openmrs/esm-appointments-app": "latest"
4646
}
4747
}

0 commit comments

Comments
 (0)