Fix schedule info from being larger than table

- Fix schedule info from being larger than table - Workaround for libraries-fi/kirkanta#12 - Removed scope from th
olli-suutari-jkl · Jun 5, 2019 · cf21de2 · cf21de2
1 parent 0605a1d
commit cf21de2
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/js/schedule.js b/js/schedule.js
@@ -209,11 +209,12 @@ function getWeekSchelude(direction, lib) {
                 schedulesAreAvailable = false;
             }
             else {
-                $("#weekSchelude").replaceWith('<tbody id="weekSchelude" class="schedules-weekly">');
-                dayInfo = '<tr class="info-span info-text">' +
-                    '<td colspan="2"><span id="scheduleInfo" class="info-span info-text"><i class="fa fa-info-circle" > ' +
-                    '</i> ' + i18n.get("No schedules") + '</span></td></tr>';
-                $("#weekSchelude").append(dayInfo);
+                $("#scheduleInfos").replaceWith('<tbody id="scheduleInfos" class="schedule-infos">' +
+                '<tr id="scheduleInfoRow">' +
+                    '<td colspan="3"><span id="scheduleInfo" class="info-span-lg info-text"><i class="fa fa-info-circle" > ' +
+                    '</i> ' + i18n.get("No schedules") + '</span></td></tr>');
+                $('#weekSchelude').css("display", "none");
+                //$("#weekSchelude").append(dayInfo);
                 isScheduleEmpty = true;
             }
         }
@@ -259,7 +260,6 @@ function getWeekSchelude(direction, lib) {
                 // Capitalize 1st letter of dayname.
                 var dayName = begin.format("dddd");
                 dayName = dayName[0].toUpperCase() + dayName.substr(1);
-
                 function increaseRowCount(isInfo) {
                     // Increase rowspanCount to be used with DD.M. for each open section.
                     rowspanCount = rowspanCount + 1;
@@ -294,6 +294,7 @@ function getWeekSchelude(direction, lib) {
                             '</tr>';
                         increaseRowCount(true);
                     }
+                    var lastStatusIsStaff = false;
                     for (var t = 0; t < schedules[i].times.length; t++) {
                         var time = schedules[i].times[t];
                         var from = time.from;
@@ -311,7 +312,17 @@ function getWeekSchelude(direction, lib) {
                         2 means the library is in self-service mode (no staff).
                         */
                         if(time.status !== 0) {
-                            increaseRowCount();
+                            if(time.status == 1) {
+                                // https://github.com/libraries-fi/kirkanta/issues/12 | Don't increase row count for overlapping staff presents.
+                                if(!lastStatusIsStaff) {
+                                    increaseRowCount();
+                                    lastStatusIsStaff = true;
+                                }
+                            }
+                            else {
+                                increaseRowCount();
+                                lastStatusIsStaff = false;
+                            }
                         }
                         if (time.status === 1) {
                             staffPresentStart = from;

diff --git a/style/schedule.css b/style/schedule.css
@@ -6,12 +6,23 @@
 /* Media query for IE 10-11. Fixes schedule table being larger than the container */
 @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
     .normal-schedules table, .schedules-widget table {
-        table-layout: fixed;
         word-break: break-all;
+        table-layout: fixed;
         width: 100%;
     }
 }
 
+.normal-schedules  .date-container, .schedules-widget .date-container {
+    width: auto;
+    padding-right: 5%;
+    padding-top: 4px;
+}
+
+.normal-schedules td, .schedules-widget td {
+    word-wrap: break-word;
+    word-break: break-word;
+}
+
 @media screen and (max-width: 499px) {
     .normal-schedules {
         margin-left: calc(50% - 48.33vw);