Added radioligist to imaging

Resolves #62
HospitalRun · Jul 20, 2015 · 01d95c7 · 01d95c7
1 parent 353e2df
commit 01d95c7
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 0 deletions.
diff --git a/app/admin/lookup/controller.js b/app/admin/lookup/controller.js
@@ -140,6 +140,12 @@ export default Ember.ArrayController.extend(BillingCategories, LabPricingTypes,
         models: {
             pricing:  'type'
         }
+    }, {
+        name: 'Radiologists',
+        value: 'radiologists',
+        model: {
+            imaging: 'radiologist'
+        }
     }, {
         name: 'Vendor',
         value: 'vendor_list',

diff --git a/app/imaging/edit/controller.js b/app/imaging/edit/controller.js
@@ -36,11 +36,19 @@ export default AbstractEditController.extend(ChargeActions, PatientSubmodule, {
         }
     }.property('canComplete', 'isValid'),
 
+    lookupListsToUpdate: [{
+        name: 'radiologistList',
+        property: 'radiologist',
+        id: 'radiologists'
+    }],
+
     pricingTypeForObjectType: 'Imaging Procedure',
     pricingTypes: Ember.computed.alias('controllers.imaging.imagingPricingTypes'),
 
     pricingList: null, //This gets filled in by the route
 
+    radiologistList: Ember.computed.alias('controllers.imaging.radiologistList'),
+
     imagingTypeChanged: function() {
         this.objectTypeChanged('imagingTypeName', 'imagingType');
     }.observes('imagingType'),

diff --git a/app/imaging/edit/template.hbs b/app/imaging/edit/template.hbs
@@ -35,6 +35,10 @@
         {{/if}}
     </div>
     {{#if canComplete}}
+        {{select-or-typeahead property="radiologist"
+            label="Radiologist" list=radiologistList
+            prompt=" "
+        }}
         {{em-input property="result" label="Result"}}
     {{/if}}
     {{em-text property="notes" label="Notes" rows=3 }}

diff --git a/app/imaging/route.js b/app/imaging/route.js
@@ -4,6 +4,9 @@ export default AbstractModuleRoute.extend({
     additionalModels: [{ 
         name: 'imagingPricingTypes',
         findArgs: ['lookup','imaging_pricing_types']
+    }, {
+        name: 'radiologistList',
+        findArgs: ['lookup','radiologists'],
     }],
     allowSearch: false,
     moduleName: 'imaging',

diff --git a/app/models/imaging.js b/app/models/imaging.js
@@ -9,6 +9,7 @@ export default AbstractModel.extend(DateFormat, ResultValidation, {
     imagingType: DS.belongsTo('pricing'),
     notes: DS.attr('string'),
     patient: DS.belongsTo('patient'),
+    radiologist: DS.attr('string'),
     requestedBy: DS.attr('string'),
     requestedDate: DS.attr('date'),
     result: DS.attr('string'),