Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tb surveillance report #53

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Tb surveillance report #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a716468
Added more indicators to the TB indicators report
Aug 28, 2019
a7a18a2
Added more indicators to the TB indicators report
Aug 28, 2019
201a886
French translations
Aug 30, 2019
81b220b
Resolved merge conflicts
Aug 30, 2019
c5186fb
Numerator/denominator drilldown
Sep 24, 2019
8d43e09
Merge branch 'indicator-report-drilldown' into tb-surveillance-report
Sep 24, 2019
b80cfe5
Merge branch 'master' into tb-surveillance-report
moshonk Sep 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions api/src/main/java/org/openmrs/module/isanteplusreports/IsantePlusReportsUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,9 @@ 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) {

public static void registerIndicatorReportsWithStartAndEndDateParams(String name, String description, String uuid,
DataSetDefinition dataSetDefinition) {
Expand Down Expand Up @@ -427,6 +430,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();
Expand Down
48 changes: 48 additions & 0 deletions api/src/main/java/org/openmrs/module/isanteplusreports/library/cohort/ReportCohort.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package org.openmrs.module.isanteplusreports.library.cohort;

import java.util.Date;

import org.openmrs.Location;
import org.openmrs.module.reporting.cohort.definition.CohortDefinition;
import org.openmrs.module.reporting.cohort.definition.SqlCohortDefinition;
import org.openmrs.module.reporting.evaluation.parameter.Parameter;
import org.openmrs.module.reporting.evaluation.parameter.Parameterizable;

public class ReportCohort {

public static CohortDefinition vlCohort(String sql) {
SqlCohortDefinition cd = new SqlCohortDefinition();
cd.setName("VIRAL LOAD");
cd.setDescription("VIRAL LOAD");
cd.addParameter(new Parameter("startDate", "Data Inicial", Date.class));
cd.addParameter(new Parameter("endDate", "Data Final", Date.class));
cd.addParameter(new Parameter("location", "Location", Location.class));
cd.setQuery(sql);

return cd;
}

public static CohortDefinition patientsWithRespiratorySymptomsCohort(String sql) {
SqlCohortDefinition cd = new SqlCohortDefinition();
cd.setName("patients_with_respiratory_symptoms");
cd.setDescription("Patients with respiratory symptoms");
cd.addParameter(new Parameter("startDate", "Data Inicial", Date.class));
cd.addParameter(new Parameter("endDate", "Data Final", Date.class));
cd.addParameter(new Parameter("location", "Location", Location.class));
cd.setQuery(sql);

return cd;
}

public static CohortDefinition patientsWithSputumOrderedCohort(String sql) {
SqlCohortDefinition cd = new SqlCohortDefinition();
cd.setName("patients_with_sputum_ordered");
cd.setDescription("Patients with sputum ordered");
cd.addParameter(new Parameter("startDate", "Data Inicial", Date.class));
cd.addParameter(new Parameter("endDate", "Data Final", Date.class));
cd.addParameter(new Parameter("location", "Location", Location.class));
cd.setQuery(sql);

return cd;
}
}
Loading