update template and fix null pointer error IsantePlus#95

mozzy11 · Aug 19, 2021 · c28afc0 · c28afc0
1 parent ae55928
commit c28afc0
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 18 deletions.
diff --git a/api/src/main/java/org/openmrs/module/isanteplusreports/hsisReport/HsisReportManager.java b/api/src/main/java/org/openmrs/module/isanteplusreports/hsisReport/HsisReportManager.java
@@ -58,14 +58,13 @@ public ReportDefinition constructReportDefinition() {
 		rd.setUuid(getUuid());
 
 		CohortIndicatorDataSetDefinition cdv = HsisReportDatasetLibrary.getVistsDataset();
-		 CohortIndicatorDataSetDefinition cdm = HsisReportDatasetLibrary.getMalariaDataset();
+		CohortIndicatorDataSetDefinition cdm = HsisReportDatasetLibrary.getMalariaDataset();
 
 		Map<String, Object> parameterMappings = new HashMap<String, Object>();
 		parameterMappings.put("startDate", "${startDate}");
 		parameterMappings.put("endDate", "${endDate}");	
 		rd.addDataSetDefinition("visits", cdv, parameterMappings);
-		rd.addDataSetDefinition("malaria", cdm, parameterMappings);		
-
+		rd.addDataSetDefinition("malaria", cdm, parameterMappings);			
 		return rd;
     }
 

diff --git a/.../openmrs/module/isanteplusreports/hsisReport/library/cohorts/HsisReportCohortLibrary.java b/.../openmrs/module/isanteplusreports/hsisReport/library/cohorts/HsisReportCohortLibrary.java
@@ -20,7 +20,7 @@ public static CohortDefinition subsquentVistCohort() {
   }
 
   public static CohortDefinition pregnantWomenCohort() {
-    SqlCohortDefinition cohortDefinition = cohortDefinitionFromSqlResource("pregnnatWomen.sql", "Pregnant Women");
+    SqlCohortDefinition cohortDefinition = cohortDefinitionFromSqlResource("pregnantWomen.sql", "Pregnant Women");
     return cohortDefinition;
   }
 
@@ -39,11 +39,6 @@ public static CohortDefinition otherAdultsCohort() {
     return cohortDefinition;
   }
 
