Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Commit

Permalink
refactor patients model translation
Browse files Browse the repository at this point in the history
  • Loading branch information
@billybonks
billybonks committed Feb 21, 2017
1 parent cfbbb35 commit 2bf0f09
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 33 deletions.
8 changes: 4 additions & 4 deletions app/appointments/calendar/template.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
{{#em-form model=model submitButton=false}}
<div class="row">
{{em-select class="col-sm-3 form-input-group"
label=(t "labels.status")
label=(t "models.appointment.labels.status")
property="selectedStatus"
content=appointmentStatusesWithEmpty
}}
{{em-select class="col-sm-3 form-input-group"
label=(t "labels.type")
label=(t "models.appointment.labels.type")
property="selectedAppointmentType"
content=visitTypesWithEmpty
}}
{{em-select class="col-sm-3 form-input-group"
label=(t 'labels.with')
label=(t 'models.appointment.labels.provider')
property="selectedProvider"
content=physicianList
}}
{{em-select class="col-sm-3 form-input-group"
label=(t 'labels.location')
label=(t 'models.appointment.labels.location')
property="selectedLocation"
content=locationList
}}
Expand Down
22 changes: 11 additions & 11 deletions app/appointments/edit/template.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
{{#edit-panel editPanelProps=editPanelProps}}
{{#em-form model=model submitButton=false }}
{{#if model.selectPatient}}
{{patient-typeahead property="patientTypeAhead" label=(t 'labels.patient') content=patientList selection=selectedPatient class="required test-patient-input"}}
{{patient-typeahead property="patientTypeAhead" label=(t 'models.appointment.labels.patient') content=patientList selection=selectedPatient class="required test-patient-input"}}
{{else}}
{{patient-summary patient=model.patient returnTo='appointments.edit' returnToContext=model.id disablePatientLink=model.isNew }}
{{/if}}
<div class="row">
{{#if isAdmissionAppointment}}
{{date-picker property="startDate" label=(t 'labels.startDate') showTime=showTime class="col-sm-4 required test-appointment-start"}}
{{date-picker property="endDate" label=(t 'labels.endDate') showTime=showTime class="col-sm-4 required test-appointment-end"}}
{{date-picker property="startDate" label=(t 'models.appointment.labels.startDate') showTime=showTime class="col-sm-4 required test-appointment-start"}}
{{date-picker property="endDate" label=(t 'models.appointment.labels.endDate') showTime=showTime class="col-sm-4 required test-appointment-end"}}
{{else}}
{{date-time-picker datePickerClass="required test-appointment-date" label=(t 'labels.date') model=model}}
{{/if}}
{{em-checkbox label=(t 'labels.allDay') property="allDay" class="col-sm-2 appointment-all-day"}}
{{em-checkbox label=(t 'models.appointment.labels.allDay') property="allDay" class="col-sm-2 appointment-all-day"}}
</div>

{{#if (eq model.appointmentType 'Surgery')}}
<div class="row">
{{select-or-typeahead className="col-sm-6 test-appointment-with" property="provider"
label=(t 'labels.with') list=physicianList
label=(t 'models.appointment.labels.provider') list=physicianList
selection=model.provider
}}
{{select-or-typeahead className="col-sm-6 test-appointment-location" property="location"
label=(t 'labels.location') list=surgeryLocationList
label=(t 'models.appointment.labels.location') list=surgeryLocationList
selection=model.location
}}
</div>
{{else}}
<div class="row">
<div class="form-input-group col-sm-6 required test-appointment-type">
<label class="control-label" for="startTime">{{t 'labels.type'}}</label>
<label class="control-label" for="startTime">{{t 'models.appointment.labels.type'}}</label>
{{select-list
content=visitTypes
optionLabelPath='value'
Expand All @@ -41,20 +41,20 @@
}}
</div>
{{select-or-typeahead className="col-sm-6 test-appointment-with" property="provider"
label=(t 'labels.with') list=physicianList
label=(t 'models.appointment.labels.provider') list=physicianList
selection=model.provider
}}
</div>
<div class="row">
{{select-or-typeahead className="col-sm-6 test-appointment-location" property="location"
label=(t 'labels.location') list=visitLocationList
label=(t 'models.appointment.labels.location') list=visitLocationList
selection=model.location
}}
{{em-select class="form-input-group col-sm-3 test-appointment-status" property="status"
label=(t 'labels.status') content=appointmentStatuses
label=(t 'models.appointment.labels.status') content=appointmentStatuses
}}
</div>
{{/if}}
{{em-text label=(t 'labels.notes') property="notes" rows=3 }}
{{em-text label=(t 'models.appointment.labels.notes') property="notes" rows=3 }}
{{/em-form}}
{{/edit-panel}}
12 changes: 6 additions & 6 deletions app/appointments/index/template.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{{#item-listing paginationProps=paginationProps }}
<table class="table">
<tr class="table-header">
<th>{{t 'labels.date'}}</th>
<th>{{t 'labels.name'}}</th>
<th>{{t 'labels.type'}}</th>
<th>{{t 'labels.location'}}</th>
<th>{{t 'labels.provider'}}</th>
<th>{{t 'labels.status'}}</th>
<th>{{t 'models.appointment.labels.appointmentDate'}}</th>
<th>{{t 'models.patient.labels.name'}}</th>
<th>{{t 'models.appointment.labels.type'}}</th>
<th>{{t 'models.appointment.labels.location'}}</th>
<th>{{t 'models.appointment.labels.provider'}}</th>
<th>{{t 'models.appointment.labels.status'}}</th>
<th>{{t 'labels.actions'}}</th>
</tr>
{{#each model as |appointment|}}
Expand Down
18 changes: 9 additions & 9 deletions app/appointments/search/template.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<div class="row">
{{date-picker property="selectedStartingDate" label=(t "appointments.labels.selectedStartingDate")class="col-sm-3"}}
{{em-select class="col-sm-3 form-input-group" property="selectedStatus"
label=(t "labels.status") content=appointmentStatusesWithEmpty
label=(t "models.appointment.labels.status") content=appointmentStatusesWithEmpty
}}
{{em-select class="col-sm-3 form-input-group" label=(t "labels.type")
{{em-select class="col-sm-3 form-input-group" label=(t "models.appointment.labels.type")
property="selectedAppointmentType" content=visitTypesWithEmpty
}}
{{em-select class="col-sm-3 form-input-group" property="selectedProvider"
label=(t 'labels.with') content=physicianList
label=(t 'models.appointment.labels.provider') content=physicianList
}}
</div>
{{/em-form}}
Expand All @@ -22,12 +22,12 @@
</div>
<table class="table">
<tr class="table-header">
{{#sortable-column sortBy='date' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.date'}}{{/sortable-column}}
<th>{{t 'labels.name'}}</th>
{{#sortable-column sortBy='appointmentType' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.type'}}{{/sortable-column}}
{{#sortable-column sortBy='location' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.location'}}{{/sortable-column}}
{{#sortable-column sortBy='provider' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.with'}}{{/sortable-column}}
{{#sortable-column sortBy='status' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.status'}}{{/sortable-column}}
{{#sortable-column sortBy='date' sortDesc=sortDesc sortKey=sortKey }}{{t 'models.appointment.labels.appointmentDate'}}{{/sortable-column}}
<th>{{t 'models.patient.labels.name'}}</th>
{{#sortable-column sortBy='appointmentType' sortDesc=sortDesc sortKey=sortKey }}{{t 'models.appointment.labels.type'}}{{/sortable-column}}
{{#sortable-column sortBy='location' sortDesc=sortDesc sortKey=sortKey }}{{t 'models.appointment.labels.location'}}{{/sortable-column}}
{{#sortable-column sortBy='provider' sortDesc=sortDesc sortKey=sortKey }}{{t 'models.appointment.labels.provider'}}{{/sortable-column}}
{{#sortable-column sortBy='status' sortDesc=sortDesc sortKey=sortKey }}{{t 'models.appointment.labels.status'}}{{/sortable-column}}
<th>{{t 'labels.actions'}}</th>
</tr>
{{#each model as |appointment|}}
Expand Down
6 changes: 3 additions & 3 deletions app/appointments/theater/template.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
{{#em-form model=model submitButton=false}}
<div class="row">
{{em-select class="col-sm-3 form-input-group"
label=(t "labels.status")
label=(t "models.appointment.labels.status")
property="selectedStatus"
content=appointmentStatusesWithEmpty
}}
{{em-select class="col-sm-3 form-input-group"
label=(t 'labels.with')
label=(t 'models.appointment.labels.provider')
property="selectedProvider"
content=physicianList
}}
{{em-select class="col-sm-3 form-input-group"
label=(t 'labels.location')
label=(t 'models.appointment.labels.location')
property="selectedLocation"
content=locationList
}}
Expand Down
21 changes: 21 additions & 0 deletions app/locales/en/translations.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1261,5 +1261,26 @@ export default {
titles: {
sessionExpired: 'Session Expired'
}
},
models: {
appointment: {
labels: {
status: 'First Name',
appointmentType: 'Type',
provider: 'With',
location: 'Location',
patient: 'Patient',
startDate: 'Start Date',
endDate: 'End Date',
allDay: 'All Day',
type: 'Type',
appointmentDate: 'Date'
}
},
patient: {
labels: {
name: 'Name'
}
}
}
};

0 comments on commit 2bf0f09

Please sign in to comment.