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

Translation for medication and procedure model #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions app/locales/en/translations.js
Original file line number Diff line number Diff line change
@@ -1313,6 +1313,33 @@ export default {
visit: 'Visit'
}
},
medication: {
labels: {
patient: 'Patient',
visit: 'Visit',
medicationName: 'Medication',
requestedBy: 'Prescriber',
prescription: 'Prescription',
prescriptionDate: 'Prescription Date',
refills: 'Refills',
quantity: 'Quantity',
status: 'Status'
}
},
procedure: {
labels: {
cptCode: 'CPT Code',
location: 'Procedure Location',
procedureDate: 'Procedure Date',
timeStarted: 'Time Started',
timeEnded: 'Time Ended',
physician: 'Physician',
assistant: 'Assistant',
anesthesiologist: 'Anesthesiologist',
anesthesiaType: 'Anesthesia Type',
notes: 'Notes'
}
},
lab: {
labels: {
labDate: 'Date Completed',
22 changes: 11 additions & 11 deletions app/medication/edit/template.hbs
Original file line number Diff line number Diff line change
@@ -5,53 +5,53 @@
{{/unless}}
<div class="row">
{{#if model.selectPatient}}
{{patient-typeahead property="patientTypeAhead" label=(t 'labels.patient') content=patientList selection=selectedPatient class="col-xs-6 required test-patient-input"}}
{{patient-typeahead property="patientTypeAhead" label=(t 'models.medication.labels.patient') content=patientList selection=selectedPatient class="col-xs-6 required test-patient-input"}}
{{/if}}
{{#if model.isNew}}
{{em-select class="col-xs-4 required test-add-visit" label=(t 'labels.visit')
{{em-select class="col-xs-4 required test-add-visit" label=(t 'models.medication.labels.visit')
property="visit" content=patientVisitsForSelect
optionValuePath="selectObject" optionLabelPath="selectObject.visitDescription"
prompt=(t 'labels.addNewOutpatientVisit')
selected=model.visit
}}
{{else}}
<div class="form-group col-xs-3">
<label>{{t 'labels.visit'}}</label>
<label>{{t 'models.medication.labels.visit'}}</label>
<p class="form-control-static">{{model.visit.visitDescription}}</p>
</div>
{{/if}}
</div>
{{#if isFulfilledOrRequested}}
<div class="form-group">
<label class="control-label">{{t 'labels.medication'}}</label>
<label class="control-label">{{t 'models.medication.labels.medicationName'}}</label>
<p class="form-control-static">{{model.medicationName}}</p>
</div>
{{else}}
{{inventory-typeahead property="inventoryItemTypeAhead" label=(t 'labels.medication') content=medicationList selection=selectedInventoryItem class="required test-medication-input"}}
{{/if}}
{{#if isFulfilledOrRequested}}
<div class="form-group">
<label class="control-label">{{t 'labels.prescriber'}}</label>
<label class="control-label">{{t 'models.medication.labels.requestedBy'}}</label>
<p class="form-control-static">{{model.requestedBy}}</p>
</div>
{{/if}}
{{#if isFulfilled}}
{{static-text label=(t 'labels.prescription') value=model.prescription }}
{{static-text label=(t 'models.medication.labels.prescription') value=model.prescription }}
<div class="row">
{{#static-text label=(t 'labels.prescriptionDate') class="col-xs-4"}}
{{#static-text label=(t 'models.medication.labels.prescriptionDate') class="col-xs-4"}}
{{date-format model.prescriptionDate}}
{{/static-text}}
{{static-text label=quantityLabel class="col-xs-3" value=model.quantity }}
{{static-text label=(t 'medication.labels.refills') class="col-xs-3" value=model.refills }}
{{static-text label=(t 'models.medication.labels.refills') class="col-xs-3" value=model.refills }}
</div>
{{else}}
{{em-text property="prescription" label=(t 'labels.prescription')rows="3" class=prescriptionClass }}
{{em-text property="prescription" label=(t 'models.medication.labels.prescription') rows="3" class=prescriptionClass }}
<div class="row">
{{date-picker property="prescriptionDate" label=(t 'labels.prescriptionDate') class="col-sm-4"}}
{{date-picker property="prescriptionDate" label=(t 'models.medication.labels.prescriptionDate') class="col-sm-4"}}
</div>
<div class="row">
{{number-input property="quantity" label=quantityLabel class=quantityClass }}
{{em-input property="refills" label=(t 'medication.labels.refills') class="col-xs-3"}}
{{em-input property="refills" label=(t 'models.medication.labels.refills') class="col-xs-3"}}
</div>
{{#unless model.hideFulfillRequest}}
{{#if model.isNew}}
12 changes: 6 additions & 6 deletions app/medication/index/template.hbs
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@
{{#if model}}
<table class="table">
<tr class="table-header">
<th>{{t 'labels.date'}}</th>
<th>{{t 'labels.patient'}}</th>
<th>{{t 'labels.prescriber'}}</th>
<th>{{t 'labels.medication'}}</th>
<th>{{t 'labels.quantity'}}</th>
<th>{{t 'labels.status'}}</th>
<th>{{t 'models.medication.labels.prescriptionDate'}}</th>
<th>{{t 'models.medication.labels.patient'}}</th>
<th>{{t 'models.medication.labels.requestedBy'}}</th>
<th>{{t 'models.medication.labels.medicationName'}}</th>
<th>{{t 'models.medication.labels.quantity'}}</th>
<th>{{t 'models.medication.labels.status'}}</th>
{{#if showActions}}
<th>{{t 'labels.actions'}}</th>
{{/if}}
2 changes: 1 addition & 1 deletion app/medication/return/template.hbs
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
{{/if}}
<div class="row">
{{patient-typeahead property="patientTypeAhead" label=(t 'labels.patient') content=patientList selection=selectedPatient class="col-xs-6"}}
{{em-select class="col-xs-6" label=(t 'labels.visit')
{{em-select class="col-xs-6" label=(t 'models.medication.labels.visit')
property="visit" content=patientVisitsForSelect
optionValuePath="selectObject" optionLabelPath="selectObject.visitDescription"
selected=model.visit
22 changes: 11 additions & 11 deletions app/procedures/edit/template.hbs
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
{{#edit-panel editPanelProps=editPanelProps}}
{{#em-form model=model submitButton=false }}
{{select-or-typeahead className="required procedure-description" property="description"
label="Procedure" list=procedureList
label=(t 'labels.procedures') list=procedureList
selection=model.description hint=false
}}
<div class="row">
{{select-or-typeahead className="col-xs-6" property="cptCode"
label="CPT Code" list=cptCodeList
label=(t 'models.procedure.labels.cptCode') list=cptCodeList
selection=model.cptCode
}}
</div>
<div class="row">
{{select-or-typeahead className="col-sm-3" property="location"
label="Procedure Location" list=procedureLocations
label=(t 'models.procedure.labels.location') list=procedureLocations
selection=model.location
}}
{{date-picker property="procedureDate" label="Procedure Date" class="col-sm-3 required"}}
{{em-input property="timeStarted" label="Time Started" class="col-sm-3"}}
{{em-input property="timeEnded" label="Time Ended" class="col-sm-3"}}
{{date-picker property="procedureDate" label=(t 'models.procedure.labels.procedureDate') class="col-sm-3 required"}}
{{em-input property="timeStarted" label=(t 'models.procedure.labels.timeStarted') class="col-sm-3"}}
{{em-input property="timeEnded" label=(t 'models.procedure.labels.timeEnded') class="col-sm-3"}}
</div>
<div class="row">
{{select-or-typeahead className="col-sm-4 required procedure-physician" property="physician"
label="Physician" list=physicianList
label=(t 'models.procedure.labels.physician') list=physicianList
selection=model.physician
}}
{{select-or-typeahead className="col-sm-4" property="assistant"
label="Assistant" list=physicianList
label=(t 'models.procedure.labels.assistant') list=physicianList
selection=model.assistant prompt=" "
}}
{{select-or-typeahead className="col-sm-4" property="anesthesiologist"
label="Anesthesiologist" list=anesthesiologistList
label=(t 'models.procedure.labels.anesthesiologist') list=anesthesiologistList
selection=model.anesthesiologist
}}
</div>
<div class="row">
{{select-or-typeahead className="col-sm-4" property="anesthesiaType"
label="Anesthesia Type" list=anesthesiaTypes
label=(t 'models.procedure.labels.anesthesiaType') list=anesthesiaTypes
selection=model.anesthesiaTypes
}}
</div>
{{em-text label="Notes" property="notes" rows=3 class="procedure-notes"}}
{{em-text label=(t 'models.procedure.labels.notes') property="notes" rows=3 class="procedure-notes"}}
{{partial 'item-charges'}}
<div class="panel detail-section medication-charges">
<div class="panel-heading">