From a4aed1b9da3aedcf96f8f47b8eefc49d5716b810 Mon Sep 17 00:00:00 2001 From: Bao Chau Date: Mon, 20 Mar 2017 22:32:40 -0700 Subject: [PATCH 1/3] add custom form for labs --- app/admin/custom-forms/edit/controller.js | 3 ++- app/labs/edit/route.js | 11 ++++++----- app/labs/edit/template.hbs | 1 + app/locales/en/translations.js | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/admin/custom-forms/edit/controller.js b/app/admin/custom-forms/edit/controller.js index cc9c446c8a..e872459c2e 100644 --- a/app/admin/custom-forms/edit/controller.js +++ b/app/admin/custom-forms/edit/controller.js @@ -81,7 +81,8 @@ export default AbstractEditController.extend({ 'socialwork', 'visit', 'opdReport', - 'dischargeReport' + 'dischargeReport', + 'lab' ], formTypes: computed(function() { diff --git a/app/labs/edit/route.js b/app/labs/edit/route.js index 0338bbc9ab..fb474aa438 100644 --- a/app/labs/edit/route.js +++ b/app/labs/edit/route.js @@ -2,7 +2,6 @@ import AbstractEditRoute from 'hospitalrun/routes/abstract-edit-route'; import AddToPatientRoute from 'hospitalrun/mixins/add-to-patient-route'; import ChargeRoute from 'hospitalrun/mixins/charge-route'; import Ember from 'ember'; -import moment from 'moment'; import PatientListRoute from 'hospitalrun/mixins/patient-list-route'; import { translationMacro as t } from 'ember-i18n'; @@ -11,6 +10,7 @@ export default AbstractEditRoute.extend(AddToPatientRoute, ChargeRoute, PatientL modelName: 'lab', newTitle: t('labs.newTitle'), pricingCategory: 'Lab', + customForms: Ember.inject.service(), actions: { returnToAllItems() { @@ -19,9 +19,10 @@ export default AbstractEditRoute.extend(AddToPatientRoute, ChargeRoute, PatientL }, getNewData() { - return Ember.RSVP.resolve({ - selectPatient: true, - requestDate: moment().startOf('day').toDate() - }); + let customForms = this.get('customForms'); + let newData = { + customForms: Ember.Object.create() + }; + return customForms.setDefaultCustomForms(['lab'], newData); } }); diff --git a/app/labs/edit/template.hbs b/app/labs/edit/template.hbs index cfd3880222..1a153a7152 100644 --- a/app/labs/edit/template.hbs +++ b/app/labs/edit/template.hbs @@ -42,6 +42,7 @@ {{#if canComplete}} {{em-input property="result" label=(t 'labels.result') class="test-result-input"}} {{/if}} + {{custom-form-manager model=model formType="lab"}} {{em-text property="notes" label=(t 'labels.notes') rows=3 }} {{/em-form}} {{/edit-panel}} diff --git a/app/locales/en/translations.js b/app/locales/en/translations.js index a264c24633..9365e88443 100644 --- a/app/locales/en/translations.js +++ b/app/locales/en/translations.js @@ -175,7 +175,8 @@ export default { textarea: 'Large Text', visitFormType: 'Visit', opdReportFormType: 'Outpatient Report', - dischargeReportFormType: 'Discharge Report' + dischargeReportFormType: 'Discharge Report', + labFormType: 'Lab Form Type' }, messages: { formSaved: 'The {{name}} form has been saved.' From f60e39ed7b9e3853e693993e4bf280c68bbabb22 Mon Sep 17 00:00:00 2001 From: Bao Chau Date: Mon, 20 Mar 2017 23:28:42 -0700 Subject: [PATCH 2/3] restore old function so it wont break the test --- app/labs/edit/route.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/labs/edit/route.js b/app/labs/edit/route.js index fb474aa438..d245e60e56 100644 --- a/app/labs/edit/route.js +++ b/app/labs/edit/route.js @@ -2,6 +2,7 @@ import AbstractEditRoute from 'hospitalrun/routes/abstract-edit-route'; import AddToPatientRoute from 'hospitalrun/mixins/add-to-patient-route'; import ChargeRoute from 'hospitalrun/mixins/charge-route'; import Ember from 'ember'; +import moment from 'moment'; import PatientListRoute from 'hospitalrun/mixins/patient-list-route'; import { translationMacro as t } from 'ember-i18n'; @@ -18,11 +19,18 @@ export default AbstractEditRoute.extend(AddToPatientRoute, ChargeRoute, PatientL } }, - getNewData() { + getCustomFormData() { let customForms = this.get('customForms'); let newData = { customForms: Ember.Object.create() }; return customForms.setDefaultCustomForms(['lab'], newData); + }, + + getNewData() { + return Ember.RSVP.resolve({ + selectPatient: true, + requestDate: moment().startOf('day').toDate() + }); } }); From b164e81c6cf5e50f17c6aac728c978e6b0009640 Mon Sep 17 00:00:00 2001 From: Bao Chau Date: Tue, 21 Mar 2017 11:13:40 -0700 Subject: [PATCH 3/3] fix labs edit so that it now include custom forms --- app/labs/edit/route.js | 17 ++++++----------- app/labs/edit/template.hbs | 2 +- app/locales/en/translations.js | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/app/labs/edit/route.js b/app/labs/edit/route.js index d245e60e56..e5effb16e9 100644 --- a/app/labs/edit/route.js +++ b/app/labs/edit/route.js @@ -19,18 +19,13 @@ export default AbstractEditRoute.extend(AddToPatientRoute, ChargeRoute, PatientL } }, - getCustomFormData() { - let customForms = this.get('customForms'); - let newData = { - customForms: Ember.Object.create() - }; - return customForms.setDefaultCustomForms(['lab'], newData); - }, - getNewData() { - return Ember.RSVP.resolve({ + let newLabData = { selectPatient: true, - requestDate: moment().startOf('day').toDate() - }); + requestDate: moment().startOf('day').toDate(), + customForms: Ember.Object.create() + }; + let customForms = this.get('customForms'); + return customForms.setDefaultCustomForms(['lab'], newLabData); } }); diff --git a/app/labs/edit/template.hbs b/app/labs/edit/template.hbs index 1a153a7152..847cef98f9 100644 --- a/app/labs/edit/template.hbs +++ b/app/labs/edit/template.hbs @@ -42,7 +42,7 @@ {{#if canComplete}} {{em-input property="result" label=(t 'labels.result') class="test-result-input"}} {{/if}} - {{custom-form-manager model=model formType="lab"}} {{em-text property="notes" label=(t 'labels.notes') rows=3 }} + {{custom-form-manager model=model formType="lab"}} {{/em-form}} {{/edit-panel}} diff --git a/app/locales/en/translations.js b/app/locales/en/translations.js index 9365e88443..5e31c42063 100644 --- a/app/locales/en/translations.js +++ b/app/locales/en/translations.js @@ -176,7 +176,7 @@ export default { visitFormType: 'Visit', opdReportFormType: 'Outpatient Report', dischargeReportFormType: 'Discharge Report', - labFormType: 'Lab Form Type' + labFormType: 'Lab' }, messages: { formSaved: 'The {{name}} form has been saved.'