Added status to appointments

Resolves #73
HospitalRun · Jun 30, 2015 · 84be677 · 84be677
1 parent d58470b
commit 84be677
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 2 deletions.
diff --git a/app/appointments/edit/controller.js b/app/appointments/edit/controller.js
@@ -5,7 +5,11 @@ import VisitTypes from 'hospitalrun/mixins/visit-types';
 
 export default AbstractEditController.extend(PatientSubmodule, VisitTypes, {
     needs: ['appointments','pouchdb'],
-
+
+    appointmentStatuses: [
+        'Scheduled',
+        'Canceled'
+    ],
     dateFormat: 'l h:mm A',
     findPatientVisits: false,
 

diff --git a/app/appointments/edit/template.hbs b/app/appointments/edit/template.hbs
@@ -49,6 +49,10 @@
             label="Location" list=locationList
             selection=location
         }}
+        {{em-select class="col-sm-3" property="status"
+            label="Status" content=appointmentStatuses
+            optionValuePath="content" optionLabelPath="content"
+        }}
     </div>
     {{em-text label="Notes" property="notes" rows=3 }}    
 {{/em-form}}
diff --git a/app/appointments/index/template.hbs b/app/appointments/index/template.hbs
@@ -5,6 +5,7 @@
         <th>Type</th>
         <th>Location</th>
         <th>Provider</th>
+        <th>Status</th>
         <th>Actions</th>
     </tr>
     {{#each itemController='appointments/item'}}

diff --git a/app/appointments/item/template.hbs b/app/appointments/item/template.hbs
@@ -6,6 +6,7 @@
     <td>{{appointmentType}}</td>
     <td>{{location}}</td>
     <td>{{provider}}</td>
+    <td>{{displayStatus}}</td>
     <td>
         {{#if parentController.canAddVisit}}
             <button class="btn btn-default" {{action 'createVisit' this bubbles=false }}>Add Visit</button>

diff --git a/app/appointments/search/controller.js b/app/appointments/search/controller.js
@@ -12,7 +12,7 @@ export default AppointmentIndexController.extend({
         this.set('previousStartKey');
         this.set('previousStartKeys',[]);
         if (!Ember.isEmpty(startingDate)) {        
-            this.set('startKey', [startingDate.getTime(),,]);
+            this.set('startKey', [startingDate.getTime(),null,null]);
         }
     }.observes('startingDate')
 });
diff --git a/app/appointments/search/template.hbs b/app/appointments/search/template.hbs
@@ -14,6 +14,7 @@
         <th>Type</th>
         <th>Location</th>
         <th>Provider</th>
+        <th>Status</th>
         <th>Actions</th>
     </tr>
     {{#each itemController='appointments/item'}}

diff --git a/app/models/appointment.js b/app/models/appointment.js
@@ -11,12 +11,21 @@ export default AbstractModel.extend({
     startDate: DS.attr('date'),
     endDate: DS.attr('date'),
     notes: DS.attr('string'),
+    status: DS.attr('string', {defaultValue:'Scheduled'}),
 
     appointmentDate: function() {
         var startDate = this.get('startDate');
         return startDate;
     }.property('startDate'),
 
+    displayStatus: function() {
+        var status = this.get('status');
+        if (Ember.isEmpty(status)) {
+            status = 'Scheduled';
+        }
+        return status;
+    }.property('status'),
+
     validations: {
         appointmentDate: {
             presence: {

diff --git a/app/patients/edit/template.hbs b/app/patients/edit/template.hbs
@@ -376,6 +376,7 @@
                                 <th>Examiner</th>
                                 <th>Location</th>
                                 <th>Type</th>
+                                <th>Status</th>
                                 <th>Actions</th>
                             </tr>
                             {{#with this as patientController}}
@@ -385,6 +386,7 @@
                                         <td>{{provider}}</td>
                                         <td>{{location}}</td>
                                         <td>{{appointmentType}}</td>
+                                        <td>{{displayStatus}}</td>
                                         <td>
                                             {{#if patientController.canAddAppointment}}
                                                 <button type="button" class="btn btn-default neutral" {{action "editAppointment" this}}>Edit</button>