Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LBAC-12 Added fix to show the patient location in the patient dashboard #15

Merged
merged 1 commit into from Jul 14, 2018

Conversation

@suthagar23
Copy link
Member

@suthagar23 suthagar23 commented Jul 13, 2018

Description

This PR contains the implementation to show the patient location in the patient dashboard if the logged in user is System Administrator.

Ticket

Ticket : https://issues.openmrs.org/browse/LBAC-12

@suthagar23
Copy link
Member Author

@suthagar23 suthagar23 commented Jul 13, 2018

The patient location information is added into the patient header second line fragment right side as follows,

image

@@ -0,0 +1,7 @@
<% if(patientLocation) { %>
<div class="identifiers patientLocation" style="float:right">
<em>Patient Location</em>

This comment has been minimized.

@dkayiwa

dkayiwa Jul 13, 2018
Member

Shouldn't we localise this?

<% if(patientLocation) { %>
<div class="identifiers patientLocation" style="float:right">
<em>Patient Location</em>
<span>${ patientLocation.toString() }</span>

This comment has been minimized.

@dkayiwa

dkayiwa Jul 13, 2018
Member

Why are you doing a toString()

This comment has been minimized.

@suthagar23

suthagar23 Jul 13, 2018
Author Member

just removed

@suthagar23 suthagar23 force-pushed the suthagar23:LBAC-12 branch 2 times, most recently from 9279f05 to ed662af Jul 13, 2018
@@ -1 +1,3 @@
${project.parent.artifactId}.title=Location based access control module

locationBasedAccess.patientDashboard.headerTitle=Patient Location

This comment has been minimized.

@dkayiwa

dkayiwa Jul 13, 2018
Member

The message key should tell that this is a patient location. For the module could display more than just location, on the dashboard. How about? ${project.parent.artifactId}.patientLocation

This comment has been minimized.

@suthagar23

suthagar23 Jul 13, 2018
Author Member

Yes, then how can I call in in the JSP page instead of ${ui.message("locationbasedaccess.patientLocation")}

This comment has been minimized.

@suthagar23

suthagar23 Jul 13, 2018
Author Member

Since I couldn't access this from the JSP page, I just used "locationbasedaccess.patientLocation". Please let me know if there are any changes needed.

Added locale for the title

Added locale for the title

Added locale for the title
@suthagar23 suthagar23 force-pushed the suthagar23:LBAC-12 branch from ed662af to 3a4e02f Jul 13, 2018
@dkayiwa dkayiwa merged commit 4db0ae3 into openmrs:master Jul 14, 2018
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.