dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21220
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-11-27 12:04:21 +0100
message:
  minor
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.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-event-capture/views/eventList.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html	2015-11-25 10:41:52 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html	2015-11-27 11:04:21 +0000
@@ -124,10 +124,10 @@
                     </thead>
                     <tbody id="list">
                         <tr title="{{'click_for_action' | translate}}" ng-repeat="dhis2Event in dhis2Events | orderBy:d2Sort:reverse | gridFilter:filterText:filterTypes">                           
-                            <td d2-context-menu ng-click="showEventList(dhis2Event)" ng-repeat="eventGridColumn in eventGridColumns | filter: {show: true}" ng-if="eventGridColumn.id !== 'comment'">
+                            <td ng-repeat="eventGridColumn in eventGridColumns | filter: {show: true}" ng-if="eventGridColumn.id !== 'comment'">
                                 
                                 <!-- Visible when event is not under editing -->                                
-                                <div ng-show="currentEvent.event !== dhis2Event.event">
+                                <div d2-context-menu ng-click="showEventList(dhis2Event)" ng-show="currentEvent.event !== dhis2Event.event">
                                     <span ng-switch="eventGridColumn.valueType">
                                         <span ng-switch-when="BOOLEAN">
                                             <span ng-if="dhis2Event[eventGridColumn.id] == 'false'">{{noLabel}}</span>
@@ -143,6 +143,9 @@
                                             {{dhis2Event[eventGridColumn.id]}}
                                         </span>
                                     </span>
+                                    <span ng-if="!dhis2Event[eventGridColumn.id] || dhis2Event[eventGridColumn.id] === ''">
+                                        &nbsp;&nbsp;
+                                    </span>
                                 </div>
                                 <!-- Visible when event is not under editing -->