------------------------------------------------------------
revno: 21439
committer: Abyot Asalefew Gizaw <aby...@gmail.com>
branch nick: dhis2
timestamp: Mon 2015-12-14 13:49:33 +0100
message:
minor
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.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/components/enrollment/enrollment.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html 2015-12-14 10:17:47 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html 2015-12-14 12:49:33 +0000
@@ -58,37 +58,22 @@
</table>
<div class="vertical-spacing">
-
<button type="button"
class="btn btn-primary"
- ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
ng-click="completeEnrollment()">
{{'complete'| translate}}
</button>
<button type="button"
class="btn btn-warning"
- ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
ng-click="cancelEnrollment()">
{{'cancel'| translate}}
- </button>
-
+ </button>
<button type="button"
- title="{{'unmark_for_followup'| translate}}"
- class="btn btn-danger horizonal-spacing"
- ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
- ng-if="selectedEnrollment.followup"
- ng-click="markForFollowup()">
- <i class="fa fa-exclamation-triangle"></i>
- </button>
- <button type="button"
- title="{{'mark_for_followup'| translate}}"
- class="btn btn-default horizonal-spacing"
- ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
- ng-if="!selectedEnrollment.followup"
- ng-click="markForFollowup()">
- <i class="fa fa-exclamation-triangle"></i>
- </button>
-
+ title="{{selectedEnrollment.followup ? 'unmark_for_followup' : 'mark_for_followup' | translate}}"
+ ng-class="{true: 'btn btn-danger', false: 'btn btn-default'} [selectedEnrollment.followup]"
+ ng-click="markForFollowup()">
+ <i class="fa fa-exclamation-triangle"></i>
+ </button>
</div>
</div>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
