OpenMRS

src/api/org/openmrs/reporting/export/DataExportFunctions.java

@@ -287 +287 @@
-                this.separator = separator;
-        }
-        
-, EvaluationContext context
-, context
+
+
-        }
-        
-, EvaluationContext context
-, context
+
+
-        }
-        
-, EvaluationContext context
-, context
+
+
-        }
-        
-, EvaluationContext context
+
-                if (cohortMap.containsKey(key))
-                        return cohortMap.get(key).contains(getPatientId());
-                
+                //TODO try to cache the evaluation context
+                EvaluationContext context = new EvaluationContext();
+                
-                log.debug("getting cohort/definition for key: " + key);
-                //PatientSet ps = null;
-                Cohort ps = null;

test/api/org/openmrs/reporting/export/DataExportTest.java

@@ -22 +22 @@
-
-import org.junit.Test;
-import org.openmrs.Cohort;
+import org.openmrs.api.context.Context;
-import org.openmrs.test.BaseContextSensitiveTest;
-import org.openmrs.util.OpenmrsUtil;
-
@@ -571 +572 @@
-                assertEquals("The output is not right.", expectedOutput, output);
-                
-        }
+        
+        @Test
+        public void cohortColumnsShouldWork() throws Exception {
+                // First create a cohort. TODO maybe move this to xml
+                Cohort cohort = new Cohort();
+                cohort.setName("A Cohort");
+                cohort.setDescription("Just for testing");
+                cohort.addMember(2);
+                cohort = Context.getCohortService().saveCohort(cohort);
+                
+                DataExportReportObject export = new DataExportReportObject();
+                export.setName("Cohort column");
+                
+                SimpleColumn patientId = new SimpleColumn("PATIENT_ID", "$!{fn.patientId}");
+                export.getColumns().add(patientId);
+                
+                CohortColumn cohortCol = new CohortColumn("InCohort", cohort.getCohortId(), null, null, "Yes", "No");
+                export.getColumns().add(cohortCol);
+                        
+                // set the cohort to two patients, one of which is in the specified cohort
+                Cohort patients = new Cohort();
+                patients.addMember(2);
+                patients.addMember(6);
+                
+                System.out.println("Template String: \n" + export.generateTemplate());
+                
+                DataExportUtil.generateExport(export, patients, "\t", null);
+                File exportFile = DataExportUtil.getGeneratedFile(export);
+                
+                String expectedOutput = "PATIENT_ID\tInCohort\n2\tYes\n6\tNo\n";
+                String output = OpenmrsUtil.getFileAsString(exportFile);
+                exportFile.delete();
+                
+                //System.out.println("exportFile: \n" + output);
+                assertEquals("The output is not right.", expectedOutput, output);
+        }
-}