diff options
| author | Jannik Schönartz | 2017-12-07 17:16:16 +0100 |
|---|---|---|
| committer | Jannik Schönartz | 2017-12-07 17:16:16 +0100 |
| commit | 3824805b842ebbe6d84b88fe9c8fb3d9e39f3d26 (patch) | |
| tree | 3d348e3418fe771608e4dd3d2a3cfdb7c9ac23e2 /modules-available/locationinfo/templates/frontend-default.html | |
| parent | [locations] Redesign machine count column, make both counts clickable (diff) | |
| download | slx-admin-3824805b842ebbe6d84b88fe9c8fb3d9e39f3d26.tar.gz slx-admin-3824805b842ebbe6d84b88fe9c8fb3d9e39f3d26.tar.xz slx-admin-3824805b842ebbe6d84b88fe9c8fb3d9e39f3d26.zip | |
[locationinfo] Moved some shared functions to the frontendscript.js
Diffstat (limited to 'modules-available/locationinfo/templates/frontend-default.html')
| -rwxr-xr-x | modules-available/locationinfo/templates/frontend-default.html | 88 |
1 files changed, 2 insertions, 86 deletions
diff --git a/modules-available/locationinfo/templates/frontend-default.html b/modules-available/locationinfo/templates/frontend-default.html index 38cb7b7c..92cad055 100755 --- a/modules-available/locationinfo/templates/frontend-default.html +++ b/modules-available/locationinfo/templates/frontend-default.html @@ -343,6 +343,7 @@ optional: <script type='text/javascript' src='{{dirprefix}}script/jquery.js'></script> <script type='text/javascript' src='{{dirprefix}}modules/js_jqueryui/clientscript.js'></script> <script type='text/javascript' src="{{dirprefix}}modules/js_weekcalendar/clientscript.js"></script> + <script type='text/javascript' src='{{dirprefix}}modules/locationinfo/frontend/frontendscript.js'></script> </head> <body> @@ -1041,50 +1042,6 @@ optional: } /** - * used for countdown - * computes the time difference between 2 Date objects - * @param {Date} a - * @param {Date} b - * @returns {string} printable time - */ - function GetTimeDiferenceAsString(a, b) { - if (!a || !b) { - return ""; - } - var milliseconds = a.getTime() - b.getTime(); - var days = Math.floor((milliseconds / (1000 * 60 * 60 * 24)) % 31); - if (days !== 0) { - // don't show? - return ""; - } - var seconds = Math.floor((milliseconds / 1000) % 60); - milliseconds -= seconds * 1000; - var minutes = Math.floor((milliseconds / (1000 * 60)) % 60); - milliseconds -= minutes * 1000 * 60; - var hours = Math.floor((milliseconds / (1000 * 60 * 60)) % 24); - - if (globalConfig.prettytime) { - var str = ''; - if (hours > 0) { - str += hours + 'h '; - } - str += minutes + 'min '; - return str; - } - - if (minutes < 10) { - minutes = "0" + minutes; - } - if (globalConfig.eco) { - return hours + ":" + minutes; - } - if (seconds < 10) { - seconds = "0" + seconds; - } - return hours + ":" + minutes + ":" + seconds; - } - - /** * returns next closing time of a given room * @param room * @returns {Date} Object of next closing @@ -1115,32 +1072,6 @@ optional: return null; } - - /** - * checks if a room is on a given date/time open - * @param date Date Object - * @param room Room object - * @returns {Boolean} for open or not - */ - function IsOpen(date, room) { - if (!room.openingTimes || room.openingTimes.length === 0) return true; - var tmp = room.openingTimes[date.getDay()]; - if (!tmp) return false; - var openDate = new Date(date.getTime()); - var closeDate = new Date(date.getTime()); - for (var i = 0; i < tmp.length; i++) { - openDate.setHours(tmp[i].HourOpen); - openDate.setMinutes(tmp[i].MinutesOpen); - closeDate.setHours(tmp[i].HourClose); - closeDate.setMinutes(tmp[i].MinutesClose); - if (openDate < date && closeDate > date) { - return true; - } - } - return false; - } - - /** * Returns next Opening * @param room Room Object @@ -1201,7 +1132,7 @@ optional: var newText = false, newTime = false; var seats = room.freePcs; if (tmp.state === 'closed' || tmp.state === 'CalendarEvent' || tmp.state === 'Free') { - newTime = GetTimeDiferenceAsString(tmp.end, MyDate()); + newTime = GetTimeDiferenceAsString(tmp.end, MyDate(), globalConfig); } else if (!same) { newTime = ''; } @@ -1727,20 +1658,5 @@ optional: }, interval); } - /** - * Convert passed argument to integer if possible, return NaN otherwise. - * The difference to parseInt() is that leading zeros are ignored and not - * interpreted as octal representation. - * - * @param str string or already a number - * @return {number} str converted to number, or NaN - */ - function toInt(str) { - var t = typeof str; - if (t === 'number') return str | 0; - if (t === 'string') return parseInt(str.replace(/^0+([^0])/, '$1')); - return NaN; - } - </script> </html> |