This repository has been archived by the owner on Jan 9, 2023. It is now read-only.
Fix 1014 #1017
Merged
Fix 1014 #1017
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
OPD Reports Custom Forms
Fix/report acceptance tests
Refactor code
jkleinsc
suggested changes
Mar 23, 2017
There was a problem hiding this comment.
@adeolabadmus thanks for the PR. There are a couple of things that need to be changed below.
app/locales/en/translations.js
Outdated
| @@ -1241,7 +1241,8 @@ export default { | |||
| author: 'Author' | |||
| }, | |||
| visitType: 'Visit Type', | |||
| examiner: 'Visit Examiner', | |||
| visitExaminer: 'Visit Examiner', | |||
There was a problem hiding this comment.
We don't need two different labels here. Just use Examiner.
app/visits/reports/edit/template.hbs
Outdated
| @@ -55,7 +55,7 @@ | |||
|
|
|||
| {{#if visit.examiner }} | |||
| <div class="ps-info-group test-examiner"> | |||
| <p><b class="test-examiner-label">{{t 'reports.labels.examiner' }}:</b> | |||
| <p><b class="test-examiner-label">{{t 'reports.labels.visitExaminer' }}:</b> | |||
There was a problem hiding this comment.
use reports.labels.examiner instead of reports.labels.visitExaminer.
app/visits/reports/edit/template.hbs
Outdated
| @@ -181,13 +181,12 @@ | |||
| <span class="test-visit-discharge-date-data">{{date-format model.reportDate format="DD/MM/YYYY"}}</span> | |||
There was a problem hiding this comment.
I didn't notice this before -- this shouldn't be specifying a date format, it should use the default for the data-helper, which is the locale specific date. Please take off the format="DD/MM/YYYY"
|
@jkleinsc Changes have been effected. |
jkleinsc
approved these changes
Mar 23, 2017
|
Looks good to me @adeolabadmus. Thanks for updating! I'll merge it in. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1014
cc @HospitalRun/core-maintainers