From ff3e83fd43b1cf70124b0df7120b214d78dfbb8d Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 17 Jul 2020 13:58:32 -0400
Subject: [PATCH] fix(calendar(js)): don't handle attendees for tasks

---
 .../js/Scheduler/ComponentController.js       | 22 ++++++++++++-------
 .../js/Scheduler/sgFreebusy.directive.js      |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/UI/WebServerResources/js/Scheduler/ComponentController.js b/UI/WebServerResources/js/Scheduler/ComponentController.js
index 6913bd8bf..87a97d84c 100644
--- a/UI/WebServerResources/js/Scheduler/ComponentController.js
+++ b/UI/WebServerResources/js/Scheduler/ComponentController.js
@@ -210,19 +210,21 @@
     var vm = this, component, oldStartDate, oldEndDate, oldDueDate, dayStartTime, dayEndTime;
 
     this.$onInit = function () {
-      stateComponent.initAttendees();
       this.service = Calendar;
       this.component = stateComponent;
       this.categories = {};
       this.showRecurrenceEditor = this.component.$hasCustomRepeat;
       this.showAttendeesEditor = this.component.attendees && this.component.attendees.length;
-      //this.searchText = null;
-      this.attendeeConflictError = false;
-      this.attendeesEditor = {
-        days: this.component.$attendees.$days,
-        hours: getHours(),
-        containerElement: $element[0].querySelector('#freebusy')
-      };
+
+      if (this.component.type == 'appointment') {
+        this.component.initAttendees();
+        this.attendeeConflictError = false;
+        this.attendeesEditor = {
+          days: this.component.$attendees.$days,
+          hours: getHours(),
+          containerElement: $element[0].querySelector('#freebusy')
+        };
+      }
 
       if (this.component.start) {
         oldStartDate = new Date(this.component.start.getTime());
@@ -398,7 +400,11 @@
     };
 
     function findSlot(direction) {
+      vm.adjustStartTime();
+      vm.adjustEndTime();
       vm.component.$attendees.findSlot(direction).then(function () {
+        vm.startTime = new Date(vm.component.start.getTime());
+        vm.endTime = new Date(vm.component.end.getTime());
       }).catch(function (err) {
         vm.component.start = new Date(vm.component.start.getTime() + 1); // trigger update in sgFreeBusy
         $timeout(scrollToStart);
diff --git a/UI/WebServerResources/js/Scheduler/sgFreebusy.directive.js b/UI/WebServerResources/js/Scheduler/sgFreebusy.directive.js
index dba9045f8..1737ef3e6 100644
--- a/UI/WebServerResources/js/Scheduler/sgFreebusy.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgFreebusy.directive.js
@@ -38,7 +38,7 @@
           } : null;
         },
         function(newAttrs, oldAttrs) {
-          if (newAttrs && newAttrs.attendees) {
+          if (newAttrs && newAttrs.attendees && newAttrs.attendees.length) {
             // Attendees have changed
             $q.all(_.values($ctrl.component.$attendees.$futureFreebusyData)).then(function() {
               $ctrl.onUpdate();