dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19860
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-08-26 12:41:01 +0200
message:
  tracker-capture: in tei grid mark inactive ones with a different color
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.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-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2015-08-19 07:40:40 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2015-08-26 10:41:01 +0000
@@ -1123,4 +1123,8 @@
 
 .program-drop-down > .dropdown-menu > li > a {
     white-space: normal !important;
+}
+
+.inactive-tei{
+    color: #ff4000;
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html	2015-06-02 12:25:03 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html	2015-08-26 10:41:01 +0000
@@ -27,9 +27,10 @@
                     </tr>                        
                 </thead>
                 <tbody id="list">
-                    <tr ng-repeat="trackedEntity in trackedEntityList.rows| orderBy:d2Sort:reverse" 
+                    <tr ng-repeat="trackedEntity in trackedEntityList.rows | orderBy:d2Sort:reverse" 
                         ng-click="selectedTei.trackedEntityInstance ? assignRelationship(trackedEntity) : showDashboard(trackedEntity)"
                         ng-if="selectedTei.trackedEntityInstance ? trackedEntity.id !== selectedTei.trackedEntityInstance : true"
+                        ng-class="{true: 'inactive-tei'} [trackedEntity.inactive]"
                         title="{{selectedTei.trackedEntityInstance ? 'select' : 'go_to_dashboard'| translate}}">
                         <td ng-repeat="gridColumn in gridColumns| filter:{show: true}">
                             <span ng-switch="gridColumn.valueType">