diff --git a/app/appointments/calendar/template.hbs b/app/appointments/calendar/template.hbs index 081002a286..57e7182e3c 100644 --- a/app/appointments/calendar/template.hbs +++ b/app/appointments/calendar/template.hbs @@ -3,22 +3,22 @@ {{#em-form model=model submitButton=false}}
{{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 }} diff --git a/app/appointments/edit/template.hbs b/app/appointments/edit/template.hbs index 8f62114fac..fdb84b30ce 100644 --- a/app/appointments/edit/template.hbs +++ b/app/appointments/edit/template.hbs @@ -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.patient.names.singular') 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}}
{{#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"}}
{{#if (eq model.appointmentType 'Surgery')}}
{{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 }}
{{else}}
- + {{select-list content=visitTypes optionLabelPath='value' @@ -41,20 +41,20 @@ }}
{{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=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 }}
{{/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}} diff --git a/app/appointments/index/template.hbs b/app/appointments/index/template.hbs index 092239d10a..9a5acf21e4 100644 --- a/app/appointments/index/template.hbs +++ b/app/appointments/index/template.hbs @@ -1,12 +1,12 @@ {{#item-listing paginationProps=paginationProps }} - - - - - - + + + + + + {{#each model as |appointment|}} diff --git a/app/appointments/search/template.hbs b/app/appointments/search/template.hbs index aaa2ca7909..aab4aa0090 100644 --- a/app/appointments/search/template.hbs +++ b/app/appointments/search/template.hbs @@ -5,13 +5,13 @@
{{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 }}
{{/em-form}} @@ -22,12 +22,12 @@
{{t 'labels.date'}}{{t 'labels.name'}}{{t 'labels.type'}}{{t 'labels.location'}}{{t 'labels.provider'}}{{t 'labels.status'}}{{t 'models.appointment.labels.appointmentDate'}}{{t 'models.patient.labels.name'}}{{t 'models.appointment.labels.type'}}{{t 'models.appointment.labels.location'}}{{t 'models.appointment.labels.provider'}}{{t 'models.appointment.labels.status'}} {{t 'labels.actions'}}
- {{#sortable-column sortBy='date' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.date'}}{{/sortable-column}} - - {{#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}} + + {{#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}} {{#each model as |appointment|}} diff --git a/app/appointments/theater/template.hbs b/app/appointments/theater/template.hbs index 15309f8482..bf8d755263 100644 --- a/app/appointments/theater/template.hbs +++ b/app/appointments/theater/template.hbs @@ -3,17 +3,17 @@ {{#em-form model=model submitButton=false}}
{{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 }} diff --git a/app/locales/en/translations.js b/app/locales/en/translations.js index 10cb731278..c6ef2d7eb1 100644 --- a/app/locales/en/translations.js +++ b/app/locales/en/translations.js @@ -1261,5 +1261,30 @@ 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', + notes: 'Notes', + appointmentDate: 'Date' + } + }, + patient: { + labels: { + name: 'Name' + }, + names: { + singular: 'Patient' + } + } } };
{{t 'labels.name'}}{{t 'models.patient.labels.name'}}{{t 'labels.actions'}}