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/exams/templates/page-add-edit-exam.html | |
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/exams/templates/page-add-edit-exam.html')
-rw-r--r-- | modules-available/exams/templates/page-add-edit-exam.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules-available/exams/templates/page-add-edit-exam.html b/modules-available/exams/templates/page-add-edit-exam.html index 11bffed8..dc29a7f5 100644 --- a/modules-available/exams/templates/page-add-edit-exam.html +++ b/modules-available/exams/templates/page-add-edit-exam.html @@ -221,8 +221,8 @@ document.addEventListener("DOMContentLoaded", function () { var to = e.data('to'); if (!from || !to) return; - from = slxMoment(from); - to = slxMoment(to); + from = slxMoment.unix(from); + to = slxMoment.unix(to); if (from.isBefore(sd) || to.isAfter(ed)) { e.css('color', '#999'); e.data('inrange', false) @@ -239,7 +239,7 @@ document.addEventListener("DOMContentLoaded", function () { if (sel.val() === '' || sel.data('inrange')) { $('#lecture-info').text('-'); } else { - $('#lecture-info').text('{{lang_lectureOutOfRange}} (' + slxMoment(sel.data('from') * 1000).format('YYYY-MM-DD H:mm') + ' - ' + slxMoment(sel.data('to') * 1000).format('YYYY-MM-DD H:mm') + ')'); + $('#lecture-info').text('{{lang_lectureOutOfRange}} (' + slxMoment.unix(sel.data('from')).format('YYYY-MM-DD H:mm') + ' - ' + slxMoment.unix(sel.data('to')).format('YYYY-MM-DD H:mm') + ')'); } }; |