dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #39645
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20084: ER option: completed events only.
------------------------------------------------------------
revno: 20084
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-09-11 01:33:22 +0200
message:
ER option: completed events only.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties 2015-05-19 10:37:40 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties 2015-09-10 23:33:22 +0000
@@ -208,3 +208,5 @@
error=Error
warning=Warning
excluded_dimensions=Excluded dimensions
+completed_only=Completed only
+include_only_completed_events_only=Include only completed events
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-09-03 17:30:24 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-09-10 23:33:22 +0000
@@ -2393,6 +2393,7 @@
showDimensionLabels,
hideEmptyRows,
hideNaData,
+ completedOnly,
limit,
outputType,
aggregationType,
@@ -2454,6 +2455,11 @@
style: 'margin-bottom:' + checkboxBottomMargin + 'px',
});
+ completedOnly = Ext.create('Ext.form.field.Checkbox', {
+ boxLabel: NS.i18n.include_only_completed_events_only,
+ style: 'margin-bottom:' + checkboxBottomMargin + 'px',
+ });
+
limit = Ext.create('Ext.ux.container.LimitContainer', {
boxLabel: NS.i18n.limit,
sortOrder: 1,
@@ -2563,6 +2569,7 @@
showDimensionLabels,
hideEmptyRows,
hideNaData,
+ completedOnly,
limit,
outputType
//aggregationType
@@ -2605,9 +2612,10 @@
showDimensionLabels: showDimensionLabels.getValue(),
hideEmptyRows: hideEmptyRows.getValue(),
hideNaData: hideNaData.getValue(),
+ completedOnly: completedOnly.getValue(),
+ outputType: outputType.getValue(),
sortOrder: limit.getSortOrder(),
topLimit: limit.getTopLimit(),
- outputType: outputType.getValue(),
showHierarchy: showHierarchy.getValue(),
showDimensionLabels: showDimensionLabels.getValue(),
displayDensity: displayDensity.getValue(),
@@ -2624,8 +2632,9 @@
showDimensionLabels.setValue(Ext.isBoolean(layout.showDimensionLabels) ? layout.showDimensionLabels : true);
hideEmptyRows.setValue(Ext.isBoolean(layout.hideEmptyRows) ? layout.hideEmptyRows : false);
hideNaData.setValue(Ext.isBoolean(layout.hideNaData) ? layout.hideNaData : false);
+ completedOnly.setValue(Ext.isBoolean(layout.completedOnly) ? layout.completedOnly : false);
+ outputType.setValue(Ext.isString(layout.outputType) ? layout.outputType : 'EVENT');
limit.setValues(layout.sortOrder, layout.topLimit);
- outputType.setValue(Ext.isString(layout.outputType) ? layout.outputType : 'EVENT');
//aggregationType.setValue(Ext.isString(layout.aggregationType) ? layout.aggregationType : 'default');
showHierarchy.setValue(Ext.isBoolean(layout.showHierarchy) ? layout.showHierarchy : false);
displayDensity.setValue(Ext.isString(layout.displayDensity) ? layout.displayDensity : 'normal');
@@ -2712,6 +2721,7 @@
w.showDimensionLabels = showDimensionLabels;
w.hideEmptyRows = hideEmptyRows;
w.hideNaData = hideNaData;
+ w.completedOnly = completedOnly;
w.limit = limit;
w.outputType = outputType;
w.showHierarchy = showHierarchy;
@@ -2726,13 +2736,10 @@
};
QueryOptionsWindow = function() {
- var showHierarchy,
+ var completedOnly,
digitGroupSeparator,
displayDensity,
fontSize,
- reportingPeriod,
- organisationUnit,
- parentOrganisationUnit,
data,
style,
@@ -2743,10 +2750,10 @@
checkboxBottomMargin = 2,
window;
- //showHierarchy = Ext.create('Ext.form.field.Checkbox', {
- //boxLabel: NS.i18n.show_hierarchy,
- //style: 'margin-bottom:4px'
- //});
+ completedOnly = Ext.create('Ext.form.field.Checkbox', {
+ boxLabel: NS.i18n.include_only_completed_events_only,
+ style: 'margin-bottom:' + checkboxBottomMargin + 'px',
+ });
displayDensity = Ext.create('Ext.form.field.ComboBox', {
cls: 'ns-combo',
@@ -2811,26 +2818,13 @@
})
});
- //legendSet = Ext.create('Ext.form.field.ComboBox', {
- //cls: 'ns-combo',
- //style: 'margin-bottom:3px',
- //width: comboboxWidth,
- //labelWidth: 130,
- //fieldLabel: NS.i18n.legend_set,
- //valueField: 'id',
- //displayField: 'name',
- //editable: false,
- //value: 0,
- //store: ns.app.stores.legendSet
- //});
-
- //organisationUnits = {
- //bodyStyle: 'border:0 none',
- //style: 'margin-left:14px',
- //items: [
- //showHierarchy
- //]
- //};
+ data = {
+ bodyStyle: 'border:0 none',
+ style: 'margin-left:14px',
+ items: [
+ completedOnly
+ ]
+ };
style = {
bodyStyle: 'border:0 none',
@@ -2839,7 +2833,6 @@
displayDensity,
fontSize,
digitGroupSeparator
- //legendSet
]
};
@@ -2858,6 +2851,7 @@
showSubTotals: false,
hideEmptyRows: false,
hideNaData: false,
+ completedOnly: completedOnly.getValue(),
sortOrder: 0,
topLimit: 0,
showHierarchy: false,
@@ -2868,22 +2862,21 @@
};
},
setOptions: function(layout) {
- //showHierarchy.setValue(Ext.isBoolean(layout.showHierarchy) ? layout.showHierarchy : false);
+ completedOnly.setValue(Ext.isBoolean(layout.completedOnly) ? layout.completedOnly : false);
displayDensity.setValue(Ext.isString(layout.displayDensity) ? layout.displayDensity : 'normal');
fontSize.setValue(Ext.isString(layout.fontSize) ? layout.fontSize : 'normal');
digitGroupSeparator.setValue(Ext.isString(layout.digitGroupSeparator) ? layout.digitGroupSeparator : 'space');
- //legendSet.setValue(Ext.isObject(layout.legendSet) && Ext.isString(layout.legendSet.id) ? layout.legendSet.id : 0);
},
items: [
- //{
- //bodyStyle: 'border:0 none; color:#222; font-size:12px; font-weight:bold',
- //style: 'margin-bottom:6px; margin-left:2px',
- //html: NS.i18n.organisation_units
- //},
- //organisationUnits,
- //{
- //bodyStyle: 'border:0 none; padding:5px'
- //},
+ {
+ bodyStyle: 'border:0 none; color:#222; font-size:12px; font-weight:bold',
+ style: 'margin-top:4px; margin-bottom:6px; margin-left:5px',
+ html: NS.i18n.data
+ },
+ data,
+ {
+ bodyStyle: 'border:0 none; padding:7px'
+ },
{
bodyStyle: 'border:0 none; color:#222; font-size:12px; font-weight:bold',
style: 'margin-top:2px; margin-bottom:6px; margin-left:3px',
@@ -2930,12 +2923,8 @@
}
}
- //if (!legendSet.store.isLoaded) {
- //legendSet.store.load();
- //}
-
// cmp
- //w.showHierarchy = showHierarchy;
+ w.completedOnly = completedOnly;
w.displayDensity = displayDensity;
w.fontSize = fontSize;
w.digitGroupSeparator = digitGroupSeparator;
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2015-09-04 14:37:08 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2015-09-10 23:33:22 +0000
@@ -350,6 +350,10 @@
// hideEmptyRows: boolean (false)
+ // hideNaData: boolean (false)
+
+ // completedOnly: boolean (false)
+
// collapseDataDimensions: boolean (false)
// outputType: string ('EVENT') - 'EVENT', 'TRACKED_ENTITY_INSTANCE', 'ENROLLMENT'
@@ -535,8 +539,9 @@
layout.hideEmptyRows = Ext.isBoolean(config.hideEmptyRows) ? config.hideEmptyRows : false;
layout.hideNaData = Ext.isBoolean(config.hideNaData) ? config.hideNaData : false;
layout.collapseDataDimensions = Ext.isBoolean(config.collapseDataDimensions) ? config.collapseDataDimensions : false;
-
layout.outputType = Ext.isString(config.outputType) && !Ext.isEmpty(config.outputType) ? config.outputType : 'EVENT';
+ layout.completedOnly = Ext.isBoolean(config.completedOnly) ? config.completedOnly : false;
+
layout.showHierarchy = Ext.isBoolean(config.showHierarchy) ? config.showHierarchy : false;
layout.displayDensity = Ext.isString(config.displayDensity) && !Ext.isEmpty(config.displayDensity) ? config.displayDensity : 'normal';
layout.fontSize = Ext.isString(config.fontSize) && !Ext.isEmpty(config.fontSize) ? config.fontSize : 'normal';
@@ -2493,6 +2498,11 @@
paramString += '&outputType=' + view.outputType;
}
+ // completed only
+ if (view.completedOnly) {
+ paramString += '&completedOnly=true';
+ }
+
// sorting
if (view.dataType === 'individual_cases' && view.sorting) {
if (view.sorting.id && view.sorting.direction) {
