From 402288db3b226ac51cbbbbe13cd5ca6968ba97c8 Mon Sep 17 00:00:00 2001
From: "Stephen S. Musoke" <ssmusoke@gmail.com>
Date: Tue, 30 Jan 2018 10:08:24 +0300
Subject: [PATCH] Miscellaneous fixes to 2.0.0 bugs  (#332)

* [maven-release-plugin] prepare for next development iteration

Update data entry statistics version which does not require internet for connectivity

Increased data integrity to the latest released version that includes export of the results to CSV and Excel

Updated the reporting module to the latest released version

Removed the TB_FOLLOWUP_ENCOUNTER which was merged into the TB_SUMMARY_ENCOUNTER

Cleanup of unused metadata

Fixed the query for linking the infants to mothers via the mother's ART number, through a test case that highlighted the error

Updated coreapps and chart-search to released versions

Added require options for the display widgets

Added the require attribute to show dashboard widgets only when the conditions are met
Upgraded coreapps to a snapshot that honors the require attribute

Correct fix links to the summary pages and descriptions of the failures

Updated the openmrs modules from snapshot to release version

Updated the Reporting compatibility module with fixes to include death date

Updated the change request for migrating ART Summary Page form id from 34 to 14, with a precondition in case the new form_id does not exist

Increased the version of UgandaEMR reports to the latest development version

Adding Service point to capture missing service points

Added the name of the health center to the login page and header

Revert "Adding Service point to capture missing service points"

This reverts commit 134c0987e48dffd2a5d467705c6de4b889bd3500.

* Updated UgandaEMR reports version to release 2.0.2

* Update the reports to the latest development version

* Fix for reports not saving to the serialized table

* Updated HTML form entry version to fix Javascript issue due to incompatibility with older versions
---
 api/pom.xml  | 5 +++++
 omod/pom.xml | 5 +++++
 pom.xml      | 9 +++++++++
 3 files changed, 19 insertions(+)

diff --git a/api/pom.xml b/api/pom.xml
index 7b00eb07d..cf1acbf36 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -111,6 +111,11 @@
 			<artifactId>htmlformentry-api-1.10</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.openmrs.module</groupId>
+			<artifactId>htmlformentry-api-2.0</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.openmrs.module</groupId>
 			<artifactId>htmlformentryui-api</artifactId>
diff --git a/omod/pom.xml b/omod/pom.xml
index ecf957e4c..f494cd50d 100644
--- a/omod/pom.xml
+++ b/omod/pom.xml
@@ -120,6 +120,11 @@
 			<artifactId>htmlformentry-api-1.10</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.openmrs.module</groupId>
+			<artifactId>htmlformentry-api-2.0</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.openmrs.module</groupId>
 			<artifactId>htmlformentryui-api</artifactId>
diff --git a/pom.xml b/pom.xml
index c24355b31..d0646a40c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,8 @@
 		<formfilterVersion>1.0.0</formfilterVersion>
 		<htmlformentryuiVersion>1.6.4</htmlformentryuiVersion>
 		<htmlformentryVersion>3.3.2</htmlformentryVersion>
+		<htmlformentryuiVersion>1.6.3</htmlformentryuiVersion>
+		<htmlformentryVersion>3.6.0</htmlformentryVersion>
 		<htmlwidgetsVersion>1.9.0</htmlwidgetsVersion>
 		<idgenVersion>4.4.0</idgenVersion>
 		<jacksonVersion>1.8.3</jacksonVersion>
@@ -271,6 +273,13 @@
 				<scope>test</scope>
 			</dependency>
 
+			<dependency>
+				<groupId>org.openmrs.module</groupId>
+				<artifactId>htmlformentry-api-2.0</artifactId>
+				<version>${htmlformentryVersion}</version>
+				<scope>test</scope>
+			</dependency>
+
 			<dependency>
 				<groupId>org.openmrs.module</groupId>
 				<artifactId>idgen-api</artifactId>