Merge branch 'main' into KH-510

mekomsolutions · Jun 7, 2024 · 0e4d32f · 0e4d32f
2 parents 49a8a96 + f4a103e
commit 0e4d32f
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 11 deletions.
diff --git a/base/configs/openmrs/initializer_config/ampathforms/cervical_cancer_screening.json b/base/configs/openmrs/initializer_config/ampathforms/cervical_cancer_screening.json
@@ -1748,7 +1748,6 @@
               "type": "obs",
               "validators": []
             },
-            {},
             {
               "id": "breastCancerTreatment",
               "questionOptions": {

diff --git a/base/configs/openmrs/initializer_config/locations/locations.csv b/base/configs/openmrs/initializer_config/locations/locations.csv
@@ -1,6 +1,6 @@
 Uuid,Void/Retire,Name,display:en,display:km,Description,Parent,Tags,Tag|Facility Location,Attribute|9eca4f4e-707f-4bb8-8289-2f9b6e93803c,Attribute|Last Audit Date,Address 1,Address 2,Address 3,Address 4,Address 5,Address 6,City/Village,County/District,State/Province,Postal Code,Country,_order:1000
-2e013076-ddf3-4f44-9a10-54fb6a8855f7,,100101. មន្ទីរពេទ្យបង្អែកឆ្លូង_RH / Chhlong_RH,100101. Chhlong_RH,100101. មន្ទីរពេទ្យបង្អែកឆ្លូង_RH,100101. Chhlong_RH,,Login Location,TRUE,,,,,,,,,,,,,,
-d84e5c0a-ff31-4288-9718-7acff068e14b,,100102. ចំបក់_HC / Chambak_HC,100102. Chambak_HC,100102. ចំបក់_HC,100102. Chambak_HC,,Login Location,TRUE,,,,,,,,,,,,,,
-609033e0-097c-46ba-87a2-58c749171708,,100103. តាម៉ៅ_HC / Ta Mao_HC,100103. Ta Mao_HC,100103. តាម៉ៅ_HC,100103. Ta Mao_HC,,Login Location,TRUE,,,,,,,,,,,,,,
-3e135aad-ab0d-447d-85f8-1421f2455a59,,100105. ខ្សាច់អណ្តែត_HC / Khsach Andet_HC,100105. Khsach Andet_HC,100105. ខ្សាច់អណ្តែត_HC,100105. Khsach Andet_HC,,Login Location,TRUE,,,,,,,,,,,,,,
-ec030870-1d8f-457f-960b-3ede527841a4,,100106. ពង្រ_HC / Pongro_HC,100106. Pongro_HC,100106. ពង្រ_HC,100106. Pongro_HC,,Login Location,TRUE,,,,,,,,,,,,,,
+2e013076-ddf3-4f44-9a10-54fb6a8855f7,,100101. មន្ទីរពេទ្យបង្អែកឆ្លូង_RH / Chhlong_RH,100101. Chhlong_RH,100101. មន្ទីរពេទ្យបង្អែកឆ្លូង_RH,100101. Chhlong_RH,,Login Location;Facility Location;Referral Hospital,TRUE,,,,,,,,,,ឆ្លូង / Chhlong,ក្រចេះ / Kratie,100101,Cambodia,
+d84e5c0a-ff31-4288-9718-7acff068e14b,,100102. ចំបក់_HC / Chambak_HC,100102. Chambak_HC,100102. ចំបក់_HC,100102. Chambak_HC,,Login Location;Facility Location;Health Center,TRUE,,,,,,,,,,ឆ្លូង / Chhlong,ក្រចេះ / Kratie,100102,Cambodia,
+609033e0-097c-46ba-87a2-58c749171708,,100103. តាម៉ៅ_HC / Ta Mao_HC,100103. Ta Mao_HC,100103. តាម៉ៅ_HC,100103. Ta Mao_HC,,Login Location;Facility Location;Health Center,TRUE,,,,,,,,,,ឆ្លូង / Chhlong,ក្រចេះ / Kratie,100103,Cambodia,
+3e135aad-ab0d-447d-85f8-1421f2455a59,,100105. ខ្សាច់អណ្តែត_HC / Khsach Andet_HC,100105. Khsach Andet_HC,100105. ខ្សាច់អណ្តែត_HC,100105. Khsach Andet_HC,,Login Location;Facility Location;Health Center,TRUE,,,,,,,,,,ឆ្លូង / Chhlong,ក្រចេះ / Kratie,100105,Cambodia,
+ec030870-1d8f-457f-960b-3ede527841a4,,100106. ពង្រ_HC / Pongro_HC,100106. Pongro_HC,100106. ពង្រ_HC,100106. Pongro_HC,,Login Location;Facility Location;Health Center,TRUE,,,,,,,,,,ឆ្លូង / Chhlong,ក្រចេះ / Kratie,100106,Cambodia,
diff --git a/base/configs/openmrs/initializer_config/locationtags/kh_locationtags.csv b/base/configs/openmrs/initializer_config/locationtags/kh_locationtags.csv
@@ -0,0 +1,5 @@
+Uuid,Void/Retire,Name,Description
+f47ac10b-58cc-4372-a567-0e02b2c3d479,,Referral Hospital,"Tag to mark Facility/Location as Referral Hospital",
+550e8400-e29b-41d4-a716-4466554403dc,,Health Center,"Tag to mark Facility/Location as Health Centre",
+8b0d576b-8c2f-4c47-9310-d82c57c41a88,,National Hospital,"Tag to mark Facility/Location as National Hospital",
+af9a1a43-0d6e-46d6-8ef2-56f9c87688c7,,Provincial Hospital,"Tag to mark Facility/Location as Provincial Hospital",
diff --git a/base/pom.xml b/base/pom.xml
@@ -153,6 +153,26 @@
       </activation>
       <build>
         <plugins>
+            <plugin>
+              <artifactId>maven-antrun-plugin</artifactId>
+              <executions>
+                <execution>
+                  <id>Copy OpenMRS Initializer configs for validation</id>
+                  <phase>pre-integration-test</phase>
+                  <configuration>
+                    <target>
+                      <copy todir="${project.build.directory}/validator/configuration">
+                        <fileset
+  dir="${project.build.directory}/${project.artifactId}-${project.version}/distro/configs/openmrs/initializer_config"/>
+                      </copy>
+                    </target>
+                  </configuration>
+                  <goals>
+                    <goal>run</goal>
+                  </goals>
+                </execution>
+              </executions>
+            </plugin>
           <plugin>
             <groupId>org.openmrs.maven.plugins</groupId>
             <artifactId>openmrs-packager-maven-plugin</artifactId>
@@ -164,8 +184,7 @@
                   <goal>validate-configurations</goal>
                 </goals>
                 <configuration>
-                  <sourceDir>
-  ${project.build.directory}/${project.artifactId}-${project.version}/distro/configs/openmrs/initializer_config</sourceDir>
+                  <sourceDir>${project.build.directory}/validator/configuration</sourceDir>
                 </configuration>
               </execution>
             </executions>

diff --git a/prod/pom.xml b/prod/pom.xml
@@ -139,6 +139,27 @@
       </activation>
       <build>
         <plugins>
+          <!-- copy over merged/packaged OpenMRS config for validation at the integration-test phase -->
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>Copy OpenMRS Initializer configs for validation</id>
+                <phase>pre-integration-test</phase>
+                <configuration>
+                  <target>
+                    <copy todir="${project.build.directory}/validator/configuration">
+                      <fileset
+                        dir="${project.build.directory}/${project.artifactId}-${project.version}/distro/configs/openmrs/initializer_config" />
+                    </copy>
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
           <!-- hooking the OpenMRS config validation to the integration-test phase -->
           <plugin>
             <groupId>org.openmrs.maven.plugins</groupId>
@@ -151,8 +172,7 @@
                   <goal>validate-configurations</goal>
                 </goals>
                 <configuration>
-                  <sourceDir>
-                    ${project.build.directory}/${project.artifactId}-${project.version}/distro/configs/openmrs/initializer_config</sourceDir>
+                  <sourceDir>${project.build.directory}/validator/configuration</sourceDir>
                 </configuration>
               </execution>
             </executions>
@@ -162,4 +182,4 @@
       </build>
     </profile>
   </profiles>
-</project>
+</project>