-
{{'overdue_events'| translate}}
-
+
@@ -39,18 +39,18 @@
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js 2014-09-09 13:26:15 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js 2014-09-11 12:35:41 +0000
@@ -2,9 +2,9 @@
function($scope,
$modal,
$location,
+ $translate,
orderByFilter,
- DateUtils,
- EventUtils,
+ DateUtils,
TEIService,
TEIGridService,
TranslationService,
@@ -17,10 +17,10 @@
$scope.today = DateUtils.format(moment());
- $scope.ouModes = [{name: 'SELECTED'}, {name: 'CHILDREN'}, {name: 'DESCENDANTS'}, {name: 'ACCESSIBLE'}];
- $scope.selectedOuMode = $scope.ouModes[0];
+ $scope.selectedOuMode = 'SELECTED';
$scope.report = {};
$scope.displayMode = {};
+ $scope.printMode = false;
//watch for selection of org unit from tree
$scope.$watch('selectedOrgUnit', function() {
@@ -72,19 +72,18 @@
});
AttributesFactory.getByProgram($scope.selectedProgram).then(function(atts){
- $scope.gridColumns = TEIGridService.generateGridColumns(atts, $scope.selectedOuMode.name);
-
- $scope.gridColumns.push({name: 'event_name', id: 'event_name', type: 'string', displayInListNoProgram: false, showFilter: false, show: true});
- $scope.filterTypes['event_name'] = 'string';
-
- $scope.gridColumns.push({name: 'due_date', id: 'due_date', type: 'date', displayInListNoProgram: false, showFilter: false, show: true});
- $scope.filterTypes['due_date'] = 'date';
- $scope.filterText['due_date']= {};
+ $scope.gridColumns = TEIGridService.generateGridColumns(atts, $scope.selectedOuMode);
+
+ $scope.gridColumns.push({name: $translate('event_name'), id: 'eventName', type: 'string', displayInListNoProgram: false, showFilter: false, show: true});
+ $scope.filterTypes['eventName'] = 'string';
+ $scope.gridColumns.push({name: $translate('due_date'), id: 'dueDate', type: 'date', displayInListNoProgram: false, showFilter: false, show: true});
+ $scope.filterTypes['dueDate'] = 'date';
+ $scope.filterText['dueDate']= {};
});
//fetch TEIs for the selected program and orgunit/mode
TEIService.search($scope.selectedOrgUnit.id,
- $scope.selectedOuMode.name,
+ $scope.selectedOuMode,
null,
'program=' + $scope.selectedProgram.id,
null,
@@ -93,9 +92,8 @@
//process tei grid
var teis = TEIGridService.format(data,true);
- $scope.teiList = [];
- DHIS2EventFactory.getByOrgUnitAndProgram($scope.selectedOrgUnit.id, $scope.selectedOuMode.name, $scope.selectedProgram.id, null, null).then(function(eventList){
- $scope.dhis2Events = [];
+ $scope.upcomingEvents = [];
+ DHIS2EventFactory.getByOrgUnitAndProgram($scope.selectedOrgUnit.id, $scope.selectedOuMode, $scope.selectedProgram.id, null, null).then(function(eventList){
angular.forEach(eventList, function(ev){
if(ev.dueDate){
ev.dueDate = DateUtils.format(ev.dueDate);
@@ -105,45 +103,21 @@
ev.dueDate >= report.startDate &&
ev.dueDate <= report.endDate){
- ev.name = $scope.programStages[ev.programStage].name;
- ev.programName = $scope.selectedProgram.name;
- ev.statusColor = EventUtils.getEventStatusColor(ev);
- ev.dueDate = DateUtils.format(ev.dueDate);
+ var upcomingEvent = {};
+ angular.copy(teis.rows[ev.trackedEntityInstance],upcomingEvent);
+ angular.extend(upcomingEvent,{eventName: $scope.programStages[ev.programStage].name, dueDate: ev.dueDate, followup: ev.followup});
- if($scope.dhis2Events[ev.trackedEntityInstance]){
- if(teis.rows[ev.trackedEntityInstance]){
- $scope.teiList.push(teis.rows[ev.trackedEntityInstance]);
- delete teis.rows[ev.trackedEntityInstance];
- }
- $scope.dhis2Events[ev.trackedEntityInstance].push(ev);
- }
- else{
- if(teis.rows[ev.trackedEntityInstance]){
- $scope.teiList.push(teis.rows[ev.trackedEntityInstance]);
- delete teis.rows[ev.trackedEntityInstance];
- }
- $scope.dhis2Events[ev.trackedEntityInstance] = [ev];
- }
- ev = EventUtils.setEventOrgUnitName(ev);
+ $scope.upcomingEvents.push(upcomingEvent);
}
}
});
-
- //incase a TEI happens to have more than one overdue, sort using duedate
- for(var tei in $scope.dhis2Events){
- $scope.dhis2Events[tei] = orderByFilter($scope.dhis2Events[tei], '-dueDate');
- $scope.dhis2Events[tei].reverse();
- }
-
- //make upcoming event name and its due date part of the grid column
- for(var i=0; i<$scope.teiList.length; i++){
- $scope.teiList[i].event_name = $scope.dhis2Events[$scope.teiList[i].id][0].name;
- $scope.teiList[i].due_date = $scope.dhis2Events[$scope.teiList[i].id][0].dueDate;
- $scope.teiList[i].followup = $scope.dhis2Events[$scope.teiList[i].id][0].followup;
- }
-
+
+ //sort upcoming events by their due dates - this is default
+ $scope.upcomingEvents = orderByFilter($scope.upcomingEvents, '-dueDate');
+ $scope.upcomingEvents.reverse();
+
$scope.reportFinished = true;
- $scope.reportStarted = false;
+ $scope.reportStarted = false;
});
});
};
@@ -177,13 +151,19 @@
});
};
- $scope.sortTEIGrid = function(gridHeader){
+ $scope.sortGrid = function(gridHeader){
if ($scope.sortHeader === gridHeader.id){
$scope.reverse = !$scope.reverse;
return;
}
$scope.sortHeader = gridHeader.id;
- $scope.reverse = false;
+ $scope.reverse = false;
+
+ $scope.upcomingEvents = orderByFilter($scope.upcomingEvents, $scope.sortHeader);
+
+ if($scope.reverse){
+ $scope.upcomingEvents.reverse();
+ }
};
$scope.searchInGrid = function(gridColumn){
@@ -214,4 +194,12 @@
$location.path('/dashboard').search({tei: tei.id,
program: $scope.selectedProgram ? $scope.selectedProgram.id: null});
};
+
+ $scope.generateReportData = function(){
+ return TEIGridService.getData($scope.upcomingEvents, $scope.gridColumns);
+ };
+
+ $scope.generateReportHeader = function(){
+ return TEIGridService.getHeader($scope.gridColumns);
+ };
});
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html 2014-09-09 12:54:28 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html 2014-09-11 12:35:41 +0000
@@ -13,9 +13,6 @@
-
-
-
-