Merge pull request #58 from dancinoman/main

Create first report and visualization for children patients (Under 5 program)
MadiroGlobalHealth · Oct 29, 2024 · 17e6be1 · 17e6be1
2 parents 3b8284e + 48dfc4a
commit 17e6be1
Show file tree

Hide file tree

Showing 4 changed files with 288 additions and 13 deletions.
diff --git a/sites/mugamba/configs/openmrs/initializer_config/liquibase/liquibase.xml b/sites/mugamba/configs/openmrs/initializer_config/liquibase/liquibase.xml
@@ -79,7 +79,7 @@
             <column name="gender" value="M"/>
             <column name="date_created" value="2024-10-16 20:55:00" />
             <column name="uuid" value="5a27f32a-45c6-4425-8923-fcf0cda8d07c" />
-        </insert>        
+        </insert>
          <!--/////////////////////////////////////////////////////////////////////////////////////////////////-->
     </changeSet>
 
@@ -153,7 +153,7 @@
             <column name="voided" valueBoolean="false"/>
             <column name="uuid" value="62b36822-97c9-4e79-ad6a-0e46e0facfb8"/>
         </insert>
-       
+
         <insert tableName="person_name">
             <column name="person_name_id" valueNumeric="36"/>
             <column name="preferred" valueBoolean="true"/>
@@ -165,7 +165,7 @@
             <column name="voided" valueBoolean="false"/>
             <column name="uuid" value="53588704-bab9-407e-9cef-73f427318e36"/>
         </insert>
-       
+
         <insert tableName="person_name">
             <column name="person_name_id" valueNumeric="37"/>
             <column name="preferred" valueBoolean="true"/>
@@ -177,7 +177,7 @@
             <column name="voided" valueBoolean="false"/>
             <column name="uuid" value="19d3dd94-67f1-4799-8f0d-8071aa4ef55b"/>
         </insert>
-       
+
         <insert tableName="person_name">
             <column name="person_name_id" valueNumeric="38"/>
             <column name="preferred" valueBoolean="true"/>
@@ -189,7 +189,7 @@
             <column name="voided" valueBoolean="false"/>
             <column name="uuid" value="89b1e000-c41c-443f-a799-5aaa5e33bd54"/>
         </insert>
-       
+
         <insert tableName="person_name">
             <column name="person_name_id" valueNumeric="39"/>
             <column name="preferred" valueBoolean="true"/>
@@ -201,7 +201,7 @@
             <column name="voided" valueBoolean="false"/>
             <column name="uuid" value="3002ae61-8497-4fea-a122-32564f69ce23"/>
         </insert>
-       
+
         <insert tableName="person_name">
             <column name="person_name_id" valueNumeric="40"/>
             <column name="preferred" valueBoolean="true"/>
@@ -211,7 +211,7 @@
             <column name="creator" valueNumeric="1"/>
             <column name="date_created" value="2024-10-16 20:55:00"/>
             <column name="voided" valueBoolean="false"/>
-            <column name="uuid" value="3002ae61-8497-4fea-a122-32564f69ce23"/>
+            <column name="uuid" value="07bda65d-82b8-4bb5-bb4a-5d6e5ba44457"/>
         </insert>
         <!--/////////////////////////////////////////////////////////////////////////////////////////////////-->
     </changeSet>
@@ -276,7 +276,7 @@
             <column name="creator" value="1" />
             <column name="date_created" value="2024-06-19 12:55:00" />
         </insert>
-         
+
         <!--/////////////////////////////////////////////////////////////////////////////////////////////////-->
         <!--Added by Allan-->
         <insert tableName="users">
@@ -289,7 +289,7 @@
             <column name="uuid" value="75e4d9ce-540a-49f7-ac6b-8d0964592bba" />
             <column name="creator" value="1" />
             <column name="date_created" value="2024-06-19 12:55:00" />
-        </insert>         
+        </insert>
         <insert tableName="users">
             <column name="user_id" value="36" />
             <column name="system_id" value="Nurse" />
@@ -352,13 +352,13 @@
     <changeSet id="add_uvl_user_role-202410162055" author="Allan">
         <comment>
             Add Mugamba User roles to database
-        </comment> 
+        </comment>
         <!--Delay foregin key mapping-->
