Add upi as a client identifier on registration UI

.gitattributes

@@ -0,0 +1,75 @@
+* text=auto
+
+# Known text file extensions
+*.as text
+*.bat text
+*.cnf text
+*.conf text
+*.css text
+*.csv text
+*.dtd text
+*.erb text
+*.ftl text
+*.gitattributes text
+*.gitignore text
+*.gitkeep text
+*.gitmodules text
+*.groovy text
+*.gsp text
+*.htaccess text
+*.htm text
+*.html text
+*.java text
+*.js text
+*.js.withjstl text
+*.json text
+*.jsp text
+*.list text
+*.lock text
+*.log text
+*.markdown text
+*.md text
+*.nsh text
+*.nsi text
+*.opts text
+*.php text
+*.pl text
+*.policy text
+*.pp text
+*.project text
+*.properties text
+*.rb text
+*.rdf text
+*.scss text
+*.sh text
+*.sql text
+*.story text
+*.svg text
+*.tag text
+*.tld text
+*.txt text
+*.vm text
+*.xml text
+*.xsl text
+*.xslt text
+*.yaml text
+*.yml text
+
+# Known binary file extensions
+*.bmp binary
+*.chls binary
+*.class binary
+*.db binary
+*.eot binary
+*.exe binary
+*.gif binary
+*.gzip binary
+*.ico binary
+*.jar binary
+*.jpeg binary
+*.jpg binary
+*.omod binary
+*.png binary
+*.ttf binary
+*.woff binary
+*.zip binary

.github/workflows/cicd_process.yml

@@ -0,0 +1,31 @@
+name: deploy to prod 8600
+on:
+  push:
+    branches: [ upi-dev ]
+jobs:
+
+  build:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - name: executing remote connection
+      uses: appleboy/ssh-action@master
+      with:
+        host: ${{ secrets.HOST }}
+        username: ${{ secrets.USERNAME }}
+        key: ${{ secrets.CICD_SECRET }}
+        port: ${{ secrets.PORT }}
+        command_timeout: 200m
+        script: |
+          git config --global --add safe.directory /apps/github-workflows/kenyaemr-modules/openmrs-module-kenyaemr      
+          cd /apps/github-workflows/kenyaemr-modules/openmrs-module-kenyaemr
+          git pull origin upi-dev
+          git status
+          mvn clean install -DskipTests
+          sudo rm -rf /var/lib/OpenMRS/modules/kenyaemr-*.omod
+          sudo cp /apps/github-workflows/kenyaemr-modules/openmrs-module-kenyaemr/omod/target/kenyaemr-*.omod /var/lib/OpenMRS/modules/
+          sudo chown -R tomcat:tomcat /var/lib/OpenMRS/modules/
+          sudo chmod +r /var/lib/OpenMRS/modules/*.omod
+          sudo chmod 755 /var/lib/OpenMRS/modules/*.omod
+          sudo service tomcat9 restart
+

api/pom.xml

@@ -1,17 +1,27 @@
+<!--
+
+    This Source Code Form is subject to the terms of the Mozilla Public License,
+    v. 2.0. If a copy of the MPL was not distributed with this file, You can
+    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+
+    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+    graphic logo is a trademark of OpenMRS Inc.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>kenyaemr</artifactId>
-		<version>15.1.8-RC2-SNAPSHOT</version>
+		<version>18.2.0</version>
 	</parent>
 
 	<artifactId>kenyaemr-api</artifactId>
-    <version>15.1.8-RC2-SNAPSHOT</version>
+    <version>18.2.0</version>
 	<packaging>jar</packaging>
 	<name>KenyaEMR Module API</name>
 	<description>API project for KenyaEMR Module</description>
-
 	<build>
 		<pluginManagement>
 			<plugins>

api/src/main/distro/metadata/forms.xml

@@ -1,3 +1,14 @@
+<!--
+
+    This Source Code Form is subject to the terms of the Mozilla Public License,
+    v. 2.0. If a copy of the MPL was not distributed with this file, You can
+    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+
+    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+    graphic logo is a trademark of OpenMRS Inc.
+
+-->
 <!-- Forms used by KenyaEMR, listed A-Z -->
 <refs type="Form">
 	<ref key="CLINICAL_ENCOUNTER" uuid="e958f902-64df-4819-afd4-7fb061f59308" />

api/src/main/distro/metadata/identifierTypes.xml

@@ -1,3 +1,14 @@
+<!--
+
+    This Source Code Form is subject to the terms of the Mozilla Public License,
+    v. 2.0. If a copy of the MPL was not distributed with this file, You can
+    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+
+    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+    graphic logo is a trademark of OpenMRS Inc.
+
+-->
 <!-- Patient identifier types used by KenyaEMR, listed A-Z -->
 <refs type="IdentifierType">
 	<ref key="CWC_NUMBER" uuid="1dc8b419-35f2-4316-8d68-135f0689859b" />
@@ -9,4 +20,12 @@
 	<ref key="PATIENT_CLINIC_NUMBER" uuid="b4d66522-11fc-45c7-83e3-39a1af21ae0d" />
 	<ref key="UNIQUE_PATIENT_NUMBER" uuid="05ee9cf4-7242-4a17-b4d4-00f707265c8a" />
 	<ref key="NATIONAL_UNIQUE_PATIENT_IDENTIFIER" uuid="f85081e2-b4be-4e48-b3a4-7994b69bb101" />
+	<ref key="KDoD_NUMBER" uuid="b51ffe55-3e76-44f8-89a2-14f5eaf11079" />
+	<ref key="KDoD_SERVICE_NUMBER" uuid="f2b0c94f-7b2b-4ab0-aded-0d970f88c063" />
+	<ref key="CLIENT_NUMBER" uuid="9a260a8c-b94d-11eb-8529-0242ac130003" />
+	<ref key="HUDUMA_NUMBER" uuid="6428800b-5a8c-4f77-a285-8d5f6174e5fb" />
+	<ref key="PASSPORT_NUMBER" uuid="be9beef6-aacc-4e1f-ac4e-5babeaa1e303" />
+	<ref key="BIRTH_CERTIFICATE_NUMBER" uuid="68449e5a-8829-44dd-bfef-c9c8cf2cb9b2" />
+	<ref key="ALIEN_ID_NUMBER" uuid="1c7d0e5b-2068-4816-a643-8de83ab65fbf" />
+	<ref key="DRIVING_LICENSE" uuid="ca125004-e8af-445d-9436-a43684150f8b" />
 </refs>

api/src/main/distro/metadata/programs.xml

@@ -1,8 +1,22 @@
+<!--
+
+    This Source Code Form is subject to the terms of the Mozilla Public License,
+    v. 2.0. If a copy of the MPL was not distributed with this file, You can
+    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+
+    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+    graphic logo is a trademark of OpenMRS Inc.
+
+-->
 <!-- Programs used by KenyaEMR, listed A-Z -->
 <refs type="Program">
 	<ref key="HIV" uuid="dfdc6d40-2f2f-463d-ba90-cc97350441a8" />
 	<ref key="MCH_CS" uuid="c2ecdf11-97cd-432a-a971-cfd9bd296b83" />
 	<ref key="MCH_MS" uuid="b5d9e05f-f5ab-4612-98dd-adb75438ed34" />
 	<ref key="TB" uuid="9f144a34-3a4a-44a9-8486-6b7af6cc64f6" />
 	<ref key="IPT" uuid="335517a1-04bc-438b-9843-1ba49fb7fcd9" />
+	<ref key="OTZ" uuid="24d05d30-0488-11ea-8d71-362b9e155667" />
+	<ref key="OVC" uuid="6eda83f0-09d9-11ea-8d71-362b9e155667" />
+	<ref key="VMMC" uuid="228538f4-cad9-476b-84c3-ab0086150bcc" />
 </refs>

api/src/main/java/org/openmrs/module/kenyaemr/ArtAssessmentMethod.java

@@ -1,17 +1,12 @@
 /**
- * The contents of this file are subject to the OpenMRS Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://license.openmrs.org
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * Copyright (C) OpenMRS, LLC.  All Rights Reserved.
+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+ * graphic logo is a trademark of OpenMRS Inc.
  */
