-
14 |
${ ui.message('reportingui.adHocReport.modal.header') }
2 |
3 |
4 |
15 |
16 |
20 |
--------------------------------------------------------------------------------
/omod/src/main/webapp/pages/allDefinitionLibraries.gsp:
--------------------------------------------------------------------------------
1 | <%
2 | ui.decorateWith("appui", "standardEmrPage")
3 | %>
4 |
5 | <% allTypes.each { definitionType ->
6 | def definitions = allDefinitionLibraries.getDefinitionSummaries(definitionType)
7 | %>
8 |
9 |
5 |
8 | {{ definition.name }}
6 | 7 |
9 |
14 |
10 |
11 |
12 |
13 | ${ definitionType.simpleName }
10 | 11 || Name | 15 |Description | 16 |Parameters | 17 |
|---|---|---|
| ${ ui.message(it.name) } | 23 |${ ui.message(it.description) } | 24 |
25 | <%= it.parameters.collect {
26 | "${it.name}:${it.type.simpleName}" +
27 | (it.collectionType ? "(${it.collectionType.simpleName})" : "")
28 | }.join(" ") %> 29 | |
30 |
22 | <% if (overviews) { %>
23 |
44 |
45 | ${ ui.message("reportingui.reportsapp.overviewReports") }
24 |-
25 | <% overviews.each { %>
26 |
- 27 | ${ ui.includeFragment("uicommons", "extension", [ extension: it, contextModel: contextModel ]) } 28 | 29 | <% } %> 30 |
${ ui.message("reportingui.reportsapp.dataQualityReports") }
35 |-
36 | <% dataQualityReports.each { %>
37 |
- 38 | ${ ui.includeFragment("uicommons", "extension", [ extension: it, contextModel: contextModel ]) } 39 | 40 | <% } %> 41 |
46 | <% if (dataExports) { %>
47 |
--------------------------------------------------------------------------------
/omod/src/main/java/org/openmrs/module/reportingui/page/controller/AdHocAnalysisPageController.java:
--------------------------------------------------------------------------------
1 | /*
2 | * The contents of this file are subject to the OpenMRS Public License
3 | * Version 1.0 (the "License"); you may not use this file except in
4 | * compliance with the License. You may obtain a copy of the License at
5 | * http://license.openmrs.org
6 | *
7 | * Software distributed under the License is distributed on an "AS IS"
8 | * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
9 | * License for the specific language governing rights and limitations
10 | * under the License.
11 | *
12 | * Copyright (C) OpenMRS, LLC. All Rights Reserved.
13 | */
14 |
15 | package org.openmrs.module.reportingui.page.controller;
16 |
17 | import org.apache.commons.lang.StringUtils;
18 | import org.codehaus.jackson.map.ObjectMapper;
19 | import org.openmrs.api.context.Context;
20 | import org.openmrs.module.reporting.dataset.definition.RowPerObjectDataSetDefinition;
21 | import org.openmrs.module.reportingrest.adhoc.AdHocDataSet;
22 | import org.openmrs.module.reportingrest.adhoc.AdHocExportManager;
23 | import org.openmrs.ui.framework.annotation.SpringBean;
24 | import org.openmrs.ui.framework.page.PageModel;
25 | import org.springframework.web.bind.annotation.RequestParam;
26 |
27 | public class AdHocAnalysisPageController {
28 |
29 | public void get(@RequestParam(value = "definition", required = false) String uuid,
30 | @RequestParam(value = "definitionClass", required = false) String definitionClass,
31 | @SpringBean AdHocExportManager adHocExportManager,
32 | PageModel model) throws Exception {
33 |
34 | RowPerObjectDataSetDefinition definition = null;
35 | String initialStateJson = null;
36 | if (StringUtils.isNotBlank(uuid)) {
37 | definition = adHocExportManager.getAdHocDataSetByUuid(uuid);
38 |
39 | AdHocDataSet ds = new AdHocDataSet(definition);
40 |
41 | ObjectMapper jackson = new ObjectMapper();
42 | initialStateJson = jackson.writeValueAsString(ds);
43 |
44 | }
45 | else if (StringUtils.isNotBlank(definitionClass)) {
46 | Class clazz = Context.loadClass(definitionClass);
47 | definition = (RowPerObjectDataSetDefinition) clazz.newInstance();
48 | definition.setUuid(null);
49 | }
50 | else {
51 | throw new IllegalArgumentException("definition or definitionClass is required");
52 | }
53 | model.addAttribute("definition", definition);
54 | model.addAttribute("initialStateJson", initialStateJson);
55 | }
56 |
57 | }
58 |
--------------------------------------------------------------------------------
/omod/src/test/java/org/openmrs/module/reportingui/page/controller/RunReportPageControllerTest.java:
--------------------------------------------------------------------------------
1 | /*
2 | * The contents of this file are subject to the OpenMRS Public License
3 | * Version 1.0 (the "License"); you may not use this file except in
4 | * compliance with the License. You may obtain a copy of the License at
5 | * http://license.openmrs.org
6 | *
7 | * Software distributed under the License is distributed on an "AS IS"
8 | * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
9 | * License for the specific language governing rights and limitations
10 | * under the License.
11 | *
12 | * Copyright (C) OpenMRS, LLC. All Rights Reserved.
13 | */
14 |
15 | package org.openmrs.module.reportingui.page.controller;
16 |
17 | import org.junit.Before;
18 | import org.junit.Test;
19 | import org.openmrs.module.reporting.report.definition.ReportDefinition;
20 | import org.openmrs.module.reporting.report.definition.service.ReportDefinitionService;
21 | import org.openmrs.module.reporting.report.renderer.RenderingMode;
22 | import org.openmrs.module.reporting.report.service.ReportService;
23 | import org.openmrs.ui.framework.page.PageModel;
24 |
25 | import java.util.ArrayList;
26 | import java.util.List;
27 |
28 | import static org.hamcrest.CoreMatchers.is;
29 | import static org.junit.Assert.assertThat;
30 | import static org.mockito.Mockito.mock;
31 | import static org.mockito.Mockito.when;
32 |
33 | /**
34 | *
35 | */
36 | public class RunReportPageControllerTest {
37 |
38 | private String reportDefinitionUuid;
39 | private ReportDefinition reportDefinition;
40 | private List${ ui.message("reportingui.reportsapp.dataExports") }
48 |-
49 | <% dataExports.each { %>
50 |
- 51 | ${ ui.includeFragment("uicommons", "extension", [ extension: it, contextModel: contextModel ]) } 52 | 53 | <% } %> 54 |
34 |
35 |
--------------------------------------------------------------------------------
/README.md:
--------------------------------------------------------------------------------
1 | ##Background
2 |
3 | When you want to get data out of an OpenMRS system, it is sometimes worthwhile to have programmers or advanced administrators design a very specific report or data export, such as might be run "monthly, for each clinic." But sometimes mid-level want to be able to do "ad hoc" analyses and exports, where they explore data and export it on the fly.
4 |
5 | The Reporting Module provides powerful and flexible tools for Row-Per-(Patient, Visit, Encounter, etc) exports, however this functionality only has an administrative UI that is unsuitable for an end user.
6 |
7 | The Reporting Compatibility Module has two key tools (Cohort Builder and Data Export) with friendlier UIs (though they are quite dated). Though these are used by many implementations, they are built on top of a deprecated query and export framework, and they are really past what should be the end of their useful lifetime.
8 | Objectives
9 |
10 | The goal of this project is to build a tool that can be used by doctors and data analysts to do Ad Hoc queries and exports of data. These queries may happen in response to an on-the-fly question from a hospital manager, or in response to a specific suspicion or need that a clinician has to analyze certain data. We want to allow people to access the necessary data without needing a developer or advanced sysadmin to be a bottleneck in the process.
11 |
12 | Specifically, we want to build a UI around row-per-domain-object exports for key domain objects (primarily Patient, Visit, Encounter, and Obs) that is suitable for users of medium sophistication.
13 |
14 | We want to design the tool in a way that it can be used to query for domain objects matching certain criteria (like the Cohort Builder), and also to export details of the matching objects (like the Data Export tool).
15 | ##Design
16 |
17 | The Reporting Module has a RowPerObjectDataSetDefinition base class (with implemantations for Patient, Encounter, etc), and under the hood we should be building instances of this.
18 |
19 | The Reporting Module also supports the idea of "definition libraries" (see the AllDefinitionLibraries class) which include built-in and implementation-configured queries and data definitions. Rather than trying to give users full access to all of the primitive queries in the reporting module, we will focus on letting them access definitions encapsulated in these libraries.
20 | ##Status
21 |
22 | Considerable initial work has been done on this tool already, in the reportingui module, but there is much left to do.
23 |
24 | Further work is captured under the following JIRA epics:
25 |
26 | RA-261 (version 1): https://issues.openmrs.org/browse/RA-261
27 | RA-279 (version 2): https://issues.openmrs.org/browse/RA-279
28 |
29 | ##Dev Notes
30 |
31 | The code is at https://github.com/openmrs/openmrs-module-reportingui. See all files and packages that have "adhoc" in the name.
32 |
33 | The easiest way to test out this code is to:
34 |
35 | check out code from https://github.com/openmrs/openmrs-distro-referenceapplication
36 | add the latest snapshot version of the reportingui module to pom.xml (in several places, alongside everywhere you find the "reporting" module)
37 | follow the instructions at Developer How-To Launch a Local Instance of the Reference Application
38 | The entry point to the tool should be at http://localhost:8080/openmrs/reportingui/adHocManage.page
39 | alternately you can enable the "reportingui_adHocAnalysis" feature toggle, to see a link in the UI.
40 |
--------------------------------------------------------------------------------
/omod/src/main/webapp/resources/scripts/adHocRun.js:
--------------------------------------------------------------------------------
1 | /*
2 | * The contents of this file are subject to the OpenMRS Public License
3 | * Version 1.0 (the "License"); you may not use this file except in
4 | * compliance with the License. You may obtain a copy of the License at
5 | * http://license.openmrs.org
6 | *
7 | * Software distributed under the License is distributed on an "AS IS"
8 | * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
9 | * License for the specific language governing rights and limitations
10 | * under the License.
11 | *
12 | * Copyright (C) OpenMRS, LLC. All Rights Reserved.
13 | */
14 |
15 |
16 | var app = angular.module('runAdHocExport', ['ui.bootstrap']).
17 |
18 | filter('translate', function() {
19 | return function(input, prefix) {
20 | if (input && input.uuid) {
21 | input = input.uuid;
22 | }
23 | var code = prefix ? prefix + input : input;
24 | return emr.message(code, input);
25 | }
26 | }).
27 |
28 | controller('RunAdHocExportController', ['$scope', '$http', function($scope, $http) {
29 |
30 | $scope.outputFormat = 'org.openmrs.module.reporting.report.renderer.CsvReportRenderer';
31 |
32 | $scope.exports = adHocExports;
33 |
34 | _.each($scope.exports, function(item) {
35 | item.selected = initialSelection.indexOf(item.uuid) >= 0;
36 | });
37 |
38 | $scope.paramValues = { };
39 |
40 | $scope.requiredParameters = function() {
41 | var params = [];
42 | var addParameterSafely = function(p) {
43 | if (!_.findWhere(params, { name: p.name })) {
44 | params.push(p);
45 | }
46 | }
47 | _.each($scope.exports, function(item) {
48 | if (item.selected) {
49 | _.each(item.parameters, function(p) {
50 | addParameterSafely(p);
51 | });
52 | }
53 | });
54 | return params;
55 | }
56 |
57 | var missingParameters = function() {
58 | return _.some($scope.requiredParameters(), function(item) {
59 | return !($scope.paramValues[item.name]);
60 | });
61 | }
62 |
63 | $scope.canRun = function() {
64 | return _.findWhere($scope.exports, { selected: true }) && !missingParameters();
65 | }
66 |
67 | function serverFriendly(original) {
68 | if (original instanceof Date) {
69 | return moment(original).format("YYYY-MM-DD HH:mm:ss");
70 | }
71 | else {
72 | return original;
73 | }
74 | }
75 |
76 | $scope.run = function() {
77 | var uuids = _.pluck(_.where($scope.exports, { selected: true }), 'uuid');
78 | var params = {
79 | dataset: uuids,
80 | outputFormat: $scope.outputFormat
81 | };
82 | for (key in $scope.paramValues) {
83 | params['param[' + key + ']'] = serverFriendly($scope.paramValues[key]);
84 | }
85 |
86 | $http.post(emr.fragmentActionLink('reportingui', 'adHocAnalysis', 'runAdHocExport', params)).
87 | success(function(data) {
88 | if (data.uuid) {
89 | location.href = emr.pageLink('reportingui', 'reportStatus', { request: data.uuid });
90 | }
91 | else {
92 | emr.errorAlert(data.error);
93 | }
94 | }).
95 | error(function() {
96 | emr.errorAlert('ERROR!');
97 | });
98 | }
99 |
100 | }]);
--------------------------------------------------------------------------------
/omod/src/main/webapp/resources/scripts/runReport.js:
--------------------------------------------------------------------------------
1 | var runReportApp = angular.module("runReportApp", [ ]).
2 | filter('translate', function() {
3 | return function(input, prefix) {
4 | var code = prefix ? prefix + input : input;
5 | return emr.message(code, input);
6 | }
7 | });
8 |
9 | runReportApp.controller('RunReportController', ['$scope', '$http', '$window', '$timeout', function($scope, $http, $window, $timeout) {
10 |
11 | $scope.loading = true;
12 |
13 | $scope.queue = [];
14 |
15 | $scope.completed = [];
16 |
17 | $scope.submitting = false;
18 |
19 | $scope.refreshHistory = function() {
20 | $http.get("reportStatus/getQueuedRequests.action?reportDefinition=" + $window.reportDefinition.uuid).
21 | success(function(data, status, headers, config) {
22 | $scope.queue = data;
23 | $scope.loading = false;
24 | if ($scope.queue.length > 0) {
25 | $timeout($scope.refreshHistory, 10000);
26 | }
27 | }).
28 | error(function(data, status, headers, config) {
29 | console.log("Error getting queue: " + status);
30 | $scope.queue = [];
31 | });
32 |
33 | $http.get("reportStatus/getCompletedRequests.action?reportDefinition=" + $window.reportDefinition.uuid).
34 | success(function(data, status, headers, config) {
35 | $scope.completed = data;
36 | }).
37 | error(function(data, status, headers, config) {
38 | console.log("Error getting completed: " + status);
39 | $scope.completed = [];
40 | });
41 | }
42 |
43 | $scope.hasResults = function() {
44 | return !$scope.loading && $scope.completed.length > 0;
45 | }
46 |
47 | $scope.hasNoResults = function() {
48 | return !$scope.loading && $scope.completed.length == 0;
49 | }
50 |
51 | var defaultSuccessAction = function(data, status, headers, config) {
52 | emr.successMessage(data.message);
53 | $scope.refreshHistory();
54 | }
55 |
56 | var defaultErrorAction = function(data, status, headers, config) {
57 | emr.errorMessage(data.message);
58 | $scope.refreshHistory();
59 | }
60 |
61 | $scope.cancelRequest = function(request) {
62 | $http.post("reportStatus/cancelRequest.action?reportRequest=" + request.uuid).
63 | success(defaultSuccessAction).
64 | error(defaultErrorAction);
65 | }
66 |
67 | $scope.canSave = function(request) {
68 | return request.status == 'COMPLETED';
69 | }
70 |
71 | $scope.saveRequest = function(request) {
72 | $http.post("reportStatus/saveRequest.action?reportRequest=" + request.uuid).
73 | success(defaultSuccessAction).
74 | error(defaultErrorAction);
75 | }
76 |
77 | $scope.runReport = function() {
78 | // this is a plain old form, not really using angular. need to rewrite the datepickers to be angular-friendly
79 | var form = angular.element('#run-report');
80 | var submission = form.serializeArray();
81 | var missingParams = [ ];
82 | console.log(submission);
83 | for (var i = 0; i < submission.length; ++i) {
84 | var p = submission[i];
85 | if (p.name.indexOf("parameterValues[") == 0) {
86 | if (!p.value) {
87 | missingParams.push(p.name);
88 | }
89 | }
90 | }
91 | if (missingParams.length > 0) {
92 | emr.errorMessage(emr.message("reportingui.runReport.missingParameter", "Missing parameter values"));
93 | }
94 | else {
95 | $scope.submitting = true;
96 | $.post("runReport.page?reportDefinition=" + $window.reportDefinition.uuid, submission, function() {
97 | location.href = location.href;
98 | });
99 | }
100 | }
101 |
102 | }]);
--------------------------------------------------------------------------------
/omod/src/main/webapp/pages/adHocManage.gsp:
--------------------------------------------------------------------------------
1 | <%
2 | ui.decorateWith("appui", "standardEmrPage")
3 | ui.includeJavascript("uicommons", "moment.min.js")
4 | ui.includeJavascript("uicommons", "angular.min.js")
5 | ui.includeCss("reportingui", "adHocReport.css")
6 | ui.includeJavascript("uicommons", "angular-ui/ui-bootstrap-tpls-0.6.0.min.js")
7 |
8 | def patientDataExports = exports.findAll { it.type == "PatientDataSetDefinition" }
9 | %>
10 |
11 |
49 |
50 | ${ ui.message("reportingui.adHocRun.label") }
36 | 37 | 38 | ${ ui.message("reportingui.adHocRun.noneAvailable") } 39 | 40 | 41 |
42 |
73 |
74 | ${ ui.message("reportingui.adHocManage.title") }
51 | 52 |
53 |
60 |
61 | ${ ui.message("reportingui.adHocManage.group.title.org.openmrs.module.reporting.dataset.definition.PatientDataSetDefinition") }
54 | 55 | 56 | 57 | ${ ui.message("reportingui.adHocManage.new") } 58 | 59 |
40 |
41 |
108 |
109 |
--------------------------------------------------------------------------------
/omod/src/main/java/org/openmrs/module/reportingui/page/controller/RunReportPageController.java:
--------------------------------------------------------------------------------
1 | package org.openmrs.module.reportingui.page.controller;
2 |
3 | import org.apache.commons.lang3.StringUtils;
4 | import org.openmrs.module.reporting.evaluation.parameter.Mapped;
5 | import org.openmrs.module.reporting.evaluation.parameter.Parameter;
6 | import org.openmrs.module.reporting.report.ReportRequest;
7 | import org.openmrs.module.reporting.report.definition.ReportDefinition;
8 | import org.openmrs.module.reporting.report.definition.service.ReportDefinitionService;
9 | import org.openmrs.module.reporting.report.renderer.RenderingMode;
10 | import org.openmrs.module.reporting.report.service.ReportService;
11 | import org.openmrs.ui.framework.SimpleObject;
12 | import org.openmrs.ui.framework.UiUtils;
13 | import org.openmrs.ui.framework.WebConstants;
14 | import org.openmrs.ui.framework.annotation.SpringBean;
15 | import org.openmrs.ui.framework.page.PageModel;
16 | import org.springframework.web.bind.annotation.RequestParam;
17 |
18 | import javax.servlet.http.HttpServletRequest;
19 | import java.util.ArrayList;
20 | import java.util.Collection;
21 | import java.util.HashMap;
22 | import java.util.Map;
23 |
24 | /**
25 | *
26 | */
27 | public class RunReportPageController {
28 |
29 | public void get(@SpringBean ReportDefinitionService reportDefinitionService,
30 | @SpringBean ReportService reportService,
31 | @RequestParam("reportDefinition") String reportDefinitionUuid,
32 | @RequestParam(value = "breadcrumb", required = false) String breadcrumb,
33 | PageModel model) throws Exception {
34 |
35 | ReportDefinition reportDefinition = reportDefinitionService.getDefinitionByUuid(reportDefinitionUuid);
36 | if (reportDefinition == null) {
37 | throw new IllegalArgumentException("No reportDefinition with the given uuid");
38 | }
39 | model.addAttribute("reportDefinition", reportDefinition);
40 | model.addAttribute("renderingModes", reportService.getRenderingModes(reportDefinition));
41 | model.addAttribute("breadcrumb", breadcrumb);
42 | }
43 |
44 | public String post(@SpringBean ReportDefinitionService reportDefinitionService,
45 | @SpringBean ReportService reportService,
46 | UiUtils ui,
47 | HttpServletRequest request,
48 | @RequestParam("reportDefinition") ReportDefinition reportDefinition,
49 | @RequestParam("renderingMode") String renderingModeDescriptor) {
50 |
51 | RenderingMode renderingMode = null;
52 | for (RenderingMode candidate : reportService.getRenderingModes(reportDefinition)) {
53 | if (candidate.getDescriptor().equals(renderingModeDescriptor)) {
54 | renderingMode = candidate;
55 | break;
56 | }
57 | }
58 |
59 | Collection
42 | ${ ui.message("uicommons.loading.placeholder") }
43 | 
44 |
45 |
46 |
47 |
60 |
61 |
105 |
106 |
107 |
25 |
26 |
75 |
76 |
144 |
145 |
--------------------------------------------------------------------------------
/omod/src/main/java/org/openmrs/module/reportingui/fragment/controller/AdHocAnalysisFragmentController.java:
--------------------------------------------------------------------------------
1 | package org.openmrs.module.reportingui.fragment.controller;
2 |
3 | import org.codehaus.jackson.JsonNode;
4 | import org.codehaus.jackson.map.ObjectMapper;
5 | import org.codehaus.jackson.type.TypeReference;
6 | import org.joda.time.format.DateTimeFormatter;
7 | import org.joda.time.format.ISODateTimeFormat;
8 | import org.openmrs.api.context.Context;
9 | import org.openmrs.module.reporting.dataset.DataSet;
10 | import org.openmrs.module.reporting.dataset.DataSetColumn;
11 | import org.openmrs.module.reporting.dataset.DataSetRow;
12 | import org.openmrs.module.reporting.dataset.definition.RowPerObjectDataSetDefinition;
13 | import org.openmrs.module.reporting.definition.library.AllDefinitionLibraries;
14 | import org.openmrs.module.reporting.report.ReportRequest;
15 | import org.openmrs.module.reporting.report.definition.service.ReportDefinitionService;
16 | import org.openmrs.module.reporting.report.renderer.RenderingMode;
17 | import org.openmrs.module.reporting.report.renderer.ReportRenderer;
18 | import org.openmrs.module.reporting.report.service.ReportService;
19 | import org.openmrs.module.reportingrest.adhoc.AdHocDataSet;
20 | import org.openmrs.module.reportingrest.adhoc.AdHocExportManager;
21 | import org.openmrs.ui.framework.SimpleObject;
22 | import org.openmrs.ui.framework.UiUtils;
23 | import org.openmrs.ui.framework.annotation.SpringBean;
24 | import org.springframework.web.bind.annotation.RequestParam;
25 |
26 | import javax.servlet.http.HttpServletRequest;
27 | import java.io.IOException;
28 | import java.text.SimpleDateFormat;
29 | import java.util.ArrayList;
30 | import java.util.Date;
31 | import java.util.Enumeration;
32 | import java.util.HashMap;
33 | import java.util.List;
34 | import java.util.Map;
35 | import java.util.Set;
36 |
37 | /**
38 | *
39 | */
40 | public class AdHocAnalysisFragmentController {
41 |
42 | private DateTimeFormatter iso8601= ISODateTimeFormat.dateTime();
43 |
44 | public SimpleObject saveDataExport(@RequestParam("dataSet") String dataSetJson,
45 | @SpringBean ReportDefinitionService reportDefinitionService,
46 | @SpringBean AdHocExportManager adHocExportManager,
47 | @SpringBean AllDefinitionLibraries definitionLibraries,
48 | UiUtils ui) throws Exception {
49 | ObjectMapper jackson = new ObjectMapper();
50 | AdHocDataSet dataSet = jackson.readValue(dataSetJson, AdHocDataSet.class);
51 |
52 | RowPerObjectDataSetDefinition dsd = dataSet.toDataSetDefinition(adHocExportManager, definitionLibraries);
53 |
54 | dsd = adHocExportManager.saveAdHocDataSet(dsd);
55 |
56 | SimpleObject ret = SimpleObject.fromObject(dsd, ui, "uuid", "name", "description");
57 | ret.put("name", ((String) ret.get("name")).substring(AdHocExportManager.NAME_PREFIX.length()));
58 | return ret;
59 | }
60 |
61 | private boolean notNull(JsonNode node) {
62 | return node != null && !node.isMissingNode() && !node.isNull();
63 | }
64 |
65 | private Object parseParameterValue(JsonNode param) throws Exception {
66 | // param looks like
67 | // {
68 | // "name":"effectiveDate",
69 | // "type":"java.util.Date",
70 | // "collectionType":null,
71 | // "value":"2013-04-03T04:00:00.000Z"
72 | // }
73 | if (notNull(param.get("collectionType"))) {
74 | throw new IllegalStateException("collection parameters are not yet implemented");
75 | }
76 | Class clazz = Context.loadClass(param.get("type").getTextValue());
77 | if (Date.class.equals(clazz)) {
78 | return new SimpleDateFormat("yyyy-MM-dd").parse(param.get("value").getValueAsText());
79 | }
80 | else {
81 | throw new IllegalStateException("type " + clazz.getName() + " is not yet implemented");
82 | }
83 | }
84 |
85 | public SimpleObject runAdHocExport(@RequestParam("dataset") List
39 |
40 |
--------------------------------------------------------------------------------
/omod/src/main/java/org/openmrs/module/reportingui/fragment/controller/ReportStatusFragmentController.java:
--------------------------------------------------------------------------------
1 | /*
2 | * The contents of this file are subject to the OpenMRS Public License
3 | * Version 1.0 (the "License"); you may not use this file except in
4 | * compliance with the License. You may obtain a copy of the License at
5 | * http://license.openmrs.org
6 | *
7 | * Software distributed under the License is distributed on an "AS IS"
8 | * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
9 | * License for the specific language governing rights and limitations
10 | * under the License.
11 | *
12 | * Copyright (C) OpenMRS, LLC. All Rights Reserved.
13 | */
14 |
15 | package org.openmrs.module.reportingui.fragment.controller;
16 |
17 | import org.openmrs.module.reporting.evaluation.parameter.Mapped;
18 | import org.openmrs.module.reporting.evaluation.parameter.Parameterizable;
19 | import org.openmrs.module.reporting.report.Report;
20 | import org.openmrs.module.reporting.report.ReportRequest;
21 | import org.openmrs.module.reporting.report.definition.ReportDefinition;
22 | import org.openmrs.module.reporting.report.definition.service.ReportDefinitionService;
23 | import org.openmrs.module.reporting.report.renderer.InteractiveReportRenderer;
24 | import org.openmrs.module.reporting.report.service.ReportService;
25 | import org.openmrs.ui.framework.SimpleObject;
26 | import org.openmrs.ui.framework.UiUtils;
27 | import org.openmrs.ui.framework.annotation.SpringBean;
28 | import org.openmrs.ui.framework.fragment.action.FailureResult;
29 | import org.openmrs.ui.framework.fragment.action.FragmentActionResult;
30 | import org.openmrs.ui.framework.fragment.action.SuccessResult;
31 | import org.openmrs.util.OpenmrsUtil;
32 | import org.springframework.web.bind.annotation.RequestParam;
33 |
34 | import java.util.ArrayList;
35 | import java.util.Collections;
36 | import java.util.Comparator;
37 | import java.util.HashMap;
38 | import java.util.List;
39 | import java.util.Map;
40 |
41 | /**
42 | *
43 | */
44 | public class ReportStatusFragmentController {
45 |
46 | public List${ ui.message(reportDefinition.name) }
41 |${ ui.message(reportDefinition.description) }
42 | 43 |
44 |
89 |
90 |
149 |
150 |
151 |
152 |
208 |
209 |
210 |
56 |
57 |
277 |
--------------------------------------------------------------------------------
/omod/src/main/webapp/resources/scripts/adHocAnalysis.js:
--------------------------------------------------------------------------------
1 | window.adHocAnalysis = {
2 | queryPromises: {},
3 | queryResults: {},
4 |
5 | fetchData: function($http, target, type, afterSuccess) {
6 | var promise = $http.get(emr.fragmentActionLink('reportingui', 'definitionLibrary', 'getDefinitions', { type: type })).
7 | success(function(data, status, headers, config) {
8 | _.each(data, function(item) {
9 | item.label = item.name + ' (' + item.description + ')';
10 | });
11 | target.queryResults[type] = data;
12 | if (afterSuccess) {
13 | afterSuccess.call();
14 | }
15 | });
16 | target.queryPromises[type] = promise;
17 | }
18 | }
19 |
20 | angular.module('reportingui').
21 |
22 | filter('insertParameterNames', ['$filter', function($filter) {
23 | function escapeRegExp(string) {
24 | return string.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1");
25 | }
26 |
27 | function replaceAll(find, replace, str) {
28 | return str.replace(new RegExp(escapeRegExp(find), 'g'), replace);
29 | }
30 |
31 | return function(input, localParams, globalParams) {
32 | input = _.escape(input); // input is a raw description, which might include something like "<= $startDate"
33 | // first, global parameters
34 | _.each(globalParams, function(p) {
35 | input = replaceAll("{{" + p.name + "}}", "" + $filter('omrs.display')(p.label) + "", input);
36 | });
37 | // next, parameters specific to this filter/column
38 | _.each(localParams, function(p) {
39 | input = replaceAll("{{" + p.name + "}}", "" + $filter('omrs.display')(p.label) + "", input);
40 | })
41 | return input;
42 | }
43 | }]).
44 |
45 | directive('definitionsearch', function($compile) {
46 | // expect { type: ..., key: ..., name: ..., description: ..., parameters: [ ... ] }
47 |
48 | return function(scope, element, attrs) {
49 | var allowedParameters = _.pluck(scope.parameters, 'name');
50 | var onSelectAction = scope[attrs['action']];
51 | element.autocomplete({
52 | source: [ 'Loading...' ],
53 | select: function(event, ui) {
54 | scope.$apply(function() {
55 | onSelectAction(ui.item);
56 | });
57 | element.val('');
58 | return false;
59 | },
60 | response: function(event, ui) {
61 | var i = ui.content.length - 1;
62 | while (i >= 0) {
63 | var paramNames = _.pluck(ui.content[i].parameters, 'name');
64 | var notAllowed = _.without(paramNames, allowedParameters);
65 | if (notAllowed.length > 0) {
66 | ui.content.splice(i, 1);
67 | }
68 | --i;
69 | }
70 | },
71 | change: function(event, ui) {
72 | element.val('');
73 | return false;
74 | }
75 | });
76 | var definitionType = attrs['definitionType'];
77 | window.adHocAnalysis.queryPromises[definitionType].success(function() {
78 | element.autocomplete( "option", "source", window.adHocAnalysis.queryResults[definitionType] );
79 | });
80 | };
81 | }).
82 |
83 | controller('AdHocAnalysisController', ['$scope', '$http', '$timeout', '$filter', function($scope, $http, $timeout, $filter) {
84 |
85 | // ----- private helper functions ----------
86 |
87 | function swap(array, idx1, idx2) {
88 | if (idx1 < 0 || idx2 < 0 || idx1 >= array.length || idx2 >= array.length) {
89 | return;
90 | }
91 | var temp = array[idx1];
92 | array[idx1] = array[idx2];
93 | array[idx2] = temp;
94 | }
95 |
96 | function filterAvailable(allDefinitions, currentDefinitions) {
97 | return _.filter(allDefinitions, function(candidate) {
98 | // if this takes run-time parameters, the user is allowed to add it multiple times
99 | if ($scope.requiresExtraParameters(candidate)) {
100 | return true;
101 | }
102 | // otherwise, skip anything we already have selected
103 | return ! _.findWhere(currentDefinitions, { key: candidate.key });
104 | });
105 | }
106 |
107 | function postJSON(url, dataObject) {
108 | return $http({
109 | method: 'POST',
110 | url: url,
111 | data: dataObject
112 | });
113 | }
114 |
115 | function post(url, dataObject) {
116 | return $http({
117 | method: 'POST',
118 | url: url,
119 | data: $.param(dataObject),
120 | headers: {'Content-Type': 'application/x-www-form-urlencoded'}
121 | });
122 | }
123 |
124 | function stripTimeFromParameters(dataExport) {
125 | var ret = angular.copy(dataExport);
126 | _.each(ret.parameters, function(it) {
127 | if (it.value instanceof Date) {
128 | it.value = it.value.toISOString().slice(0,10);
129 | }
130 | });
131 | return ret;
132 | }
133 |
134 | function setDirty() {
135 | $scope.dirty = true;
136 | }
137 |
138 | function copyDefinitionWithParameterValues(definition, paramValues) {
139 | return $.extend(
140 | _.pick(definition, 'key', 'type', 'name', 'description', 'label', 'parameters'),
141 | { parameterValues: paramValues }
142 | );
143 | }
144 |
145 | // ----- Model ----------
146 |
147 | $scope.dataExport = window.adHocDataExport; // initialized in the gsp on page load
148 |
149 | var initialSetup = $scope.dataExport.initialSetup;
150 | delete $scope.dataExport.initialSetup;
151 |
152 | $scope.dirty = !window.adHocDataExport.uuid;
153 |
154 | $scope.editingCombination = false;
155 |
156 | $scope.dataExport.customRowFilterCombination = '';
157 |
158 | $scope.dataExport.parameters = [];
159 |
160 | $scope.dataExport.rowFilters = [];
161 |
162 | $scope.dataExport.columns = [];
163 |
164 | if (initialSetup) {
165 | $scope.dataExport.uuid = initialSetup.uuid;
166 | $scope.dataExport.name = initialSetup.name;
167 | $scope.dataExport.description = initialSetup.description;
168 | $scope.dataExport.parameters = initialSetup.parameters;
169 | _.each($scope.dataExport.parameters, function(item) {
170 | if (item.type == "java.util.Date") {
171 | item.value = moment().startOf('day').toDate();
172 | }
173 | });
174 | $scope.dataExport.customRowFilterCombination = initialSetup.customRowFilterCombination;
175 | }
176 | else {
177 | $scope.dataExport.parameters = [
178 | {
179 | name: "startDate",
180 | label: "reportingui.adHocReport.timeframe.startDateLabel",
181 | type: "java.util.Date",
182 | collectionType: null,
183 | value: moment().startOf('day').toDate()
184 | },
185 | {
186 | name: "endDate",
187 | label: "reportingui.adHocReport.timeframe.endDateLabel",
188 | type: "java.util.Date",
189 | collectionType: null,
190 | value: moment().startOf('day').toDate()
191 | }
192 | ];
193 | }
194 |
195 | $scope.initialRowSetup = function() {
196 | if (initialSetup) {
197 | _.each(initialSetup.rowFilters, function(item) {
198 | var rowFilter = _.findWhere(window.adHocAnalysis.queryResults['org.openmrs.module.reporting.cohort.definition.CohortDefinition'], { key: item.key });
199 | if (rowFilter) {
200 | $scope.addDefinitionWithParameters(copyDefinitionWithParameterValues(rowFilter, item.parameterValues), 'rowFilters');
201 | $scope.dirty = false;
202 | } else {
203 | console.log("Could not find row: " + item.key);
204 | }
205 | });
206 | }
207 | }
208 |
209 | $scope.initialColumnSetup = function() {
210 | if (initialSetup) {
211 | _.each(initialSetup.columns, function(item) {
212 | var column = _.findWhere(window.adHocAnalysis.queryResults['org.openmrs.module.reporting.data.patient.definition.PatientDataDefinition'], { key: item.key });
213 | if (column) {
214 | $scope.addDefinitionWithParameters(copyDefinitionWithParameterValues(column, item.parameterValues), 'columns');
215 | $scope.dirty = false;
216 | } else {
217 | console.log("Could not find column: " + item.key);
218 | }
219 | });
220 | }
221 | }
222 |
223 | window.adHocAnalysis.fetchData($http, window.adHocAnalysis, 'org.openmrs.module.reporting.cohort.definition.CohortDefinition', $scope.initialRowSetup);
224 | window.adHocAnalysis.fetchData($http, window.adHocAnalysis, 'org.openmrs.module.reporting.data.patient.definition.PatientDataDefinition', $scope.initialColumnSetup);
225 |
226 | $scope.dataExport.valid = function() {
227 | return $scope.dataExport.name && $scope.dataExport.columns.length > 0;
228 | }
229 |
230 |
231 | $scope.ModalCtrl = function ($scope, $modal, $log) {
232 |
233 | $scope.definition = null;
234 | $scope.listToAddTo = null;
235 | $scope.filters = [];
236 |
237 | $scope.$on("OPEN_MODAL", function(event, definition, listToAddTo) {
238 | $scope.definition = definition;
239 | $scope.listToAddTo = listToAddTo;
240 | for(i = 0; i < definition.parameters.length; i++) {
241 | var paramName = definition.parameters[i].name;
242 | if(!_.contains(_.pluck($scope.$parent.dataExport.parameters, 'name'), paramName)) {
243 | $scope.filters.push(paramName);
244 | }
245 | }
246 | $scope.open();
247 | });
248 |
249 | $scope.open = function () {
250 | var modalInstance = $modal.open({
251 | templateUrl: 'adHocAnalysisParameterPopup.page',
252 | controller: $scope.ModalInstanceCtrl,
253 | resolve: {
254 | definition: function () {
255 | return $scope.definition;
256 | },
257 | filters: function () {
258 | return $scope.filters;
259 | }
260 | }
261 | });
262 |
263 | modalInstance.result.then(function(paramValues) {
264 | var withParameters = copyDefinitionWithParameterValues($scope.definition, paramValues);
265 | $scope.$parent.addDefinitionWithParameters(withParameters, $scope.listToAddTo);
266 | }, function () {
267 | $log.info('Modal dismissed at: ' + new Date());
268 | });
269 | };
270 | };
271 |
272 | $scope.ModalInstanceCtrl = function ($scope, $modalInstance, definition, filters) {
273 | $scope.definition = definition;
274 | $scope.filters = filters;
275 | $scope.paramValues = {};
276 | $scope.dataExport = window.adHocDataExport; // we use this to access the global parameters
277 |
278 | $scope.paramFilter = function(param) {
279 | return _.contains(filters, param.name);
280 | }
281 |
282 | $scope.ok = function () {
283 | $modalInstance.close($scope.paramValues);
284 | };
285 |
286 | $scope.cancel = function () {
287 | $modalInstance.dismiss('cancel');
288 | };
289 | };
290 |
291 | $scope.addRow = function(definition) {
292 | if (jq.inArray(definition, $scope.dataExport.rowFilters) < 0) {
293 | if($scope.requiresExtraParameters(definition) && $scope.hasMissingParameters(definition)) {
294 | $scope.showModal(definition);
295 | } else {
296 | $scope.dataExport.rowFilters.push(definition);
297 | setDirty();
298 | }
299 | }
300 | }
301 |
302 | $scope.addDefinitionWithParameters = function(definition, listToAddTo) {
303 | if(listToAddTo == 'columns') {
304 | $scope.dataExport.columns.push(definition);
305 | }
306 | else if(listToAddTo == 'rowFilters') {
307 | $scope.dataExport.rowFilters.push(definition);
308 | }
309 | setDirty();
310 | }
311 |
312 | $scope.showModal = function(definition) {
313 | var listToAddTo = 'rowFilters'
314 | if($scope.currentView == 'columns') {
315 | listToAddTo = 'columns';
316 | }
317 | // pass a copy of definition to the modal
318 | $scope.$broadcast("OPEN_MODAL", $.extend(true, {}, definition), listToAddTo);
319 | }
320 |
321 | $scope.removeRow = function(idx) {
322 | $scope.dataExport.rowFilters.splice(idx, 1);
323 | setDirty();
324 | }
325 |
326 | $scope.addColumn = function(definition) {
327 | if(jq.inArray(definition, $scope.dataExport.columns) < 0) {
328 | if($scope.requiresExtraParameters(definition) && $scope.hasMissingParameters(definition)) {
329 | $scope.showModal(definition);
330 | }
331 | else {
332 | $scope.dataExport.columns.push(definition);
333 | setDirty();
334 | }
335 | }
336 | }
337 |
338 | $scope.removeColumn = function(idx) {
339 | $scope.dataExport.columns.splice(idx, 1);
340 | setDirty();
341 | }
342 |
343 | $scope.moveColumnUp = function(idx) {
344 | swap($scope.dataExport.columns, idx - 1, idx);
345 | setDirty();
346 | }
347 |
348 | $scope.moveColumnDown = function(idx) {
349 | swap($scope.dataExport.columns, idx, idx + 1);
350 | setDirty();
351 | }
352 |
353 | $scope.editCombination = function() {
354 | $('#custom-combination').val($scope.dataExport.customRowFilterCombination);
355 | $scope.editingCombination = true;
356 | }
357 |
358 | $scope.applyEditCombination = function() {
359 | $scope.dataExport.customRowFilterCombination = $('#custom-combination').val();
360 | $scope.editingCombination = false;
361 | setDirty();
362 | }
363 |
364 | $scope.cancelEditCombination = function() {
365 | $scope.editingCombination = false;
366 | }
367 |
368 | // ----- View and ViewModel ----------
369 |
370 | $scope.currentView = 'parameters';
371 |
372 | $scope.maxDay = moment().startOf('day').toDate();
373 |
374 | $scope.results = null;
375 |
376 | $scope.focusFirstElement = function() {
377 | $timeout(function() {
378 | $('#' + $scope.currentView + ' .focus-first').focus();
379 | });
380 | }
381 |
382 | $scope.$watch('currentView', $scope.focusFirstElement);
383 |
384 | $scope.$watch('dataExport.parameters', function() {
385 | if ($scope.currentView == 'preview') {
386 | $scope.preview();
387 | }
388 | }, true);
389 |
390 | $scope.openStartDatePicker = function() {
391 | $timeout(function() {
392 | $scope.isStartDatePickerOpen = true;
393 | });
394 | };
395 |
396 | $scope.openEndDatePicker = function() {
397 | $timeout(function() {
398 | $scope.isEndDatePickerOpen = true;
399 | });
400 | };
401 |
402 | // TODO remove this
403 | $scope.getFormattedStartDate = function() {
404 | if($scope.dataExport.parameters[0].value == null) { return; }
405 | return moment($scope.dataExport.parameters[0].value).format("DD MMM YYYY");
406 | }
407 |
408 | // TODO remove this
409 | $scope.getFormattedEndDate = function() {
410 | if($scope.dataExport.parameters[1].value == null) { return; }
411 | return moment($scope.dataExport.parameters[1].value).format("DD MMM YYYY");
412 | }
413 |
414 | $scope.availableSearches = function() {
415 | var allPossible = window.adHocAnalysis.queryResults['org.openmrs.module.reporting.cohort.definition.CohortDefinition'];
416 | return filterAvailable(allPossible, $scope.dataExport.rowFilters);
417 | }
418 |
419 | $scope.getColumns = function() {
420 | var allPossible = window.adHocAnalysis.queryResults['org.openmrs.module.reporting.data.patient.definition.PatientDataDefinition'];
421 | return filterAvailable(allPossible, $scope.dataExport.columns);
422 | }
423 |
424 | $scope.requiresExtraParameters = function(definition) {
425 | var allowedParameters = _.pluck($scope.dataExport.parameters, 'name');
426 | var paramNames = _.pluck(definition.parameters, 'name');
427 | var notAllowed = _.difference(paramNames, allowedParameters);
428 | return notAllowed.length != 0;
429 | }
430 |
431 | $scope.isParameterGloballySet = function(param) {
432 | var allowedParameters = _.pluck($scope.dataExport.parameters, 'name');
433 | return _.contains(allowedParameters, param.name);
434 | }
435 |
436 | $scope.hasMissingParameters = function(definition) {
437 | for(i = 0; i < definition.parameters.length; i++) {
438 | if (!$scope.isParameterGloballySet(definition.parameters[i])
439 | && (definition.parameterValues == null || definition.parameterValues[definition.parameters[i].name] == null)) {
440 | return true;
441 | }
442 | }
443 | return false;
444 | }
445 |
446 | $scope.changeStep = function(stepName) {
447 | var steps = [
448 | 'parameters',
449 | 'searches',
450 | 'columns',
451 | 'preview',
452 | 'description'
453 | ];
454 | var isAfterCurrentStep = false;
455 |
456 | $scope.currentView = stepName;
457 |
458 | if(stepName == 'preview') {
459 | $scope.preview();
460 | }
461 |
462 | for(var i=0; i < steps.length; i++) {
463 | if(!isAfterCurrentStep) {
464 | if(steps[i] == stepName) {
465 | isAfterCurrentStep = true;
466 | $('span[data-step="' + steps[i] + '"]').addClass('current').removeClass('done');
467 | } else {
468 | $('span[data-step="' + steps[i] + '"]').addClass('done').removeClass('current');
469 | }
470 | } else {
471 | $('span[data-step="' + steps[i] + '"]').removeClass('done').removeClass('current');
472 | }
473 | }
474 | }
475 |
476 | $scope.next = function() {
477 | if($scope.currentView == 'parameters') {
478 | $scope.currentView = 'searches';
479 | $('span[data-step="parameters"]').addClass('done').removeClass('current');
480 | $('span[data-step="searches"]').addClass('current');
481 | }
482 |
483 | else if($scope.currentView == 'searches') {
484 | $scope.currentView = 'columns';
485 | $('span[data-step="columns"]').addClass('current');
486 | $('span[data-step="searches"]').addClass('done').removeClass('current');
487 | }
488 |
489 | else if($scope.currentView == 'columns') {
490 | $scope.currentView = 'preview';
491 | $('span[data-step="preview"]').addClass('current');
492 | $('span[data-step="columns"]').addClass('done').removeClass('current');
493 | $scope.preview();
494 | }
495 |
496 | else if($scope.currentView == 'preview') {
497 | $scope.currentView = 'description';
498 | $('span[data-step="description"]').addClass('current');
499 | $('span[data-step="preview"]').addClass('done').removeClass('current');
500 | }
501 | }
502 |
503 | $scope.back = function() {
504 | if($scope.currentView == 'searches') {
505 | $scope.currentView = 'parameters';
506 | $('span[data-step="searches"]').removeClass('current');
507 | $('span[data-step="parameters"]').addClass('current').removeClass('done');
508 | }
509 |
510 | else if($scope.currentView == 'columns') {
511 | $scope.currentView = 'searches';
512 | $('span[data-step="columns"]').removeClass('current');
513 | $('span[data-step="searches"]').addClass('current').removeClass('done');
514 | }
515 |
516 | else if($scope.currentView == 'preview') {
517 | $scope.currentView = 'columns';
518 | $('span[data-step="preview"]').removeClass('current');
519 | $('span[data-step="columns"]').addClass('current').removeClass('done');
520 | }
521 |
522 | else if($scope.currentView == 'description') {
523 | $scope.currentView = 'preview';
524 | $('span[data-step="description"]').removeClass('current');
525 | $('span[data-step="preview"]').addClass('current').removeClass('done');
526 | $scope.preview();
527 | }
528 | }
529 |
530 | $scope.preview = function() {
531 | $scope.results = { loading: true };
532 |
533 | postJSON('/' + OPENMRS_CONTEXT_PATH + '/ws/rest/v1/reportingrest/adhocquery?v=preview', stripTimeFromParameters($scope.dataExport)).
534 | success(function(data, status, headers, config) {
535 | $scope.results = data;
536 | }).
537 | error(function(data, status, headers, config) {
538 | emr.handleParsedError(data);
539 | });
540 | }
541 |
542 | $scope.canSave = function() {
543 | return $scope.dataExport.valid();
544 | }
545 |
546 | $scope.saveDataExport = function() {
547 | $scope.dirty = { saving: true };
548 | post(emr.fragmentActionLink('reportingui', 'adHocAnalysis', 'saveDataExport'),
549 | {
550 | dataSet: angular.toJson($scope.dataExport)
551 | }).
552 | success(function(data, status, headers, config) {
553 | $scope.dataExport.uuid = data.uuid;
554 | $scope.dataExport.name = data.name;
555 | $scope.dataExport.description = data.description;
556 | $scope.dirty = false;
557 | });
558 | }
559 |
560 | $scope.canRun = function() {
561 | return $scope.dataExport.uuid && !$scope.dirty;
562 | }
563 |
564 | $scope.runDataExport = function() {
565 | var data = {
566 | dataset: $scope.dataExport.uuid
567 | };
568 | _.each($scope.parameters, function(item) {
569 | data["parameterValues[" + item.name + "]"] = item.value;
570 | });
571 | location.href = emr.pageLink('reportingui', 'adHocRun', data);
572 | }
573 | }]);
574 |
575 |
--------------------------------------------------------------------------------
58 |
59 | ${ ui.message("reportingui.adHocReport.parameters.label") }:
60 | {{ dataExport.parameters.length }}
61 |
62 |
63 |
64 | ${ ui.message("reportingui.adHocReport.searches") }:
65 | {{ dataExport.rowFilters.length }}
66 |
67 |
68 |
69 | ${ ui.message("reportingui.adHocReport.columns") }:
70 | {{ dataExport.columns.length }}
71 |
72 |
73 |
74 | ${ ui.message("reportingui.adHocReport.preview") }
75 |
76 |
77 |
78 | ${ ui.message("reportingui.adHocReport.description.label") }
79 |
80 |
81 |
82 |
83 |
84 |
85 |
100 |
101 | ${ ui.message("reportingui.adHocReport.parameters.label") }
86 |
87 |
96 |
99 | -
88 |
- 89 | {{ \$index + 1 }}. 90 | {{ parameter.label | omrs.display }}: 91 | {{ parameter.collectionType }} of 92 | {{ parameter.type | omrs.display:'reportingui.parameter.type.'}} 93 | 94 |
102 |
150 |
151 | ${ ui.message("reportingui.adHocReport.searchCriteria")}
103 | ${ ui.message("reportingui.adHocReport.searchCriteria.description") } 104 | 105 |
106 |
144 |
145 |
149 | -
107 |
- 111 | {{ criteria.name }} 112 | 113 | 114 |
108 |
109 |
110 | -
117 |
- 131 | 132 | 133 | {{ rowQuery.name }} 134 | 135 | 136 | 137 | 138 | 139 | {{ param.name }}: {{ rowQuery.parameterValues[param.name] | omrs.display }} 140 | 141 | 142 |
118 |
119 | ${ ui.message("reportingui.adHocReport.searchCriteria.combination") }
120 | ${ ui.message("reportingui.adHocReport.searchCriteria.customRowFilterCombination") }
121 |
122 |
123 |
124 | ${ ui.message("reportingui.adHocReport.searchCriteria.combination.edit") }:
125 |
126 |
127 |
128 |
129 |
130 |
152 |
191 |
192 | ${ ui.message("reportingui.adHocReport.columns") }
153 | ${ ui.message("reportingui.adHocReport.columns.description") } 154 | 155 |
156 |
185 |
186 |
190 | -
157 |
- 161 | {{ column.name }} 162 | {{ column.description | insertParameterNames:column.parameters:dataExport.parameters }} 163 | 164 |
158 |
159 |
160 | -
167 |
- 169 | 172 | {{ col.name }} 173 | 174 | 175 | 176 | 177 | 178 | 179 | 180 | {{ param.name }}: {{ col.parameterValues[param.name] | omrs.display }} 181 | 182 | 183 |
{{ dataExport.columns.length }} selected columns
168 |
193 |
239 |
240 | ${ ui.message("reportingui.adHocReport.preview") }
194 | 195 |
196 |
197 |
213 |
238 |
198 |
199 |
200 |
201 |
202 |
203 |
204 |
205 |
206 |
207 |
208 |
209 |
210 |
211 |
212 |
214 |
215 |
216 |
217 | ${ ui.message("reportingui.adHocReport.preview.description") }
218 |
219 |
220 |
232 |
233 |
237 | | 222 | | {{ col.label }} | 223 |
|---|---|
| {{ \$index + 1 }} | 228 |{{ col }} | 229 |
241 |
276 | ${ ui.message("reportingui.adHocReport.description.label") }
242 |
243 |
252 |
275 | 244 | 245 | 246 |
247 |248 | 249 | 250 |
251 |