diff options
| author | root | 2019-02-19 18:53:50 +0100 |
|---|---|---|
| committer | root | 2019-02-19 18:53:50 +0100 |
| commit | 0ad4c0f8196b61699754762aacbaab0223478ab9 (patch) | |
| tree | de434c4aea8d07ecd01cd3badd48d057d62c2d1b /modules-available/locationinfo/frontend/frontendscript.js | |
| parent | [usb-lock-off] Edit rule cleanup and fix of the dropdown boxes. (diff) | |
| parent | [statistics] Fix RAM change warning to handle increase too (diff) | |
| download | slx-admin-0ad4c0f8196b61699754762aacbaab0223478ab9.tar.gz slx-admin-0ad4c0f8196b61699754762aacbaab0223478ab9.tar.xz slx-admin-0ad4c0f8196b61699754762aacbaab0223478ab9.zip | |
Merge branch 'master' into usb-lock-offusb-lock-off
Diffstat (limited to 'modules-available/locationinfo/frontend/frontendscript.js')
| -rw-r--r-- | modules-available/locationinfo/frontend/frontendscript.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules-available/locationinfo/frontend/frontendscript.js b/modules-available/locationinfo/frontend/frontendscript.js index bad6a8ed..efe4d5b6 100644 --- a/modules-available/locationinfo/frontend/frontendscript.js +++ b/modules-available/locationinfo/frontend/frontendscript.js @@ -15,7 +15,7 @@ function IsOpen(date, room) { openDate.setMinutes(tmp[i].MinutesOpen); closeDate.setHours(tmp[i].HourClose); closeDate.setMinutes(tmp[i].MinutesClose); - if (openDate < date && closeDate > date) { + if (openDate <= date && closeDate > date) { return true; } } @@ -42,7 +42,7 @@ function toInt(str) { * computes the time difference between 2 Date objects * @param {Date} a * @param {Date} b - * @param {Array} globalConfig + * @param {Object} globalConfig * @returns {string} printable time */ function GetTimeDiferenceAsString(a, b, globalConfig) { |