From f1873edf21709950a7e9abdab9c0e7fd944f1399 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 21 Jan 2016 20:46:04 -0500
Subject: [PATCH] (js) Display event ghost block start/end hours

---
 UI/WebServerResources/js/Scheduler/Scheduler.app.js      | 2 +-
 .../js/Scheduler/sgCalendarDayBlock.directive.js         | 2 ++
 .../js/Scheduler/sgCalendarGhost.directive.js            | 7 ++-----
 .../js/Scheduler/sgDraggableCalendarBlock.directive.js   | 2 +-
 UI/WebServerResources/scss/views/SchedulerUI.scss        | 9 +++++----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/UI/WebServerResources/js/Scheduler/Scheduler.app.js b/UI/WebServerResources/js/Scheduler/Scheduler.app.js
index 69c4affab..71a1dc9d3 100644
--- a/UI/WebServerResources/js/Scheduler/Scheduler.app.js
+++ b/UI/WebServerResources/js/Scheduler/Scheduler.app.js
@@ -86,7 +86,7 @@
   /**
    * @ngInject
    */
-  stateEventsBlocks.$inject = ['$stateParams', 'Component', 'Calendar', ];
+  stateEventsBlocks.$inject = ['$stateParams', 'Component', 'Calendar'];
   function stateEventsBlocks($stateParams, Component, Calendar) {
     // See CalendarController.js
     return Component.$eventsBlocksForView($stateParams.view, $stateParams.day.asDate())
diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
index 16dc311e6..bed21bb48 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
@@ -55,6 +55,8 @@
         '      </div>',
         '    </div>',
         '  </div>',
+        '  <div class="ghostStartHour" ng-if="block.startHour">{{ block.startHour }}</div>',
+        '  <div class="ghostEndHour" ng-if="block.endHour">{{ block.endHour }}</div>',
         '</div>'
       ].join(''),
       link: link
diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarGhost.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarGhost.directive.js
index 4f647945f..37142fbf6 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarGhost.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarGhost.directive.js
@@ -103,9 +103,6 @@
           if (duration > maxDuration)
             duration = maxDuration;
 
-          delete scope.startHour;
-          delete scope.endHour;
-
           if (currentDay > -1 &&                                 // pointer is inside viewport
               ((calendarNumber < 0 &&                            // day is not associated to a calendar
                 currentDay == calendarDayCtrl.dayNumber) ||      // pointer is inside ghost's day
@@ -118,7 +115,7 @@
             showGhost = true;
             if (!isRelative)  {
               // Show start hour and set the vertical position
-              scope.startHour = getStartTime(start);
+              scope.block.startHour = getStartTime(start);
               wasOtherBlock = parseInt(iElement.css('top')) === 0;
               if (wasOtherBlock)
                 iElement.addClass('sg-event--notransition');
@@ -176,7 +173,7 @@
             }
             else {
               // Set the end date
-              scope.endHour = getEndTime(start, duration);
+              scope.block.endHour = getEndTime(start, duration);
             }
           }
         }
diff --git a/UI/WebServerResources/js/Scheduler/sgDraggableCalendarBlock.directive.js b/UI/WebServerResources/js/Scheduler/sgDraggableCalendarBlock.directive.js
index 054a30a63..e0b4792df 100644
--- a/UI/WebServerResources/js/Scheduler/sgDraggableCalendarBlock.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgDraggableCalendarBlock.directive.js
@@ -133,7 +133,7 @@
           newData = {
             type: 'appointment',
             pid: calendarData? calendarData.pid : Calendar.$defaultCalendar(),
-            summary: l('New Event'),
+            //summary: l('New Event'),
             startDate: startDate,
             isAllDay: isHourCell? 0 : 1
           };
diff --git a/UI/WebServerResources/scss/views/SchedulerUI.scss b/UI/WebServerResources/scss/views/SchedulerUI.scss
index fcb198ec6..169ad9ae4 100644
--- a/UI/WebServerResources/scss/views/SchedulerUI.scss
+++ b/UI/WebServerResources/scss/views/SchedulerUI.scss
@@ -366,13 +366,14 @@ $block_radius: 3px;
 
     .ghostStartHour,
     .ghostEndHour {
-      position: absolute;
-      width: 100%;
-      vertical-align: baseline;
+      color: $colorGrey900;
+      font-weight: $sg-font-light;
       height: 14px;
       left: 0px;
-      color: #222;
+      position: absolute;
       text-align: center;
+      vertical-align: baseline;
+      width: 100%;
     }
 
     .ghostStartHour {