-
 package org.openmrs.module.kenyaemr;
 
 /**

api/src/main/java/org/openmrs/module/kenyaemr/Configuration.java

@@ -1,17 +1,12 @@
 /**
- * The contents of this file are subject to the OpenMRS Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://license.openmrs.org
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * Copyright (C) OpenMRS, LLC.  All Rights Reserved.
+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+ * graphic logo is a trademark of OpenMRS Inc.
  */
-
 package org.openmrs.module.kenyaemr;
 
 import org.apache.commons.logging.Log;

api/src/main/java/org/openmrs/module/kenyaemr/Dictionary.java

@@ -1,17 +1,12 @@
 /**
- * The contents of this file are subject to the OpenMRS Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://license.openmrs.org
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * Copyright (C) OpenMRS, LLC.  All Rights Reserved.
+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+ * graphic logo is a trademark of OpenMRS Inc.
  */
-
 package org.openmrs.module.kenyaemr;
 
 import org.openmrs.Concept;

api/src/main/java/org/openmrs/module/kenyaemr/EmrActivator.java

@@ -1,27 +1,31 @@
 /**
- * The contents of this file are subject to the OpenMRS Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://license.openmrs.org
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * Copyright (C) OpenMRS, LLC.  All Rights Reserved.
+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+ * graphic logo is a trademark of OpenMRS Inc.
  */
-
 package org.openmrs.module.kenyaemr;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
+import org.openmrs.Patient;
+import org.openmrs.Visit;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.ModuleActivator;
 import org.openmrs.module.kenyacore.CoreContext;
 import org.openmrs.module.reporting.report.service.ReportService;
+import org.openmrs.util.OpenmrsUtil;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
 
 /**
  * This class contains the logic that is run every time this module is either started or stopped.
@@ -40,7 +44,10 @@ public class EmrActivator implements ModuleActivator {
 	 * @see ModuleActivator#willRefreshContext()
 	 */
 	public void willRefreshContext() {
+
 		log.info("KenyaEMR context refreshing...");
+		//TODO: Investigate what causes reports page to load slowly. This behavior started with platform 2.x upgrade
+		Context.getAdministrationService().executeSQL("delete from reporting_report_request", false);
 	}
 
 	/**
@@ -73,7 +80,7 @@ public void contextRefreshed() {
 	 * @see ModuleActivator#started()
 	 */
 	public void started() {
-		Context.getService(ReportService.class).deleteOldReportRequests();
+		// Context.getService(ReportService.class).deleteOldReportRequests();
 		log.info("KenyaEMR started");
 	}