Skip to content

Commit 89b0c45

Browse files
pgorrindopgorrindo
authored
Merge pull request #52 from Salcedo-HDF/1dev
Dev into Test - 2025-02-10a
2 parents 3a6994a + 070267d commit 89b0c45

11 files changed

+119
-13
lines changed

‎Dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# syntax=docker/dockerfile:1
22

33
### Dev Stage
4-
FROM openmrs/openmrs-core:dev-amazoncorretto-11 AS dev
4+
# FROM openmrs/openmrs-core:dev-amazoncorretto-11 AS dev
5+
FROM openmrs/openmrs-core:2.6.15-dev AS dev
56
WORKDIR /openmrs_distro
67

78
ARG MVN_ARGS_SETTINGS="-s /usr/share/maven/ref/settings-docker.xml -U -P distro"
@@ -26,7 +27,8 @@ RUN mvn $MVN_ARGS_SETTINGS clean
2627

2728
### Run Stage
2829
# Replace 'nightly' with the exact version of openmrs-core built for production (if available)
29-
FROM openmrs/openmrs-core:nightly-amazoncorretto-11
30+
# FROM openmrs/openmrs-core:nightly-amazoncorretto-11
31+
FROM openmrs/openmrs-core:2.6.15
3032

3133
# Do not copy the war if using the correct openmrs-core image version
3234
COPY --from=dev /openmrs/distribution/openmrs_core/openmrs.war /openmrs/distribution/openmrs_core/

‎distro/configuration/globalproperties/globalproperties-core-sdh.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,15 @@
3939
<property>attachments.allowedFileExtensions</property>
4040
<value>jpeg,jpg,png,pdf</value>
4141
</globalProperty>
42+
43+
<globalProperty>
44+
<property>attachments.allowWebcam</property>
45+
<value>true</value>
46+
</globalProperty>
47+
48+
<globalProperty>
49+
<property>attachments.maxStorageFileSize</property>
50+
<value>5.0</value>
51+
</globalProperty>
4252
</globalProperties>
4353
</config>

‎docker-compose-sdh.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@ name: sdh-openmrs-app-${ENVT}
44

55
services:
66
gateway:
7-
image: openmrs/openmrs-reference-application-3-gateway:${TAG:-qa}
7+
image: openmrs/openmrs-reference-application-3-gateway:${GATEWAY_TAG:-qa}
88
restart: "unless-stopped"
99
depends_on:
1010
- frontend
1111
- backend
1212
ports:
1313
- "${ENVT_PORT}:80"
14+
build:
15+
context: ./gateway
1416

1517
frontend:
16-
image: openmrs/openmrs-reference-application-3-frontend:${TAG:-qa}
18+
image: openmrs/openmrs-reference-application-3-frontend:${FRONTEND_TAG:-qa}
1719
restart: "unless-stopped"
1820
environment:
1921
SPA_PATH: /openmrs/spa
@@ -25,9 +27,11 @@ services:
2527
timeout: 5s
2628
depends_on:
2729
- backend
30+
build:
31+
context: ./frontend
2832

2933
backend:
30-
image: openmrs/openmrs-reference-application-3-backend:${TAG:-qa}
34+
image: openmrs/openmrs-reference-application-3-backend:${BACKEND_TAG:-qa}
3135
restart: "unless-stopped"
3236
depends_on:
3337
- db
@@ -44,6 +48,8 @@ services:
4448
timeout: 5s
4549
volumes:
4650
- openmrs-data:/openmrs/data
51+
build:
52+
context: .
4753

