From 01fb7e95cbfc23b08eddcb00dd4c96d92f43f6d0 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <kleinschmidtorama@gmail.com>
Date: Fri, 9 Dec 2016 10:19:38 -0500
Subject: [PATCH] Allow patient checkin from appointment

Partially addresses #835
---
 app/appointments/item/template.hbs |  5 ++++-
 app/appointments/route.js          | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/appointments/item/template.hbs b/app/appointments/item/template.hbs
index fdcf987bf9..fa9c11cb9e 100644
--- a/app/appointments/item/template.hbs
+++ b/app/appointments/item/template.hbs
@@ -12,7 +12,10 @@
       <button class="btn btn-default neutral" {{action 'editAppointment' appointment bubbles=false }}>{{t 'labels.edit'}}</button>
     {{/if}}
     {{#if canAddVisit}}
-      <button class="btn btn-default" {{action 'createVisit' appointment bubbles=false }}>{{t 'buttons.addVisit'}}</button>
+      <button class="btn btn-default" {{action 'checkIn' appointment bubbles=false }}>
+        <span class="glyphicon glyphicon-log-in"></span>
+        {{t 'visits.buttons.checkIn'}}
+    </button>
     {{/if}}
     {{#if canDelete}}
       <button class="btn btn-default warning" {{action 'deleteItem' appointment  bubbles=false }}><span class="octicon octicon-x"></span> {{t 'buttons.delete'}}</button>
diff --git a/app/appointments/route.js b/app/appointments/route.js
index ffed931a17..1651713d2a 100644
--- a/app/appointments/route.js
+++ b/app/appointments/route.js
@@ -13,12 +13,18 @@ export default AbstractModuleRoute.extend(UserSession, {
   sectionTitle: t('appointments.sectionTitle'),
 
   actions: {
-    createVisit(appointment) {
+    checkIn(appointment) {
+      let patient = appointment.get('patient');
       let visitProps = appointment.getProperties('startDate', 'endDate', 'location', 'patient');
       visitProps.visitType = appointment.get('appointmentType');
       visitProps.examiner = appointment.get('provider');
-      this.transitionTo('visits.edit', 'new').then(function(newRoute) {
+      visitProps.appointment = appointment;
+      visitProps.hidePatientSelection = true;
+      visitProps.patient = patient;
+      visitProps.returnTo = 'appointments';
+      this.transitionTo('visits.edit', 'checkin').then(function(newRoute) {
         newRoute.currentModel.setProperties(visitProps);
+        newRoute.controller.getPatientDiagnoses(patient);
       }.bind(this));
     }
   },