dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15949
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Wed 2014-07-02 23:21:15 +0200
message:
  minor
modified:
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.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-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2014-07-02 21:16:44 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2014-07-02 21:21:15 +0000
@@ -204,7 +204,7 @@
                           dueDate: dueDate,
                           name: programStage.name,
                           status: 'ACTIVE',
-                          statusColor: 'alert alert-warning'//'stage-on-time'
+                          statusColor: 'alert alert-info'//'stage-on-time'
                         };        
         
         dummyEvent.statusColor = EventUtils.getEventStatusColor(dummyEvent);

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.js	2014-07-02 16:25:28 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.js	2014-07-02 21:21:15 +0000
@@ -863,7 +863,7 @@
                               name: programStage.name,
                               reportDateDescription: programStage.reportDateDescription,
                               status: 'ACTIVE'};
-            dummyEvent.statusColor = 'alert alert-warning';//'stage-on-time';
+            dummyEvent.statusColor = 'alert alert-info';//'stage-on-time';
             if(moment(today).isAfter(dummyEvent.dueDate)){
                 dummyEvent.statusColor = 'alert alert-danger';//'stage-overdue';
             }
@@ -880,13 +880,13 @@
             }
     
             if(dhis2Event.status === 'COMPLETED'){
-                return 'alert alert-info';//'stage-completed';
+                return 'alert alert-success';//'stage-completed';
             }
             else{                
                 if(moment(eventDate).isAfter(dhis2Event.dueDate)){
                     return 'alert alert-danger';//'stage-overdue';
                 }                
-                return 'alert alert-warning';//'stage-on-time';
+                return 'alert alert-info';//'stage-on-time';
             }            
         },
         getEventDueDate: function(programStage, enrollment){