dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #31896
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16292: event capture - printing event grid. It is also possible to show/hide comment column if event com...
------------------------------------------------------------
revno: 16292
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-08-01 14:22:15 +0200
message:
event capture - printing event grid. It is also possible to show/hide comment column if event comment exists
modified:
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/i18n/en.json
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/controllers.js
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/styles/style.css
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/customForm.html
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/defaultForm.html
dhis-2/dhis-web/dhis-web-event-capture/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-event-capture/src/main/webapp/dhis-web-event-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/i18n/en.json 2014-08-01 09:14:13 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/i18n/en.json 2014-08-01 12:22:15 +0000
@@ -5,8 +5,8 @@
"event_capture": "Event capture",
"registering_unit": "Registering unit",
"registered_events": "Registered events",
- "new_event_registration": "New event registration",
- "update_event": "Updating event",
+ "new_event_registration": "New event registration",
+ "event_details": "Event details",
"no_registered_event": "There are no registered events.",
"event_registration_error": "Error in event registration",
"help": "Help",
@@ -35,8 +35,9 @@
"are_you_sure_to_remove": "Are you sure you want to remove the selected item?",
"use_custom_form": "Custom form",
"use_default_form": "Default form",
- "print": "Print",
- "print_blank": "Print blank form",
+ "print_list": "Print list",
+ "print_form": "Print form",
+ "print_details": "Print details",
"show_hide_columns": "Show/hide columns",
"show_all": "Show all",
"hide": "Hide",
=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html 2014-08-01 09:14:13 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html 2014-08-01 12:22:15 +0000
@@ -147,10 +147,12 @@
{{displayCustomForm ? 'use_default_form' : 'use_custom_form'| translate}}
</button>
</td>
- <td ng-if="editingEventInFull || eventRegistration" style='padding-left: 10px;'>
+ <td ng-if="dhis2Events.length > 0" style='padding-left: 10px;'>
<button class="button button-std not-printable"
onclick="javascript:window.print()">
- {{'print'| translate}}
+ <span ng-if="!eventRegistration && !editingEventInFull">{{'print_list'| translate}}</span>
+ <span ng-if="eventRegistration">{{'print_form'| translate}}</span>
+ <span ng-if="editingEventInFull">{{'print_details'| translate}}</span>
</button>
</td>
</tr>
@@ -167,7 +169,7 @@
<form name="outerForm" novalidate>
<div ng-if="editingEventInFull || eventRegistration">
<h3>
- <span ng-if="editingEventInFull">{{'update_event'| translate}}</span>
+ <span ng-if="editingEventInFull">{{'event_details'| translate}}</span>
<span ng-if="eventRegistration">{{'new_event'| translate}}</span>
</h3>
=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2014-08-01 09:14:13 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2014-08-01 12:22:15 +0000
@@ -227,7 +227,11 @@
$scope.dhis2Events.splice(index,1);
i--;
}
- }
+ }
+
+ if($scope.noteExists){
+ $scope.eventGridColumns.push({name: 'Comment', id: 'comment', type: 'string', compulsory: false, showFilter: false, show: true});
+ }
}
$scope.eventFetched = true;
});
=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/styles/style.css 2014-08-01 09:14:13 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/styles/style.css 2014-08-01 12:22:15 +0000
@@ -620,9 +620,9 @@
#header, #leftBar, .not-printable {
display: none;
}
-
+
.container-default-form {
- width: 80%;
+ width: 90%;
}
::-webkit-input-placeholder { /* WebKit browsers */
@@ -637,4 +637,29 @@
:-ms-input-placeholder { /* Internet Explorer 10+ */
color: transparent;
}
+
+ .listTable
+ {
+ width: 100%;
+ border-collapse: collapse;
+ padding-top: 10px;
+ cursor: pointer;
+ }
+
+ .listTable th
+ {
+ background-color: rgba( 0, 0, 0, 0 );
+ border-bottom: 1px solid #cad5e5;
+ padding: 6px 0 3px 5px;
+ }
+
+ .listTable td
+ {
+ padding: 2px 2px 2px 5px;
+ }
+
+ .listTable > tbody > tr > td
+ {
+ padding: 11px 0 10px 5px;
+ }
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/customForm.html'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/customForm.html 2014-07-15 20:46:26 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/customForm.html 2014-08-01 12:22:15 +0000
@@ -54,7 +54,7 @@
</h4>
<textarea rows="3" ng-model="note.value" placeholder="{{'add_your_comment_here'| translate}}" style="width:50%;"></textarea>
<div ng-if="currentEvent.notes">
- <table class="listTable dhis2-table-striped-border dhis2-table-hover" style='width: 50%;'>
+ <table class="listTable dhis2-list-table-striped" style='width: 50%;'>
<thead>
<tr>
<th style="width:100%;">
@@ -64,17 +64,11 @@
</thead>
<tr ng-repeat="note in currentEvent.notes">
<td class="over-flow-hidden" style="width:100%;">
- <d2-pop-over content="note" template="note.html" details="{{'details'| translate}}">
- <div>{{note.value}}</div>
- </d2-pop-over>
- <script type="text/ng-template" id="note.html">
- <p>{{content.value}}</p>
- <hr>
- <p><strong>{{'created_by' | translate}}: </strong>{{content.storedBy}}</p>
- <p><strong>{{'date' | translate}}: </strong>{{content.storedDate}}</p>
- </script>
+ <p>{{note.value}}</p>
+ <p><strong>{{'created_by' | translate}}: </strong>{{note.storedBy}}</p>
+ <p><strong>{{'date' | translate}}: </strong>{{note.storedDate}}</p>
</td>
</tr>
- </table>
+ </table>
</div>
</div>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/defaultForm.html'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2014-07-15 20:46:26 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2014-08-01 12:22:15 +0000
@@ -56,66 +56,66 @@
<span ng-show="outerForm.submitted && outerForm.longitude.$invalid" class="required">{{'number_required'| translate}}[-180 ... 180]</span>
</td>
</tr>
- <tr ng-repeat="eventGridColumn in eventGridColumns">
+ <tr ng-repeat="eventGridColumn in eventGridColumns" ng-if="eventGridColumn.id !== 'comment'">
<td >
{{eventGridColumn.name}}
</td>
<td >
- <ng-form name="innerForm">
- <div ng-switch="eventGridColumn.type">
- <div ng-switch-when="int">
- <input type="number"
- ng-model="currentEvent[eventGridColumn.id]"
- ng-required={{eventGridColumn.compulsory}}
- name="foo"
- style="width:99%;"/>
- <span ng-show="outerForm.submitted && innerForm.foo.$invalid" class="required">{{'required'| translate}}</span>
- </div>
- <div ng-switch-when="string">
- <div class="container-fluid">
- <input type="text"
- ng-model="currentEvent[eventGridColumn.id]"
- typeahead="option for option in programStageDataElements[eventGridColumn.id].dataElement.optionSet.options | filter:$viewValue | limitTo:20"
- typeahead-open-on-focus
- ng-required={{eventGridColumn.compulsory}}
- name="foo"
- style="width:99%;"/>
- <span ng-show="outerForm.submitted && innerForm.foo.$invalid" class="required">{{'required'| translate}}</span>
- </div>
- </div>
- <div ng-switch-when="bool">
- <select ng-model="currentEvent[eventGridColumn.id]"
- ng-required={{eventGridColumn.compulsory}}
- name="foo"
- style="width:99%;"/>
- <option value="">{{'please_select'| translate}}</option>
- <option value="0">{{'no'| translate}}</option>
- <option value="1">{{'yes'| translate}}</option>
- </select>
- <span ng-show="outerForm.submitted && innerForm.foo.$invalid" class="required">{{'required'| translate}}</span>
- </div>
- <div ng-switch-when="date">
- <input type="text"
- placeholder="yyyy-mm-dd"
- ng-date
- ng-model="currentEvent[eventGridColumn.id]"
- ng-required={{eventGridColumn.compulsory}}
- name="foo"
- style="width:99%;"/>
- <span ng-show="outerForm.submitted && innerForm.foo.$invalid" class="required">{{'required'| translate}}</span>
- </div>
- <div ng-switch-when="trueOnly">
- <input type="checkbox"
- ng-model="currentEvent[eventGridColumn.id]"
- ng-required={{eventGridColumn.compulsory}}
- name="foo"/>
- <span ng-show="outerForm.submitted && innerForm.foo.$invalid" class="required">{{'required'| translate}}</span>
- </div>
- </div>
- </ng-form>
-</td>
-</tr>
-</tbody>
+ <ng-form name="innerForm">
+ <div ng-switch="eventGridColumn.type">
+ <div ng-switch-when="int">
+ <input type="number"
+ ng-model="currentEvent[eventGridColumn.id]"
+ ng-required={{eventGridColumn.compulsory}}
+ name="foo"
+ style="width:99%;"/>
+ <span ng-show="outerForm.submitted && innerForm.foo.$invalid" class="required">{{'required'| translate}}</span>
+ </div>
+ <div ng-switch-when="string">
+ <div class="container-fluid">
+ <input type="text"
+ ng-model="currentEvent[eventGridColumn.id]"
+ typeahead="option for option in programStageDataElements[eventGridColumn.id].dataElement.optionSet.options | filter:$viewValue | limitTo:20"
+ typeahead-open-on-focus
+ ng-required={{eventGridColumn.compulsory}}
+ name="foo"
+ style="width:99%;"/>
+ <span ng-show="outerForm.submitted && innerForm.foo.$invalid" class="required">{{'required'| translate}}</span>
+ </div>
+ </div>
+ <div ng-switch-when="bool">
+ <select ng-model="currentEvent[eventGridColumn.id]"
+ ng-required={{eventGridColumn.compulsory}}
+ name="foo"
+ style="width:99%;"/>
+ <option value="">{{'please_select'| translate}}</option>
+ <option value="0">{{'no'| translate}}</option>
+ <option value="1">{{'yes'| translate}}</option>
+ </select>
+ <span ng-show="outerForm.submitted && innerForm.foo.$invalid" class="required">{{'required'| translate}}</span>
+ </div>
+ <div ng-switch-when="date">
+ <input type="text"
+ placeholder="yyyy-mm-dd"
+ ng-date
+ ng-model="currentEvent[eventGridColumn.id]"
+ ng-required={{eventGridColumn.compulsory}}
+ name="foo"
+ style="width:99%;"/>
+ <span ng-show="outerForm.submitted && innerForm.foo.$invalid" class="required">{{'required'| translate}}</span>
+ </div>
+ <div ng-switch-when="trueOnly">
+ <input type="checkbox"
+ ng-model="currentEvent[eventGridColumn.id]"
+ ng-required={{eventGridColumn.compulsory}}
+ name="foo"/>
+ <span ng-show="outerForm.submitted && innerForm.foo.$invalid" class="required">{{'required'| translate}}</span>
+ </div>
+ </div>
+ </ng-form>
+ </td>
+ </tr>
+ </tbody>
</table>
<h4>
{{'comments'| translate}}
@@ -124,7 +124,7 @@
<div ng-if="currentEvent.notes">
- <table class="listTable dhis2-table-striped-border dhis2-table-hover">
+ <table class="listTable dhis2-list-table-striped">
<thead>
<tr>
<th style="width:100%;">
@@ -134,15 +134,9 @@
</thead>
<tr ng-repeat="note in currentEvent.notes">
<td class="over-flow-hidden" style="width:100%;">
- <d2-pop-over content="note" template="note.html" details="{{'details'| translate}}">
- <div>{{note.value}}</div>
- </d2-pop-over>
- <script type="text/ng-template" id="note.html">
- <p>{{content.value}}</p>
- <hr>
- <p><strong>{{'created_by' | translate}}: </strong>{{content.storedBy}}</p>
- <p><strong>{{'date' | translate}}: </strong>{{content.storedDate}}</p>
- </script>
+ <p>{{note.value}}</p>
+ <p><strong>{{'created_by' | translate}}: </strong>{{note.storedBy}}</p>
+ <p><strong>{{'date' | translate}}: </strong>{{note.storedDate}}</p>
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/eventList.html'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/eventList.html 2014-08-01 09:14:13 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/eventList.html 2014-08-01 12:22:15 +0000
@@ -14,7 +14,7 @@
<div ng-switch-default>
<h4>
{{'registered_events'| translate}}
- <button class="button button-std pull-right"
+ <button class="button button-std pull-right not-printable"
ng-show="dhis2Events.length"
ng-disabled="eventRegistration || editingEventInFull || editingEventInGrid"
ng-click="showHideColumns()">
@@ -41,64 +41,69 @@
<th ng-show="eventGridColumn.show"
ng-repeat="eventGridColumn in eventGridColumns">
-
- <!-- sort icon begins -->
- <span ng-hide="eventGridColumn.showFilter" class="bold" ng-click="sortEventGrid(eventGridColumn)">
- <i ng-show="sortHeader == eventGridColumn.id && !reverse" class="fa fa-sort-desc"></i>
- <i ng-show="sortHeader == eventGridColumn.id && reverse" class="fa fa-sort-asc"></i>
- {{eventGridColumn.name}}
- </span>
- <!-- sort icon ends -->
-
- <!-- filter icon begins -->
- <span class='pull-right'>
- <span ng-show="eventGridColumn.type !='date' && eventGridColumn.type !='int'">
- <a href ng-click="searchInGrid(eventGridColumn)" title="{{'search'| translate}}"><span ng-class="{true: 'filter-without-content', false: 'filter-with-content'} [filterText[eventGridColumn.id] == undefined || filterText[eventGridColumn.id] == '']"><i class="fa fa-search"></i></span></a>
+
+ <span ng-if="eventGridColumn.id !== 'comment'">
+
+ <!-- sort icon begins -->
+ <span ng-hide="eventGridColumn.showFilter" class="bold" ng-click="sortEventGrid(eventGridColumn)">
+ <i ng-show="sortHeader == eventGridColumn.id && !reverse" class="fa fa-sort-desc"></i>
+ <i ng-show="sortHeader == eventGridColumn.id && reverse" class="fa fa-sort-asc"></i>
+ {{eventGridColumn.name}}
</span>
- <span ng-show="eventGridColumn.type ==='date' || eventGridColumn.type ==='int'">
- <a href ng-click="searchInGrid(eventGridColumn)" title="{{'search'| translate}}"><span ng-class="{true: 'filter-without-content', false: 'filter-with-content'} [(filterText[eventGridColumn.id].start == undefined || filterText[eventGridColumn.id].start == '') && (filterText[eventGridColumn.id].end == undefined || filterText[eventGridColumn.id].end == '')]"><i class="fa fa-search"></i></span></a>
- </span>
- </span>
- <!-- filter icon ends -->
+ <!-- sort icon ends -->
- <!-- filter input field begins -->
- <span ng-show="eventGridColumn.showFilter">
- <span ng-switch="eventGridColumn.type">
- <span ng-switch-when="int">
- <input style="width: 45%;" placeholder="{{'lower_limit' | translate}}" type="number" ng-model="filterText[eventGridColumn.id].start" ng-blur="searchInGrid(eventGridColumn)">
- <input style="width: 45%;" placeholder="{{'upper_limit' | translate}}" type="number" ng-model="filterText[eventGridColumn.id].end" ng-blur="searchInGrid(eventGridColumn)">
+ <!-- filter icon begins -->
+ <span class='pull-right not-printable'>
+ <span ng-show="eventGridColumn.type !='date' && eventGridColumn.type !='int'">
+ <a href ng-click="searchInGrid(eventGridColumn)" title="{{'search'| translate}}"><span ng-class="{true: 'filter-without-content', false: 'filter-with-content'} [filterText[eventGridColumn.id] == undefined || filterText[eventGridColumn.id] == '']"><i class="fa fa-search"></i></span></a>
</span>
- <span ng-switch-when="date">
- <input style="width: 70%;" placeholder="{{'start_date' | translate}}" type="text" ng-model="filterText[eventGridColumn.id].start" data-ng-date readonly="readonly">
- <span ng-hide="filterText[eventGridColumn.id].start == undefined || filterText[eventGridColumn.id].start == ''">
- <a href ng-click='removeStartFilterText(eventGridColumn.id)'><span class='black'><i class="fa fa-trash-o"></i></span></a>
- </span>
- <input style="width: 70%;" placeholder="{{'end_date' | translate}}" type="text" ng-model="filterText[eventGridColumn.id].end" data-ng-date readonly="readonly">
- <span ng-hide="filterText[eventGridColumn.id].end == undefined || filterText[eventGridColumn.id].end == ''">
- <a href ng-click='removeEndFilterText(eventGridColumn.id)'><span class='black'><i class="fa fa-trash-o"></i></span></a>
+ <span ng-show="eventGridColumn.type ==='date' || eventGridColumn.type ==='int'">
+ <a href ng-click="searchInGrid(eventGridColumn)" title="{{'search'| translate}}"><span ng-class="{true: 'filter-without-content', false: 'filter-with-content'} [(filterText[eventGridColumn.id].start == undefined || filterText[eventGridColumn.id].start == '') && (filterText[eventGridColumn.id].end == undefined || filterText[eventGridColumn.id].end == '')]"><i class="fa fa-search"></i></span></a>
+ </span>
+ </span>
+ <!-- filter icon ends -->
+
+ <!-- filter input field begins -->
+ <span ng-show="eventGridColumn.showFilter">
+ <span ng-switch="eventGridColumn.type">
+ <span ng-switch-when="int">
+ <input style="width: 45%;" placeholder="{{'lower_limit' | translate}}" type="number" ng-model="filterText[eventGridColumn.id].start" ng-blur="searchInGrid(eventGridColumn)">
+ <input style="width: 45%;" placeholder="{{'upper_limit' | translate}}" type="number" ng-model="filterText[eventGridColumn.id].end" ng-blur="searchInGrid(eventGridColumn)">
+ </span>
+ <span ng-switch-when="date">
+ <input style="width: 70%;" placeholder="{{'start_date' | translate}}" type="text" ng-model="filterText[eventGridColumn.id].start" data-ng-date readonly="readonly">
+ <span ng-hide="filterText[eventGridColumn.id].start == undefined || filterText[eventGridColumn.id].start == ''">
+ <a href ng-click='removeStartFilterText(eventGridColumn.id)'><span class='black'><i class="fa fa-trash-o"></i></span></a>
+ </span>
+ <input style="width: 70%;" placeholder="{{'end_date' | translate}}" type="text" ng-model="filterText[eventGridColumn.id].end" data-ng-date readonly="readonly">
+ <span ng-hide="filterText[eventGridColumn.id].end == undefined || filterText[eventGridColumn.id].end == ''">
+ <a href ng-click='removeEndFilterText(eventGridColumn.id)'><span class='black'><i class="fa fa-trash-o"></i></span></a>
+ </span>
+ </span>
+ <span ng-switch-default>
+ <input type="text" style="width: 90%;" ng-model="filterText[eventGridColumn.id]" ng-blur="searchInGrid(eventGridColumn)">
</span>
- </span>
- <span ng-switch-default>
- <input type="text" style="width: 90%;" ng-model="filterText[eventGridColumn.id]" ng-blur="searchInGrid(eventGridColumn)">
- </span>
- </span>
- </span>
- <!-- filter input field ends -->
-
+ </span>
+ </span>
+ <!-- filter input field ends -->
+ </span>
+ <span ng-if="eventGridColumn.id === 'comment'">
+ {{'comment' | translate}}
+ </span>
</th>
- <th ng-if='noteExists'>
+ <!--<th ng-if='noteExists'>
{{'comment' | translate}}
- </th>
+ </th>-->
</tr>
</thead>
<tbody id="list">
<tr ng-repeat="dhis2Event in dhis2Events | orderBy:sortHeader:reverse | gridFilter:filterText:filterTypes">
-
+
<!-- Visible when event is not under editing -->
<td dhis-context-menu
- selected-item={{dhis2Event}}
+ selected-item={{dhis2Event}}
ng-click="showEventList()"
- ng-hide="(currentEvent.event == dhis2Event.event) || !eventGridColumn.show"
+ ng-hide="(currentEvent.event == dhis2Event.event) || !eventGridColumn.show || eventGridColumn.id === 'comment'"
ng-repeat="eventGridColumn in eventGridColumns">
{{dhis2Event[eventGridColumn.id]}}
</td>
@@ -106,7 +111,7 @@
<!-- Visible when event is under editing - in grid -->
<td style="cursor:default;"
ng-dblclick="showEventList()"
- ng-if="(currentEvent.event == dhis2Event.event) && eventGridColumn.show"
+ ng-if="(currentEvent.event == dhis2Event.event) && eventGridColumn.show && eventGridColumn.id !== 'comment'"
ng-repeat="eventGridColumn in eventGridColumns">
<ng-form name="innerFormGrid">
<div ng-switch="eventGridColumn.type">
@@ -180,9 +185,9 @@
<span ng-show="outerForm.submitted && innerFormGrid.foo.$invalid"><em title="{{'required'| translate}}" class="required">*</em></span>
</div>
</div>
- </ng-form>
+ </ng-form>
</td>
- <td ng-if='noteExists'>
+ <td ng-repeat="eventGridColumn in eventGridColumns" ng-if="eventGridColumn.id === 'comment' && eventGridColumn.show">
<a href ng-click="showNotes(dhis2Event)" title="{{'show_comments'| translate}}" ng-if="dhis2Event.notes"><i class="fa fa-info-circle"></i></a>
</td>
</tr>
