fix: implemented next appointments on both template and controller

eHealthAfrica · Mar 2, 2017 · bbdbd65 · bbdbd65
1 parent de35e44
commit bbdbd65
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 8 deletions.
diff --git a/app/reports/edit/controller.js b/app/reports/edit/controller.js
@@ -30,6 +30,10 @@ export default AbstractEditController.extend(PatientSubmodule, PatientDiagnosis,
     return this.getPatientFutureAppointment(this.get('model.visit'));
   }),
 
+  nextAppointments: Ember.computed('model', function() {
+    return this.getPatientFutureAppointment(this.get('model.visit'), true);
+  }),
+
   additionalButtons: Ember.computed('model.{isNew}', function() {
     let isNew = this.get('model.isNew');
     if (!isNew) {
@@ -47,8 +51,6 @@ export default AbstractEditController.extend(PatientSubmodule, PatientDiagnosis,
   beforeUpdate() {
     return new Ember.RSVP.Promise(function(resolve) {
       if (this.get('model.isNew')) {
-        let appointmentDate = this.get('nextAppointment').get('content');
-        this.get('model').set('nextAppointment', appointmentDate);
         if (this.get('model.visit.outPatient')) {
           this.get('model').set('reportType', 'OPD Report');
         } else {

diff --git a/app/reports/edit/template.hbs b/app/reports/edit/template.hbs
@@ -108,12 +108,35 @@
         </div>
       {{/if}}
 
-      {{#if nextAppointment}}
-        <div class="ps-info-group">
-          <label class="ps-info-label">{{t 'reports.form.nextAppointmentDate' }}:</label>
-         {{date-format nextAppointment format="DD/MM/YYYY hh:mm a"}}
-        </div>
-      {{/if}}
+    {{log nextAppointment}}
+     {{#if model.visit.outPatient}}
+       {{#if nextAppointments.length}}
+         <div class="ps-info-group">
+           <label class="ps-info-label">{{t 'reports.form.nextAppointments' }}:</label>
+           {{#each nextAppointments as |appointment|}}
+             {{date-format appointment.startDate format="DD/MM/YYYY hh:mm a"}}
+           {{#if appointment.appointmentType}}
+             ({{appointment.appointmentType}})
+           {{/if}},
+           {{/each}}
+         </div>
+       {{/if}}
+
+     {{else}}
+
+       {{#if nextAppointment}}
+         <div class="ps-info-group">
+           <label class="ps-info-label">{{t 'reports.form.nextAppointment' }}:</label>
+           {{date-format nextAppointment.startDate format="DD/MM/YYYY hh:mm a"}}
+           {{#if nextAppointment.location}}
+              ({{nextAppointment.location}})
+           {{/if}}
+         </div>
+       {{/if}}
+
+     {{/if}}
+
+
 
       {{#if model.visit.patient.operativePlans.length}}
         <div class="ps-info-group">