REPORT-859: Add a JSON Renderer to TextTemplate feature (#192)

openmrs · Dec 11, 2019 · de48eac · de48eac
1 parent 2057019
commit de48eac
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/.../src/test/java/org/openmrs/module/reporting/report/renderer/TextTemplateRendererTest.java b/.../src/test/java/org/openmrs/module/reporting/report/renderer/TextTemplateRendererTest.java
@@ -49,7 +49,7 @@ public void setup() {
 		p.setBirthdate(DateUtil.getDateTime(2007, 5, 27));
 		patientService.savePatient(p);
 	}
-	
+
 	@Test
 	public void shouldRenderVariableReplacementTemplate() throws Exception {
 		shouldRenderTemplate("VariableReplacementTemplate.txt", null);
@@ -75,15 +75,15 @@ private void shouldRenderTemplate(String templateName, String templateType) thro
 		allPatients.addPatientProperty("gender");
 		allPatients.addPatientProperty("birthdate");
 		reportDefinition.addDataSetDefinition("allPatients", allPatients, null);
-		
+
 		GenderCohortDefinition males = new GenderCohortDefinition();
 		males.setName("Males");
 		males.setMaleIncluded(true);
-		
+
 		GenderCohortDefinition females = new GenderCohortDefinition();
 		females.setName("Females");
 		females.setFemaleIncluded(true);
-		
+
 		CohortCrossTabDataSetDefinition genderDsd = new CohortCrossTabDataSetDefinition();
 		genderDsd.addColumn("males", males, null);
 		genderDsd.addColumn("females", females, null);

diff --git a/api/src/main/java/org/openmrs/module/reporting/report/manager/ReportManagerUtil.java b/api/src/main/java/org/openmrs/module/reporting/report/manager/ReportManagerUtil.java
@@ -22,6 +22,7 @@
 import org.openmrs.module.reporting.report.definition.ReportDefinition;
 import org.openmrs.module.reporting.report.definition.service.ReportDefinitionService;
 import org.openmrs.module.reporting.report.renderer.CsvReportRenderer;
+import org.openmrs.module.reporting.report.renderer.TextTemplateRenderer;
 import org.openmrs.module.reporting.report.renderer.XlsReportRenderer;
 import org.openmrs.module.reporting.report.service.ReportService;
 import org.openmrs.module.reporting.report.util.ReportUtil;
@@ -159,6 +160,23 @@ public static ReportDesign createExcelTemplateDesign(String reportDesignUuid, Re
 		return design;
 	}
 
+	/**
+	 * @return a new ReportDesign for a JSON template, using a file on the classpath as the template
+	 */
+	public static ReportDesign createJSONTemplateDesign(String reportDesignUuid, ReportDefinition reportDefinition, String resourcePath) {
+		ReportDesign design =  createJSONReportDesign(reportDesignUuid,reportDefinition);
+		design.setReportDefinition(reportDefinition);
+		design.setRendererType(TextTemplateRenderer.class);
+		ReportDesignResource resource = new ReportDesignResource();
+		resource.setName("template");
+		resource.setExtension("json");
+		resource.setContentType("application/json");
+		resource.setContents(ReportUtil.readByteArrayFromResource(resourcePath));
+		resource.setReportDesign(design);
+		design.addResource(resource);
+		return design;
+	}
+
 	/**
 	 * @return a new ReportDesign for a standard Excel output
 	 */
@@ -183,4 +201,16 @@ public static ReportDesign createCsvReportDesign(String reportDesignUuid, Report
 		design.setRendererType(CsvReportRenderer.class);
 		return design;
 	}
+
+	/**
+	 * @return a new ReportDesign for a standard CSV output
+	 */
+	public static ReportDesign createJSONReportDesign(String reportDesignUuid, ReportDefinition reportDefinition) {
+		ReportDesign design = new ReportDesign();
+		design.setUuid(reportDesignUuid);
+		design.setName("JSON");
+		design.setReportDefinition(reportDefinition);
+		design.setRendererType(TextTemplateRenderer.class);
+		return design;
+	}
 }