From 62c4dcef1aa1c9f007754d983572721744bef6bd Mon Sep 17 00:00:00 2001
From: Adeola Badmus <badmusad@gmail.com>
Date: Sun, 26 Feb 2017 22:18:04 +0100
Subject: [PATCH] Fix Operative Plans display

---
 app/locales/en/translations.js |  8 ++++++-
 app/reports/edit/template.hbs  | 42 +++++++++++++++++++++++++++-------
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/app/locales/en/translations.js b/app/locales/en/translations.js
index b0dbdf3875..444619422d 100644
--- a/app/locales/en/translations.js
+++ b/app/locales/en/translations.js
@@ -1117,8 +1117,14 @@ export default {
       procedures: 'Procedures',
       labs: 'Labs',
       images: 'Images',
+      medications: 'Medications',
       nextAppointmentDate: 'Date Of Next Appointment',
-      operativePlan: 'Planned Procedures'
+      operativePlan: {
+        title: 'Operative Plans',
+        description: 'Operation Description',
+        procedures: 'Planned Procedures',
+        instructions: 'Instructions upon Admission'
+      }
     },
     opd: {
       titles: {
diff --git a/app/reports/edit/template.hbs b/app/reports/edit/template.hbs
index 7bdf08c846..d74136452c 100644
--- a/app/reports/edit/template.hbs
+++ b/app/reports/edit/template.hbs
@@ -29,7 +29,7 @@
 
       {{#if model.visit.startDate}}
         <div class="ps-info-group">
-          <p class="ps-info-label">{{t 'reports.form.visitDate' }}</p>
+          <label class="ps-info-label">{{t 'reports.form.visitDate' }}</label>
           {{date-format model.visit.startDate format="DD/MM/YYYY hh:mm a"}}
         </div>
       {{/if}}
@@ -89,7 +89,7 @@
           <label class="ps-info-label">{{t 'reports.form.procedures' }}</label>
           <ul>
             {{#each model.visit.procedures as |item|}}
-              <li>{{item.description}} {{#if item.procedureDate }} - {{date-format item.procedureDate format="DD/MM/YYYY"}} {{/if}}</li>
+              <li>{{item.description}}</li>
             {{/each}}
           </ul>
         </div>
@@ -117,23 +117,49 @@
         </div>
       {{/if}}
 
+      {{#if model.visit.medication.length}}
+        <div class="ps-info-group">
+          <label class="ps-info-label">{{t 'reports.form.medications' }}</label>
+          <ul>
+            {{#each model.visit.medication as |medication|}}
+              <li>{{medication.medicationName}} - {{medication.prescription}} ({{medication.status}})</li>
+            {{/each}}
+          </ul>
+        </div>
+      {{/if}}
 
       {{#if nextAppointment}}
         <div class="ps-info-group">
-          <p class="ps-info-label">{{t 'reports.form.nextAppointmentDate' }}</p>
+          <label class="ps-info-label">{{t 'reports.form.nextAppointmentDate' }}:</label>
          {{date-format nextAppointment format="DD/MM/YYYY hh:mm a"}}
         </div>
       {{/if}}
 
       {{#if model.visit.patient.operativePlans.length}}
         <div class="ps-info-group">
-          <label class="ps-info-label">{{t 'reports.form.operativePlan' }}</label>
+          <label class="ps-info-label">{{t 'reports.form.operativePlan.title' }}</label>
           <ul>
-            {{#each model.visit.patient.operativePlans as |item|}}
-              {{#each item.procedures as |p|}}
-                <li>{{p.description}} ({{item.status}})</li>
+              {{#each model.visit.patient.operativePlans as |operativePlan|}}
+                <li>
+                  <p><b>{{t 'reports.form.operativePlan.description' }}:</b><br>
+                  {{operativePlan.operationDescription}}</p>
+                </li>
+
+                <li>
+                  <p><b>{{t 'reports.form.operativePlan.procedures' }}:</b></p>
+                  <ul>
+                    {{#each operativePlan.procedures as |procedure|}}
+                      <li>{{procedure.description}}</li>
+                    {{/each}}
+                  </ul>
+                </li>
+
+                <li>
+                  <p><b>{{t 'reports.form.operativePlan.instructions' }}:</b><br>
+                    {{operativePlan.admissionInstructions}}
+                  </p>
+                </li>
               {{/each}}
-            {{/each}}
           </ul>
         </div>
       {{/if}}