-        <sql>SET foreign_key_checks = 0;</sql>                
+        <sql>SET foreign_key_checks = 0;</sql>
         <insert tableName="user_role">
             <column name="user_id" value="35" />
             <column name="role" value="Registration Officer" />
-        </insert>         
+        </insert>
         <insert tableName="user_role">
             <column name="user_id" value="36" />
             <column name="role" value="Nurse" />
@@ -405,5 +405,24 @@
         <sql>SET foreign_key_checks = 0;</sql>
 		<sqlFile path="sql/item_prices.sql" relativeToChangelogFile="true" stripComments="true" />
         <sql>SET foreign_key_checks = 1;</sql>
-	</changeSet>
+	  </changeSet>
+
+    <!-- Reports -->
+    <changeSet id="add_serial_object_" author="dancinoman">
+        <sql>SET foreign_key_checks = 0;</sql>
+		<sqlFile path="sql/serialized_object.sql" relativeToChangelogFile="true" stripComments="true" />
+        <sql>SET foreign_key_checks = 1;</sql>
+    </changeSet>
+
+    <changeSet id="add_reporting_report_request" author="dancinoman">
+        <sql>SET foreign_key_checks = 0;</sql>
+		<sqlFile path="sql/reporting_report_request.sql" relativeToChangelogFile="true" stripComments="true" />
+        <sql>SET foreign_key_checks = 1;</sql>
+    </changeSet>
+
+    <changeSet id="add_reporting_report_design" author="dancinoman">
+        <sql>SET foreign_key_checks = 0;</sql>
+		<sqlFile path="sql/reporting_report_design.sql" relativeToChangelogFile="true" stripComments="true" />
+        <sql>SET foreign_key_checks = 1;</sql>
+    </changeSet>
 </databaseChangeLog>
diff --git a/sites/mugamba/configs/openmrs/initializer_config/liquibase/sql/reporting_report_design.sql b/sites/mugamba/configs/openmrs/initializer_config/liquibase/sql/reporting_report_design.sql
@@ -0,0 +1,3 @@
+INSERT INTO reporting_report_design (`id`,`uuid`,`name`,`description`,`renderer_type`,`properties`,`creator`,`date_created`,`changed_by`,`date_changed`,`retired`,`retired_by`,`date_retired`,`retire_reason`,`report_definition_uuid`) VALUES
+	 (23,'55c44cd3-53da-4560-aa56-d85c37e5cda2','CSV report',NULL,'org.openmrs.module.reporting.report.renderer.CsvReportRenderer','#Mon Oct 21 15:35:33 UTC 2024
+',2,'2024-10-21 15:35:33',NULL,NULL,0,NULL,NULL,NULL,'aa636aa4-fd96-415b-b569-f40cab389473');
diff --git a/sites/mugamba/configs/openmrs/initializer_config/liquibase/sql/reporting_report_request.sql b/sites/mugamba/configs/openmrs/initializer_config/liquibase/sql/reporting_report_request.sql
@@ -0,0 +1,11 @@
+INSERT INTO openmrs.reporting_report_request (`id`,`uuid`,`base_cohort_uuid`,`base_cohort_parameters`,`report_definition_uuid`,`report_definition_parameters`,`renderer_type`,`renderer_argument`,`requested_by`,`request_datetime`,`priority`,`status`,`evaluation_start_datetime`,`evaluation_complete_datetime`,`render_complete_datetime`,`description`,`schedule`,`process_automatically`,`minimum_days_to_preserve`) VALUES
+	 (4,'8ae17def-b68e-44da-b063-ae5fcf1f5ccc',NULL,NULL,'aa636aa4-fd96-415b-b569-f40cab389473','<linked-hash-map id="1">
+  <entry>
+    <string>startDate</string>
+    <string>${start_of_last_month}</string>
+  </entry>
+  <entry>
+    <string>endDate</string>
+    <string>${end_of_last_month}</string>
+  </entry>
+</linked-hash-map>','org.openmrs.module.reporting.web.renderers.DefaultWebRenderer',NULL,2,'2024-10-21 18:20:56','NORMAL','SCHEDULED',NULL,NULL,NULL,NULL,'0 0 12 1 * ?',0,NULL);