-  public static CohortDefinition totalCohort() {
-    SqlCohortDefinition cohortDefinition = cohortDefinitionFromSqlResource("total.sql", "Total");
-    return cohortDefinition;
-  }
-
   public static CohortDefinition reducedMobilityEngineCohort() {
     SqlCohortDefinition cohortDefinition = cohortDefinitionFromSqlResource("reducedMobilityEngine.sql", "People with reduced mobility (engine)");
     return cohortDefinition;

diff --git a/...va/org/openmrs/module/isanteplusreports/hsisReport/library/columns/HsisReportColumns.java b/...va/org/openmrs/module/isanteplusreports/hsisReport/library/columns/HsisReportColumns.java
@@ -6,6 +6,7 @@
 
 public class HsisReportColumns {
 
+    //colums for the Vist Dataset
     public static final String CHILD_0_1 = "children0_1_";
     public static final String CHILD_1_4 = "children1_4_";
     public static final String CHILD_5_9 = "children5_9_";
@@ -19,10 +20,12 @@ public class HsisReportColumns {
     public static final String TOTAL = "total_";
     public static final String ENGINE = "reducedMobilityEngine_";
     public static final String SENSORY = "reducedMobilitySensory_";
-    public static final String MICROSCOPIC = "microscopicTest_";
-    public static final String FAST = "fastTest_";
-    public static final String MALARIA = "testedForMalaria_";
-    public static final String PSMALARIA = "testedForMalariaPositive_";
+
+    //colums for the Malaria Dataset
+    public static final String MICROSCOPIC = "microscopicTest";
+    public static final String FAST = "fastTest";
+    public static final String MALARIA = "testedForMalaria";
+    public static final String PSMALARIA = "testedForMalariaPositive";
 
 
 
@@ -43,11 +46,11 @@ public static void addAgeColumnsforVists(CohortIndicatorDataSetDefinition dsd, C
     }
 
     public static void addTypesOfExaminationsColumsForMalaria(CohortIndicatorDataSetDefinition dsd, CohortIndicator cohortIndicator) {
-        constructColumn(MICROSCOPIC + "positive", "Malaria microscopic positive test", cohortIndicator, "malariaExam=microscopicTestPositive", dsd);
-        constructColumn(FAST + "positive", "Malaria fast positive test", cohortIndicator, "malariaExam=fastTestPositive", dsd);
+        constructColumn(MICROSCOPIC + "Positive", "Malaria microscopic positive test", cohortIndicator, "malariaExam=microscopicTestPositive", dsd);
+        constructColumn(FAST + "Positive", "Malaria fast positive test", cohortIndicator, "malariaExam=fastTestPositive", dsd);
         constructColumn(MICROSCOPIC, "Malaria microscopic test", cohortIndicator, "malariaExam=microscopicTest", dsd);
         constructColumn(FAST, "Malaria fast test", cohortIndicator, "malariaExam=fastTest", dsd);
-        constructColumn(PSMALARIA + "positive", "Positive number of people tested for Malaria", cohortIndicator, "malariaExam=fastTestPositiveMicroscopicFast", dsd);
+        constructColumn(PSMALARIA , "Positive number of people tested for Malaria", cohortIndicator, "malariaExam=fastTestPositiveMicroscopicFast", dsd);
         constructColumn(MALARIA, "Number of people tested for Malaria", cohortIndicator, "", dsd);
     }
 

diff --git a/...penmrs/module/isanteplusreports/hsisReport/library/datasets/HsisReportDatasetLibrary.java b/...penmrs/module/isanteplusreports/hsisReport/library/datasets/HsisReportDatasetLibrary.java
@@ -37,7 +37,7 @@ public static CohortIndicatorDataSetDefinition getMalariaDataset() {
     dsd.setName("malaria");
     dsd.addParameter(START_DATE);
     dsd.addParameter(END_DATE);
-    dsd.addDimension("malariaExams", ReportUtils.map(malariaDimension()));
+    dsd.addDimension("malariaExam", ReportUtils.map(malariaDimension()));
     HsisReportColumns.addTypesOfExaminationsColumsForMalaria(dsd, getMalariaIndicator());
     return dsd;
   }

diff --git a/.../openmrs/module/isanteplusreports/hsisReport/library/dimensions/HsisDimensionLibrary.java b/.../openmrs/module/isanteplusreports/hsisReport/library/dimensions/HsisDimensionLibrary.java
@@ -33,7 +33,7 @@ public static CohortDefinitionDimension generalDimension(){
 
     public static CohortDefinitionDimension malariaDimension(){
       CohortDefinitionDimension dim = new CohortDefinitionDimension();
-        dim.setName("malariaExams");
+        dim.setName("malariaExam");
         dim.addCohortDefinition("microscopicTestPositive", ReportUtils.map(microscopicTestAndPositiveCohort()));
         dim.addCohortDefinition("fastTestPositive", ReportUtils.map(fastTestAndPositiveCohort()));
         dim.addCohortDefinition("fastTestPositiveMicroscopicFast", ReportUtils.map(positiveMicroscopicFastCohort()));

diff --git a/...ain/resources/org/openmrs/module/isanteplusreports/reportTemplates/hsisReportTemplate.xls b/...ain/resources/org/openmrs/module/isanteplusreports/reportTemplates/hsisReportTemplate.xls
diff --git a/...reports/sql/hsisReports/pregnnatWomen.sql → ...reports/sql/hsisReports/pregnantWomen.sql b/...reports/sql/hsisReports/pregnnatWomen.sql → ...reports/sql/hsisReports/pregnantWomen.sql