Merge branch 'main' into O3-2204

openmrs · Mar 21, 2024 · 4d42d8f · 4d42d8f
2 parents bb9358b + 29f2d41
commit 4d42d8f
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,7 @@ COPY pom.xml ./
 COPY distro ./distro/
 
 # Build the distro, but only deploy from the amd64 build
-RUN --mount=type=secret,id=m2settings,target=/root/.m2/settings.xml if [[ "$MVN_ARGS" != "deploy" || "$(arch)" = "x84_64" ]]; then mvn $MVN_ARGS_SETTINGS $MVN_ARGS; else mvn $MVN_ARGS_SETTINGS install; fi
+RUN --mount=type=secret,id=m2settings,target=/root/.m2/settings.xml if [[ "$MVN_ARGS" != "deploy" || "$(arch)" = "x86_64" ]]; then mvn $MVN_ARGS_SETTINGS $MVN_ARGS; else mvn $MVN_ARGS_SETTINGS install; fi
 
 RUN cp /openmrs_distro/distro/target/sdk-distro/web/openmrs.war /openmrs/distribution/openmrs_core/
 

diff --git a/README.md b/README.md
@@ -56,4 +56,6 @@ To help us keep track of things, we ask that you suffix any files you add with e
 those that should be part of the core package. For example, a form named `test_form.json` would become
 `test_core-core_demo.json`.
 
+Frontend configuration can be found in `frontend/config-core_demo.json`.
+
 Thanks!
diff --git a/distro/configuration/attributetypes/attribute_types-core_demo.csv b/distro/configuration/attributetypes/attribute_types-core_demo.csv
@@ -1,3 +1,6 @@
-Uuid,Void/Retire,Entity name,Name,Description,Min occurs,Max occurs,Datatype classname,Datatype config,Preferred handler classname,Handler config,_order:1000
-57ea0cbb-064f-4d09-8cf4-e8228700491c,,Visit,Punctuality,,0,1,org.openmrs.customdatatype.datatype.ConceptDatatype,d81d4698-e78c-420d-aac5-cb1f606fb32e,,,
-aac48226-d143-4274-80e0-264db4e368ee,,Visit,Insurance Policy Number,,0,1,org.openmrs.customdatatype.datatype.FreeTextDatatype,,,,
+Uuid,Void/Retire,Entity name,Name,Description,Min occurs,Max occurs,Datatype classname,Datatype config,Preferred handler classname,Handler config,_order:1000
+57ea0cbb-064f-4d09-8cf4-e8228700491c,,Visit,Punctuality,,0,1,org.openmrs.customdatatype.datatype.ConceptDatatype,d81d4698-e78c-420d-aac5-cb1f606fb32e,,,
+aac48226-d143-4274-80e0-264db4e368ee,,Visit,Insurance Policy Number,,0,1,org.openmrs.customdatatype.datatype.FreeTextDatatype,,,,
+3a988e33-a6c0-4b76-b924-01abb998944b,,Visit,Insurance Scheme,"The insurance scheme the patient is using to settle payment for services, expects a uuid",0,1,org.openmrs.customdatatype.datatype.FreeTextDatatype,,,,
+8553afa0-bdb9-4d3c-8a98-05fa9350aa85,,Visit,Payment Method,"The payment method used by the patient to settle payment, expects a uuid",0,1,org.openmrs.customdatatype.datatype.FreeTextDatatype,,,,
+fbc0702d-b4c9-4968-be63-af8ad3ad6239,,Visit,Patient Type,"If the patient will be paying or receives services for free, expects a uuid",0,1,org.openmrs.customdatatype.datatype.FreeTextDatatype,,,,
diff --git a/distro/configuration/globalproperties/billing-core_demo.xml b/distro/configuration/globalproperties/billing-core_demo.xml
@@ -0,0 +1,9 @@
+<config>
+    <globalProperties>
+        <globalProperty>
+            <property>cashier.systemReceiptNumberGenerator</property>
+            <value>org.openmrs.module.cashier.api.SequentialReceiptNumberGenerator</value>
+            <description>The fully qualified class name of the component responsible for generating sequential receipt numbers within the cashier system. This class contains functions and methods tailored to efficiently generate unique receipt numbers in sequential order. </description>
+        </globalProperty>
+    </globalProperties>
+</config>
diff --git a/distro/configuration/globalproperties/i18n-core_demo.xml b/distro/configuration/globalproperties/i18n-core_demo.xml
@@ -2,7 +2,7 @@
     <globalProperties>
         <globalProperty>
             <property>locale.allowed.list</property>
-            <value>en, en_GB, es, fr, he, km</value>
+            <value>en, en_GB, es, fr, he, km, ar</value>
         </globalProperty>
     </globalProperties>
 </config>
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     environment:
       SPA_PATH: /openmrs/spa
       API_URL: /openmrs
-      SPA_CONFIG_URLS:
+      SPA_CONFIG_URLS: config-core_demo.json
       SPA_DEFAULT_LOCALE:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost/"]

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -36,5 +36,6 @@ RUN chmod +x /usr/local/bin/startup.sh
 COPY nginx.conf /etc/nginx/nginx.conf
 
 COPY --from=dev /app/spa /usr/share/nginx/html
+COPY config-core_demo.json /usr/share/nginx/html
 
 CMD ["/usr/local/bin/startup.sh"]
diff --git a/frontend/config-core_demo.json b/frontend/config-core_demo.json
@@ -0,0 +1,5 @@
+{
+  "@openmrs/esm-styleguide": {
+    "Brand color #1": "#005d5d"
+  }
+}
diff --git a/frontend/pom.xml b/frontend/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openmrs.distro</groupId>
     <artifactId>referenceapplication</artifactId>
-    <version>3.0.0-beta.17</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>referenceapplication-frontend</artifactId>

diff --git a/frontend/spa-assemble-config.json b/frontend/spa-assemble-config.json
@@ -8,7 +8,6 @@
     "@openmrs/esm-form-entry-app": "next",
     "@openmrs/esm-generic-patient-widgets-app": "next",
     "@openmrs/esm-patient-allergies-app": "next",
-    "@openmrs/esm-patient-appointments-app": "next",
     "@openmrs/esm-patient-attachments-app": "next",
     "@openmrs/esm-patient-banner-app": "next",
     "@openmrs/esm-patient-chart-app": "next",