dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #28678
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14344: tracker-capture dashboard - data entry, WIP
------------------------------------------------------------
revno: 14344
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Fri 2013-03-22 19:12:52 +0100
message:
tracker-capture dashboard - data entry, WIP
modified:
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.html
--
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-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2013-03-22 16:15:16 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2013-03-22 18:12:52 +0000
@@ -297,18 +297,21 @@
$scope.loadEvents = function(prId) {
var isEnrolled = false;
+ var selectedEnrollment = ''
angular.forEach($scope.enrollments, function(enrollment){
if(enrollment.program == prId ){
isEnrolled = true;
+ selectedEnrollment = enrollment;
}
});
- if(isEnrolled){
+ if( isEnrolled && selectedEnrollment ){
- //broadcast for data entry
+ //broadcast current selections for data entry
$rootScope.$broadcast('dataentry', {selectedEntity: $scope.selectedEntity,
- selectedProgramId: prId,
- selectedOrgUnitId: $scope.selectedOrgUnitId});
+ selectedProgramId: prId,
+ selectedOrgUnitId: $scope.selectedOrgUnitId,
+ selectedEnrollment: selectedEnrollment});
}
};
@@ -335,52 +338,88 @@
$scope.currentEvent = null;
- $scope.dhis2Events = '';
- $scope.programStages = {};
+ $scope.dhis2Events = '';
$scope.selectedEntity = args.selectedEntity;
$scope.selectedProgramId = args.selectedProgramId;
$scope.selectedOrgUnitId = args.selectedOrgUnitId;
+ $scope.selectedEnrollment = args.selectedEnrollment;
if($scope.selectedOrgUnitId && $scope.selectedProgramId && $scope.selectedEntity ){
DHIS2EventFactory.getByEntity($scope.selectedEntity.trackedEntityInstance, $scope.selectedOrgUnitId, $scope.selectedProgramId).then(function(data){
$scope.dhis2Events = data;
- if($scope.dhis2Events){
-
- angular.forEach($scope.dhis2Events, function(dhis2Event){
- dhis2Event.eventDate = moment(dhis2Event.eventDate, 'YYYY-MM-DD')._d;
- dhis2Event.eventDate = Date.parse(dhis2Event.eventDate);
- dhis2Event.eventDate = $filter('date')(dhis2Event.eventDate, 'yyyy-MM-dd');
-
- dhis2Event.name = storage.get(dhis2Event.programStage).name;
-
- OrgUnitService.open().then(function(){
- OrgUnitService.get(dhis2Event.orgUnit).then(function(ou){
- if(ou){
- dhis2Event.orgUnitName = ou.n;
- }
- });
- });
-
- if(dhis2Event.status == 'COMPLETED'){
- dhis2Event.statusColor = 'stage-completed';
- }
- else{
- var date = moment(dhis2Event.eventDate, 'yyyy-MM-dd')
- if(moment().isAfter(date)){
+ if(angular.isUndefined($scope.dhis2Events)){
+
+ $scope.dhis2Events = [];
+
+ console.log('need to create new ones: ', $scope.selectedEnrollment);
+
+ if($scope.selectedEnrollment.status == 'ACTIVE'){
+ //create events for the selected enrollment
+ var program = storage.get($scope.selectedProgramId);
+ var programStages = [];
+
+ angular.forEach(program.programStages, function(ps){
+
+ programStages.push(storage.get(ps.id));
+ var dhis2Event = {programStage: ps.id,
+ orgUnit: $scope.selectedOrgUnitId,
+ eventDate: moment(),
+ name: ps.name,
+ status: 'ACTIVE'};
+
+ var date = moment();
+
+ if( moment().add('days', ps.minDaysFromStart).isBefore(date)){
dhis2Event.statusColor = 'stage-overdue';
}
else{
dhis2Event.statusColor = 'stage-on-time';
- }
- }
- });
-
- $scope.dhis2Events = orderByFilter($scope.dhis2Events, '-eventDate');
- $scope.dhis2Events.reverse();
- }
+ }
+
+ $scope.dhis2Events.push(dhis2Event);
+ });
+
+ console.log('the stages are: ', $scope.dhis2Events);
+ }
+ }
+
+ angular.forEach($scope.dhis2Events, function(dhis2Event){
+
+ dhis2Event.name = storage.get(dhis2Event.programStage).name;
+
+ dhis2Event.eventDate = moment(dhis2Event.eventDate, 'YYYY-MM-DD')._d;
+ dhis2Event.eventDate = Date.parse(dhis2Event.eventDate);
+ dhis2Event.eventDate = $filter('date')(dhis2Event.eventDate, 'yyyy-MM-dd');
+
+
+
+ OrgUnitService.open().then(function(){
+ OrgUnitService.get(dhis2Event.orgUnit).then(function(ou){
+ if(ou){
+ dhis2Event.orgUnitName = ou.n;
+ }
+ });
+ });
+
+ if(dhis2Event.status == 'COMPLETED'){
+ dhis2Event.statusColor = 'stage-completed';
+ }
+ else{
+ var date = moment(dhis2Event.eventDate, 'yyyy-MM-dd');
+ if(moment().isAfter(date)){
+ dhis2Event.statusColor = 'stage-overdue';
+ }
+ else{
+ dhis2Event.statusColor = 'stage-on-time';
+ }
+ }
+ });
+
+ $scope.dhis2Events = orderByFilter($scope.dhis2Events, '-eventDate');
+ $scope.dhis2Events.reverse();
});
}
});
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.html 2013-03-22 16:15:16 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.html 2013-03-22 18:12:52 +0000
@@ -16,7 +16,7 @@
<span class="block orgunit-container">{{dhis2Event.orgUnitName}}</span>
<span class="arrow-container">→</span>
<span class="stage-container"
- ng-class="{'current-stage': currentEvent.event == dhis2Event.event, '{{dhis2Event.statusColor}}': true}"
+ ng-class="{'current-stage': currentEvent.programStage == dhis2Event.programStage, '{{dhis2Event.statusColor}}': true}"
ng-click="showDataEntry(dhis2Event)">
{{dhis2Event.name}}<br/>
{{dhis2Event.eventDate}}
