Merge pull request #468 from alvesjtiago/master

Requesting clinician added to the Medication Request list and edit se… Closes #363
HospitalRun · May 14, 2016 · 37e8b53 · 37e8b53
2 parents 84d1b20 + b17a83d
commit 37e8b53
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/app/locales/en/translations.js b/app/locales/en/translations.js
@@ -211,6 +211,7 @@ export default {
     loading: 'Loading',
     name: 'Name',
     patient: 'Patient',
+    prescriber: 'Prescriber',
     quantity: 'Quantity',
     requested_on: 'Requested On',
     date: 'Date',

diff --git a/app/medication/edit/template.hbs b/app/medication/edit/template.hbs
@@ -29,6 +29,12 @@
     {{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>
+        <p class="form-control-static">{{model.requestedBy}}</p>
+      </div>
+    {{/if}}
     {{#if isFulfilled}}
       {{static-text label=(t 'labels.prescription') value=model.prescription }}
       <div class="row">

diff --git a/app/medication/index/template.hbs b/app/medication/index/template.hbs
@@ -4,6 +4,7 @@
       <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>
@@ -15,6 +16,7 @@
         <tr {{action 'editItem' medicationRequest}} class="clickable">
           <td>{{date-format medicationRequest.prescriptionDate}}</td>
           <td>{{medicationRequest.patient.displayName}}</td>
+          <td>{{medicationRequest.requestedBy}}</td>
           <td>{{medicationRequest.medicationName}}</td>
           <td>{{medicationRequest.quantity}}</td>
           <td>{{medicationRequest.status}}</td>