diff options
| -rw-r--r-- | assets/js/timetable.js | 2 | ||||
| -rwxr-xr-x | dist/cache_name.txt | 2 | ||||
| -rwxr-xr-x | dist/js/app.js | 2 | ||||
| -rwxr-xr-x | dist/js/timetable.js | 2 | ||||
| -rwxr-xr-x | dist/pages/about.html | 2 | ||||
| -rwxr-xr-x | dist/sw.js | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/assets/js/timetable.js b/assets/js/timetable.js index 290b748..85c555a 100644 --- a/assets/js/timetable.js +++ b/assets/js/timetable.js @@ -274,7 +274,7 @@ document.addEventListener("DOMContentLoaded", () => { nowIndicator: true, firstDay: 1, weekends: false, - + timeFormat: 'H(:mm)', // 24 urni urnik - evropa style minTime: "07:10:00", maxTime: "19:10:00" }); diff --git a/dist/cache_name.txt b/dist/cache_name.txt index 5d3eada..54c7951 100755 --- a/dist/cache_name.txt +++ b/dist/cache_name.txt @@ -2,4 +2,4 @@ -///site-static-1.0.16.0-beta-f54120a||| +///site-static-1.0.16.0-beta-8fe006a||| diff --git a/dist/js/app.js b/dist/js/app.js index fe857c9..e9c4a8b 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -4,7 +4,7 @@ // @begin=html@ const app_version = "1.0.16.0-beta"; -const previous_commit = "f54120aa036215dee0f02ff2c1a9ce20def75006"; +const previous_commit = "8fe006a36a0c5dddd8b0d3c5ad590d57039a4aae"; const BEZIAPP_UPDATE_INTERVAL = 300; // update vsakih 300 sekund if ("serviceWorker" in navigator) { diff --git a/dist/js/timetable.js b/dist/js/timetable.js index 79539f6..aa73a9a 100755 --- a/dist/js/timetable.js +++ b/dist/js/timetable.js @@ -18,4 +18,4 @@ function displayTimetable(weekly_timetable,date_object){let transformed_timetabl let lesson_object={id:JSON.stringify(lesson_metadata),title:lesson["acronym"],start:date_string+" "+lesson_times[0],end:date_string+" "+lesson_times[1],backgroundColor:bg_color,textColor:fg_color};transformed_timetable.push(lesson_object);});} calendar_obj.removeAllEvents();calendar_obj.addEventSource(transformed_timetable);} function eventClickHandler(eventClickInfo){let lesson_metadata=JSON.parse(eventClickInfo.event.id);let lesson_subject=lesson_metadata["subject"];let lesson_teacher=lesson_metadata["teacher"];let lesson_classroom=lesson_metadata["classroom"];let lesson_class=lesson_metadata["class"];let lesson_duration=lesson_metadata["start"]+" - "+lesson_metadata["end"];$("#lesson-subject").text(lesson_subject);$("#lesson-teacher").text(lesson_teacher);$("#lesson-class").text(lesson_class);$("#lesson-classroom").text(lesson_classroom);$("#lesson-duration").text(lesson_duration);const modal=document.querySelectorAll(".side-modal")[0];M.Sidenav.getInstance(modal).open();} -document.addEventListener("DOMContentLoaded",()=>{checkLogin();let calendarEl=document.getElementById("calendar");calendar_obj=new FullCalendar.Calendar(calendarEl,{plugins:["timeGrid"],eventClick:eventClickHandler,defaultView:"timeGridWeek",contentHeight:"auto",height:"auto",width:"auto",timeGridEventMinHeight:35,nowIndicator:true,firstDay:1,weekends:false,minTime:"07:10:00",maxTime:"19:10:00"});calendar_obj.render();loadTimetable(new Date());$(".fc-today-button, .fc-prev-button, .fc-next-button").click(()=>{loadTimetable(calendar_obj.getDate());});$("#refresh-icon").click(()=>{loadTimetable(calendar_obj.getDate(),true);});const menus=document.querySelectorAll(".side-menu");M.Sidenav.init(menus,{edge:"right",draggable:true});const modals=document.querySelectorAll('.side-modal');M.Sidenav.init(modals,{edge:'left',draggable:false});});
\ No newline at end of file +document.addEventListener("DOMContentLoaded",()=>{checkLogin();let calendarEl=document.getElementById("calendar");calendar_obj=new FullCalendar.Calendar(calendarEl,{plugins:["timeGrid"],eventClick:eventClickHandler,defaultView:"timeGridWeek",contentHeight:"auto",height:"auto",width:"auto",timeGridEventMinHeight:35,nowIndicator:true,firstDay:1,weekends:false,timeFormat:'H(:mm)',minTime:"07:10:00",maxTime:"19:10:00"});calendar_obj.render();loadTimetable(new Date());$(".fc-today-button, .fc-prev-button, .fc-next-button").click(()=>{loadTimetable(calendar_obj.getDate());});$("#refresh-icon").click(()=>{loadTimetable(calendar_obj.getDate(),true);});const menus=document.querySelectorAll(".side-menu");M.Sidenav.init(menus,{edge:"right",draggable:true});const modals=document.querySelectorAll('.side-modal');M.Sidenav.init(modals,{edge:'left',draggable:false});});
\ No newline at end of file diff --git a/dist/pages/about.html b/dist/pages/about.html index 2959511..9e26117 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -162,7 +162,7 @@ <div class="row"> <p> <small> - ^HEAD f54120aa036215dee0f02ff2c1a9ce20def75006 + ^HEAD 8fe006a36a0c5dddd8b0d3c5ad590d57039a4aae </small> </p> </div> @@ -4,8 +4,8 @@ // @begin=js@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.16.0-beta-f54120a"; -// commit before the latest is f54120aa036215dee0f02ff2c1a9ce20def75006 +const static_cache_name = "site-static-1.0.16.0-beta-8fe006a"; +// commit before the latest is 8fe006a36a0c5dddd8b0d3c5ad590d57039a4aae // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! |