Nutrition surveillance report

api/pom.xml

@@ -94,14 +94,27 @@
 		  <groupId>org.openmrs.module</groupId>
 		  <artifactId>appui-omod</artifactId>
 		</dependency>
-		<dependency>
+        <dependency>
 		  <groupId>org.openmrs.module</groupId>
 		  <artifactId>metadatadeploy-api</artifactId>
+		    <scope>provided</scope>
 		</dependency>
+        <dependency>
+		  <groupId>org.openmrs.module</groupId>
+		  <artifactId>metadatasharing-api</artifactId>
+		    <scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.openmrs.module</groupId>
+			<artifactId>metadatamapping-api</artifactId>
+		</dependency>
+
 		<dependency>
 		  <groupId>org.openmrs.module</groupId>
 		  <artifactId>metadatamapping-api</artifactId>
 		</dependency>
+
 		<dependency>
 		  <groupId>org.openmrs.module</groupId>
 		  <artifactId>metadatasharing-api</artifactId>
@@ -119,6 +132,11 @@
 				<artifactId>reportingui-api</artifactId>
 				<scope>provided</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.openmrs.module</groupId>
+			<artifactId>serialization.xstream-api-2.0</artifactId>
+		</dependency>
 
 		<!-- End OpenMRS modules -->
 
@@ -128,13 +146,11 @@
 		<dependency>
 			<groupId>org.openmrs.api</groupId>
 			<artifactId>openmrs-api</artifactId>
-			<type>jar</type>
 		</dependency>
 
 		<dependency>
 			<groupId>org.openmrs.web</groupId>
 			<artifactId>openmrs-web</artifactId>
-			<type>jar</type>
 		</dependency>
 
 		<dependency>
@@ -192,7 +208,7 @@
 		<testResources>
 			<testResource>
 				<directory>src/test/resources</directory>
-				<filtering>true</filtering>
+				<filtering>false</filtering>
 			</testResource>
 		</testResources>
 	</build>

api/src/main/java/org/openmrs/module/isanteplusreports/AddRoleAndPrivilegeBundle.java

@@ -1,5 +1,6 @@
 package org.openmrs.module.isanteplusreports;
 
+
 import org.openmrs.Privilege;
 import org.openmrs.Role;
 import org.openmrs.api.UserService;
@@ -11,7 +12,11 @@
 import static org.openmrs.module.metadatadeploy.bundle.CoreConstructors.privilege;
 import static org.openmrs.module.metadatadeploy.bundle.CoreConstructors.role;
 
-@Component("reportsRolePrivilegeMetadata")
+import org.openmrs.api.context.Context;
+import org.openmrs.module.metadatadeploy.bundle.AbstractMetadataBundle;
+import org.springframework.context.annotation.ComponentScan;
+
+@ComponentScan({ "org.openmrs.module.isanteplusreports" })
 public class AddRoleAndPrivilegeBundle extends AbstractMetadataBundle {
 
 	 public static class _Privilege {

api/src/main/java/org/openmrs/module/isanteplusreports/IsantePlusReportsUtil.java

@@ -220,7 +220,26 @@ public static void registerReportsWithStartAndEndDateParams(String sql, String m
 		ReportDesign rDes = reportDesign("Excel", repDefinition, ExcelTemplateRenderer.class);
 		rs.saveReportDesign(rDes);
 	}
+
+	public static void registerIndicatorReportsWithStartAndEndDateParams(String name,
+			String description, String uuid, DataSetDefinition dataSetDefinition) {
+
+		Map<String, Object> mappings = new HashMap<String, Object>();
+		mappings.put("startDate", "${startDate}");
+		mappings.put("endDate", "${endDate}");
+
+		DataSetDefinition dsd = dataSetDefinition;
+		dsd.addParameter(startDate);
+		dsd.addParameter(endDate);
+		Context.getService(DataSetDefinitionService.class).saveDefinition(dsd);
 
+		ReportDefinition repDefinition = reportDefinition(name, description, uuid);
+		repDefinition.addParameter(startDate);
+		repDefinition.addParameter(endDate);
+		repDefinition.addDataSetDefinition(dsd, mappings);
+		Context.getService(SerializedDefinitionService.class).saveDefinition(repDefinition);
+	}
+
     public static void registerIndicatorReportsWithStartAndEndDateParams(String name, String description, String uuid,
             DataSetDefinition dataSetDefinition) {
 
@@ -427,6 +446,18 @@ public static void registerOtherReportsWithoutParams(String sql, String messageP
 		ReportDesign rDes = reportDesign("Excel", repDefinition, ExcelTemplateRenderer.class);
 		rs.saveReportDesign(rDes);
 	}
+
+    public static SqlCohortDefinition sqlCohortDefinition(String sql,String name, String description) {
+        SqlCohortDefinition cd = new SqlCohortDefinition();
+        cd.setName(name);
+        cd.setDescription(description);
+        cd.addParameter(startDate);
+        cd.addParameter(endDate);
+        cd.addParameter(location);
+        cd.setQuery(sql);
+
+        return cd;
+    }
 
     public static SqlCohortDefinition sqlCohortDefinition(String sql, String name, String description) {
         SqlCohortDefinition cd = new SqlCohortDefinition();

api/src/main/java/org/openmrs/module/isanteplusreports/library/cohort/IsanteIndicatorReportCohortLibrary.java

@@ -0,0 +1,16 @@
+package org.openmrs.module.isanteplusreports.library.cohort;
+
+import org.openmrs.module.reporting.cohort.definition.CompositionCohortDefinition;
+import org.openmrs.module.reporting.cohort.definition.SqlCohortDefinition;
+
+public interface IsanteIndicatorReportCohortLibrary {
+
+    static SqlCohortDefinition sqlCohortDefinition(String sqlResourceName, String cohortDefinitionName) {
+        return null;
+    }
+
+    static CompositionCohortDefinition compositionCohortDefinition(String cohortDefinitionName) {
+        return null;
+    }
+
+}