4854
# MariaDB
4955
db:

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
11
{
22
"@openmrs/esm-patient-chart-app": {
3-
"showUpcomingAppointments": true
3+
"showUpcomingAppointments": true,
4+
"extensionSlots": {
5+
"action-menu-patient-chart-items-slot": {
6+
"remove": ["patient-lists-action-menu"],
7+
"order": ["clinical-form-action-menu", "visit-note-nav-action"]
8+
},
9+
"patient-chart-dashboard-slot": {
10+
"order": [
11+
"charts-summary-dashboard",
12+
"encounters-summary-dashboard",
13+
"conditions-summary-dashboard",
14+
"results-summary-dashboard",
15+
"patient-orders-summary-dashboard",
16+
"test-results-summary-dashboard",
17+
"medications-summary-dashboard",
18+
"allergies-summary-dashboard",
19+
"immunization-summary-dashboard",
20+
"attachments-results-summary-dashboard",
21+
"programs-summary-dashboard"
22+
]
23+
}
24+
}
425
},
526
"@openmrs/esm-service-queues-app": {
627
"priorityConfigs": [

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
11
{
22
"@openmrs/esm-patient-chart-app": {
3-
"showUpcomingAppointments": true
3+
"showUpcomingAppointments": true,
4+
"extensionSlots": {
5+
"action-menu-patient-chart-items-slot": {
6+
"remove": ["patient-lists-action-menu"],
7+
"order": ["clinical-form-action-menu", "visit-note-nav-action"]
8+
},
9+
"patient-chart-dashboard-slot": {
10+
"order": [
11+
"charts-summary-dashboard",
12+
"encounters-summary-dashboard",
13+
"conditions-summary-dashboard",
14+
"results-summary-dashboard",
15+
"patient-orders-summary-dashboard",
16+
"test-results-summary-dashboard",
17+
"medications-summary-dashboard",
18+
"allergies-summary-dashboard",
19+
"immunization-summary-dashboard",
20+
"attachments-results-summary-dashboard",
21+
"programs-summary-dashboard"
22+
]
23+
}
24+
}
425
},
526
"@openmrs/esm-service-queues-app": {
627
"priorityConfigs": [

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
11
{
22
"@openmrs/esm-patient-chart-app": {
3-
"showUpcomingAppointments": true
3+
"showUpcomingAppointments": true,
4+
"extensionSlots": {
5+
"action-menu-patient-chart-items-slot": {
6+
"remove": ["patient-lists-action-menu"],
7+
"order": ["clinical-form-action-menu", "visit-note-nav-action"]
8+
},
9+
"patient-chart-dashboard-slot": {
10+
"order": [
11+
"charts-summary-dashboard",
12+
"encounters-summary-dashboard",
13+
"conditions-summary-dashboard",
14+
"results-summary-dashboard",
15+
"patient-orders-summary-dashboard",
16+
"test-results-summary-dashboard",
17+
"medications-summary-dashboard",
18+
"allergies-summary-dashboard",
19+
"immunization-summary-dashboard",
20+
"attachments-results-summary-dashboard",
21+
"programs-summary-dashboard"
22+
]
23+
}
24+
}
425
},
526
"@openmrs/esm-service-queues-app": {
627
"priorityConfigs": [

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
11
{
22
"@openmrs/esm-patient-chart-app": {
3-
"showUpcomingAppointments": true
3+
"showUpcomingAppointments": true,
4+
"extensionSlots": {
5+
"action-menu-patient-chart-items-slot": {
6+
"remove": ["patient-lists-action-menu"],
7+
"order": ["clinical-form-action-menu", "visit-note-nav-action"]
8+
},
9+
"patient-chart-dashboard-slot": {
10+
"order": [
11+
"charts-summary-dashboard",
12+
"encounters-summary-dashboard",
13+
"conditions-summary-dashboard",
14+
"results-summary-dashboard",
15+
"patient-orders-summary-dashboard",
16+
"test-results-summary-dashboard",
17+
"medications-summary-dashboard",
18+
"allergies-summary-dashboard",
19+
"immunization-summary-dashboard",
20+
"attachments-results-summary-dashboard",
21+
"programs-summary-dashboard"
22+
]
23+
}
24+
}
425
},
526
"@openmrs/esm-service-queues-app": {
627
"priorityConfigs": [

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
"defaultLocale": "$SPA_DEFAULT_LOCALE",
66
"importmap": "$SPA_PATH/importmap.json",
77
"routes": "$SPA_PATH/routes.registry.json",
8-
"supportOffline": false
8+
"supportOffline": false,
9+
"pageTitle": "Dev SDH OpenMRS"
910
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
"defaultLocale": "$SPA_DEFAULT_LOCALE",
66
"importmap": "$SPA_PATH/importmap.json",
77
"routes": "$SPA_PATH/routes.registry.json",
8-
"supportOffline": false
8+
"supportOffline": false,
9+
"pageTitle": "Test SDH OpenMRS"
910
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
"defaultLocale": "$SPA_DEFAULT_LOCALE",
66
"importmap": "$SPA_PATH/importmap.json",
77
"routes": "$SPA_PATH/routes.registry.json",
8-
"supportOffline": false
8+
"supportOffline": false,
9+
"pageTitle": "Stage SDH OpenMRS"
910
}

0 commit comments

Comments
 (0)