Skip to content

Commit

Permalink
fix: links to patient registry
Browse files Browse the repository at this point in the history
This commit fixes the links to the Patient Registry from both the Debtor
Groups and Patients Groups.  Both links now allow the registry to show
the period from 'all time'.

Closes #2391
Closes #2403
  • Loading branch information
jniles committed Dec 20, 2017
1 parent 1b73991 commit 294b6e1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
8 changes: 7 additions & 1 deletion client/src/modules/debtors/groups.list.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,13 @@ <h5 style="margin-top : 0px;"></span><span translate> FORM.LABELS.ACCOUNT_NUMBER
</div>

<div class="col-md-6">
<a ui-sref="patientRegistry({ filters : [{ key : 'debtor_group_uuid', value : debtorGroup.uuid, displayValue: debtorGroup.name }]})"><span class="fa fa-bars" aria-hidden="true"></span> <b>{{debtorGroup.total_debtors}}</b> <span translate> DEBTOR_GROUP.DEBTOR.SUBSCRIBED </span></a>
<a ui-sref="patientRegistry({
filters : [
{ key : 'debtor_group_uuid', value : debtorGroup.uuid, displayValue: debtorGroup.name },
{ key : 'period', value : 'allTime' }
]})">
<span class="fa fa-bars" aria-hidden="true"></span> <b>{{debtorGroup.total_debtors}}</b> <span translate> DEBTOR_GROUP.DEBTOR.SUBSCRIBED </span>
</a>
</div>
</div>
</div>
Expand Down
6 changes: 5 additions & 1 deletion client/src/modules/patients/groups/groups.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@
<a class="btn btn-xs btn-default" ng-click="PatientGroupCtrl.update(group.uuid)" id="group-{{group.uuid}}">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<a class="btn btn-xs btn-default" ui-sref="patientRegistry({ filters : [{ key : 'patient_group_uuid', value : group.uuid, displayValue: group.name }]})">
<a class="btn btn-xs btn-default" ui-sref="patientRegistry({
filters : [
{ key : 'patient_group_uuid', value : group.uuid, displayValue: group.name },
{ key : 'period', value : 'allTime' }
]})">
<span class="fa fa-list"></span> <span translate> FORM.LABELS.PATIENT_LIST </span>
</a>
</td>
Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/stock/movements/modals/search.modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ function SearchMovementsModalController(data, Notify, Instance, Flux, $translate
if (angular.isDefined(_value)) {
// default to the original value if no display value is defined
_displayValue = displayValues[key] || lastDisplayValues[key] || _value;
changes.post({ key, value : _value, displayValue : _displayValue });
changes.post({ key : key, value : _value, displayValue : _displayValue });
}
});

Expand Down

0 comments on commit 294b6e1

Please sign in to comment.