From 42dd956b9f9a9d036d247fa6e4fbec72394d2266 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 27 Mar 2019 09:48:00 -0400
Subject: [PATCH] (js) Show calendar names in events blocks

Fixes #4713
---
 UI/Templates/SchedulerUI/UIxCalDayTable.wox                  | 2 +-
 .../js/Scheduler/sgCalendarDayBlock.directive.js             | 5 ++++-
 UI/WebServerResources/scss/views/SchedulerUI.scss            | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/UI/Templates/SchedulerUI/UIxCalDayTable.wox b/UI/Templates/SchedulerUI/UIxCalDayTable.wox
index c2ba6feb3..7e29c3f6d 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayTable.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayTable.wox
@@ -14,7 +14,7 @@
       </md-button>
     </div>
 
-    <div layout="column" class="md-flex">
+    <div layout="column" class="md-flex allDaysView--container">
       <!-- Display today abreviation and date -->
       <div class="days dayLabels">
         <var:foreach list="daysToDisplay" item="currentTableDay">
diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
index 2978e14a0..53a74904e 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
@@ -50,7 +50,7 @@
         '      <span ng-show="'+p+'block.component.c_priority" class="sg-priority">{{'+p+'block.component.c_priority}}</span>',
         //     Summary
         '      {{ '+p+'block.component.summary }}',
-        '      <div class="secondary md-truncate" ng-show="'+p+'showCalendarName" ng-bind="'+p+'block.component.calendarName"></div>',
+        //     Icons
         '      <span class="icons">',
         //       Component is reccurent
         '        <md-icon ng-if="'+p+'block.component.occurrenceId" class="material-icons icon-repeat"></md-icon>',
@@ -65,6 +65,9 @@
         '      <div class="secondary" ng-if="'+p+'block.component.c_location">',
         '        <md-icon>place</md-icon> <span ng-bind="'+p+'block.component.c_location"></span>',
         '      </div>',
+        //     Calendar name
+        '      <div class="secondary md-truncate" ng-if="'+p+'showCalendarName"',
+        '        ng-bind="'+p+'block.component.calendarName"></div>',
         '    </div>',
         '  </div>',
         '  <div class="ghostStartHour" ng-if="block.startHour">{{ block.startHour }}</div>',
diff --git a/UI/WebServerResources/scss/views/SchedulerUI.scss b/UI/WebServerResources/scss/views/SchedulerUI.scss
index 0482a8507..a355256f8 100644
--- a/UI/WebServerResources/scss/views/SchedulerUI.scss
+++ b/UI/WebServerResources/scss/views/SchedulerUI.scss
@@ -122,6 +122,9 @@ $quarter_height: 10px;
   }
 
   // The all-day events appear in the shrinkable toolbar, bellow the days labels
+  .allDaysView--container {
+    overflow: hidden;
+  }
   .allDaysView {
     border-bottom: 1px solid sg-color($sogoPaper, 300);
     max-height: $sg-font-size-4 * 6;