Skip to content

Commit

Permalink
Merge branch 'master' into bump-release
Browse files Browse the repository at this point in the history
  • Loading branch information
@ngash
ngash committed Nov 4, 2015
2 parents e34d431 + 92d1976 commit 9d920dd
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 25 deletions.
10 changes: 5 additions & 5 deletions src/app/facility_mgmt/tpls/facilities_pending.view.tpl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ <h3><b>{{facility.code}}</b> | {{facility.official_name | uppercase}}</h3>
</span>
<span class="pull-left col-md-6 col-xs-12">
<label class="text-black">Open on public holidays </label>
<span ng-show="oneFacility.open_public_holidays" class="text-success">
<span ng-show="facility.open_public_holidays" class="text-success">
<i class="fa fa-check-circle-o fa-1x fs-15"></i>
</span>
<span ng-hide="oneFacility.open_public_holidays" class="text-danger">
<span ng-hide="facility.open_public_holidays" class="text-danger">
<i class="fa fa-times-circle-o fa-1x fs-15"></i>
</span>
</span>
Expand All @@ -86,10 +86,10 @@ <h3><b>{{facility.code}}</b> | {{facility.official_name | uppercase}}</h3>
</span>
<span class="pull-left col-md-6 col-xs-12">
<label class="text-black">Open 24 hours </label>
<span ng-show="oneFacility.open_whole_day" class="text-success">
<span ng-show="facility.open_whole_day" class="text-success">
<i class="fa fa-check-circle-o fa-1x fs-15"></i>
</span>
<span ng-hide="oneFacility.open_whole_day" class="text-danger">
<span ng-hide="facility.open_whole_day" class="text-danger">
<i class="fa fa-times-circle-o fa-1x fs-15"></i>
</span>
</span>
Expand Down Expand Up @@ -154,7 +154,7 @@ <h4 class="fw-600">Geolocation</h4>
<!-- Facility officer in charge -->
<div class="col-xs-12" ng-if="facility.officer_in_charge"><hr class="line-divider"></div>
<div class="col-xs-12 margin-t-5" ng-if="facility.officer_in_charge">
<h4 class="fw-600">Officer In-Charge</h4>
<h4 class="fw-600">Facility Officer In-Charge</h4>
</div>
<span class="pull-left col-md-6 col-xs-12" ng-if="facility.officer_in_charge.name">
<label class="text-black">Name:</label>
Expand Down
8 changes: 4 additions & 4 deletions src/app/facility_mgmt/tpls/facility_approve.basic.tpl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
</span>
<span class="pull-left col-md-6 col-xs-12">
<label class="text-black">Open on public holidays </label>
<span ng-show="oneFacility.open_public_holidays" class="text-success">
<span ng-show="facility.open_public_holidays" class="text-success">
<i class="fa fa-check-circle-o fa-1x fs-15"></i>
</span>
<span ng-hide="oneFacility.open_public_holidays" class="text-danger">
<span ng-hide="facility.open_public_holidays" class="text-danger">
<i class="fa fa-times-circle-o fa-1x fs-15"></i>
</span>
</span>
Expand All @@ -30,10 +30,10 @@
</span>
<span class="pull-left col-md-6 col-xs-12">
<label class="text-black">Open 24 hours </label>
<span ng-show="oneFacility.open_whole_day" class="text-success">
<span ng-show="facility.open_whole_day" class="text-success">
<i class="fa fa-check-circle-o fa-1x fs-15"></i>
</span>
<span ng-hide="oneFacility.open_whole_day" class="text-danger">
<span ng-hide="facility.open_whole_day" class="text-danger">
<i class="fa fa-times-circle-o fa-1x fs-15"></i>
</span>
</span>
Expand Down
14 changes: 7 additions & 7 deletions src/app/facility_mgmt/tpls/facility_print.tpl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ <h3><b>{{facility.code}}</b> | {{facility.official_name | uppercase}}</h3>
<div class="col-xs-12"><h4 class="fw-600">Basic Details</h4></div>
<span class="pull-left col-md-6 col-xs-12">
<label class="text-black">Open weekends </label>
<span ng-show="facility.open_weekends" class="text-success">
<span ng-if="facility.open_weekends" class="text-success">
<i class="fa fa-check-circle-o fa-1x fs-15"></i>
</span>
<span ng-hide="facility.open_weekends" class="text-danger">
<span ng-if="!facility.open_weekends" class="text-danger">
<i class="fa fa-times-circle-o fa-1x fs-15"></i>
</span>
</span>
Expand All @@ -46,10 +46,10 @@ <h3><b>{{facility.code}}</b> | {{facility.official_name | uppercase}}</h3>
</span>
<span class="pull-left col-md-6 col-xs-12">
<label class="text-black">Open on public holidays </label>
<span ng-show="oneFacility.open_public_holidays" class="text-success">
<span ng-if="facility.open_public_holidays" class="text-success">
<i class="fa fa-check-circle-o fa-1x fs-15"></i>
</span>
<span ng-hide="oneFacility.open_public_holidays" class="text-danger">
<span ng-if="!facility.open_public_holidays" class="text-danger">
<i class="fa fa-times-circle-o fa-1x fs-15"></i>
</span>
</span>
Expand All @@ -59,10 +59,10 @@ <h3><b>{{facility.code}}</b> | {{facility.official_name | uppercase}}</h3>
</span>
<span class="pull-left col-md-6 col-xs-12">
<label class="text-black">Open 24 hours </label>
<span ng-show="oneFacility.open_whole_day" class="text-success">
<span ng-if="facility.open_whole_day" class="text-success">
<i class="fa fa-check-circle-o fa-1x fs-15"></i>
</span>
<span ng-hide="oneFacility.open_whole_day" class="text-danger">
<span ng-if="!facility.open_whole_day" class="text-danger">
<i class="fa fa-times-circle-o fa-1x fs-15"></i>
</span>
</span>
Expand Down Expand Up @@ -130,7 +130,7 @@ <h4 class="fw-600">Geolocation</h4>
<!-- Facility officer in charge -->
<div class="col-xs-12" ng-if="facility.officer_in_charge"><hr class="line-divider"></div>
<div class="col-xs-12 margin-t-5" ng-if="facility.officer_in_charge">
<h4 class="fw-600">Officer In-Charge</h4>
<h4 class="fw-600">Facility Officer In-Charge</h4>
</div>
<span class="pull-left col-md-6 col-xs-12" ng-if="facility.officer_in_charge.name">
<label class="text-black">Name:</label>
Expand Down
4 changes: 2 additions & 2 deletions src/app/facility_mgmt/tpls/facility_services.edit.tpl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ <h4>Services</h4>
<td data-title="Name:" class="col-xs-10">
{{service.name}}
</td>
<td data-title="Abbreviation:" class="text-center">
<td data-title="Abbreviation:" class="text-center col-xs-2">
<span ng-if="service.has_options">
{{service.option | optionName:service.serv_options}}
</span>
<span ng-if="!service.has_options">
N/A
Yes
</span>
&nbsp;&nbsp;&nbsp;
</td>
Expand Down
2 changes: 1 addition & 1 deletion src/app/facility_mgmt/tpls/facility_services.list.tpl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</td>
<td data-title="Abbreviation:" class="col-md-2 col-xs-3 text-center">{{service.option_display_value}}
<span ng-if="service.option === null">
N/A
Yes
</span>
&nbsp;&nbsp;&nbsp;
</td>
Expand Down
13 changes: 7 additions & 6 deletions src/app/facility_mgmt/tpls/facility_view.tpl.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
<div class="content-header">
<div class="action-container content-header-extra margin-t-3">
<a requires-permission='facilities.change_facility' tooltip="Edit Facility" tooltip-placement="bottom" class="btn btn-primary" ui-sref="facilities.facility_edit({facility_id: fac_id})" ui-sref-opts="{reload:true}"> Edit </a>
<a class="btn btn-primary"
popover-toggle popover-trigger="open" popover-placement="bottom"
popover-template="'facility_mgmt/tpls/facility_printing_buttons.tpl.html'" >
Print
</a>
<a requires-permission="facilities.view_facility,facilities.add_facilityregulationstatus" ui-sref="facilities_regulation.regulate.basic({facility_id: fac_id})" class="btn btn-success" tooltip="Regulate Facility" ng-if="!facility.closed||!facility.rejected">
Regulate
</a>
Expand All @@ -17,12 +23,7 @@
<a ng-if="!facility.closed" class="btn btn-danger margin-l-3"
requires-permission="facilities.view_closed_facilities"
ui-sref=".close({facility_id: facility.id})">Close</a>
<a class="btn btn-primary"
popover-toggle popover-trigger="open" popover-placement="bottom"
popover-template="'facility_mgmt/tpls/facility_printing_buttons.tpl.html'" >
Print
</a>
<a requires-permission='facilities.change_facility' tooltip="Edit Facility" tooltip-placement="bottom" class="btn btn-primary" ui-sref="facilities.facility_edit({facility_id: fac_id})" ui-sref-opts="{reload:true}"> Edit </a>

</div>
<h2 class="content-title">
<span class="main-title"><i class="fa fa-eye"></i> View Facility</span>
Expand Down

0 comments on commit 9d920dd

Please sign in to comment.