summaryrefslogtreecommitdiffstats
path: root/dist/js
diff options
context:
space:
mode:
authorrstular <rok@stular.eu>2020-06-02 16:07:57 +0200
committerrstular <rok@stular.eu>2020-06-02 16:07:57 +0200
commitd766f5af2b59ede34479dcce54b368c3bf816d2b (patch)
tree4c993a985eaa072eda88e33a7647ad3600a12dc4 /dist/js
parentGithub actions fix (diff)
downloadbeziapp-d766f5af2b59ede34479dcce54b368c3bf816d2b.tar
beziapp-d766f5af2b59ede34479dcce54b368c3bf816d2b.tar.gz
beziapp-d766f5af2b59ede34479dcce54b368c3bf816d2b.tar.bz2
beziapp-d766f5af2b59ede34479dcce54b368c3bf816d2b.tar.lz
beziapp-d766f5af2b59ede34479dcce54b368c3bf816d2b.tar.xz
beziapp-d766f5af2b59ede34479dcce54b368c3bf816d2b.tar.zst
beziapp-d766f5af2b59ede34479dcce54b368c3bf816d2b.zip
Diffstat (limited to 'dist/js')
-rwxr-xr-xdist/js/app.js6
-rw-r--r--dist/js/gradings.js2
2 files changed, 2 insertions, 6 deletions
diff --git a/dist/js/app.js b/dist/js/app.js
index 339215b..623d86d 100755
--- a/dist/js/app.js
+++ b/dist/js/app.js
@@ -3,11 +3,7 @@
const app_version = "1.0.14-beta";
-<<<<<<< HEAD
-const previous_commit = "aebac8bcd0e946f1e7283d8e280e301d52b8d64b";
-=======
-const previous_commit = "35b595f806f99ca18365d511ab820ab818da348d";
->>>>>>> f06c121... Github actions fix
+const previous_commit = "f06c1210549f0e6c81b72c6f51b811304e8cd7c4";
if ("serviceWorker" in navigator) {
navigator.serviceWorker.register("/sw.js")
diff --git a/dist/js/gradings.js b/dist/js/gradings.js
index 017e4e6..b9b3d5c 100644
--- a/dist/js/gradings.js
+++ b/dist/js/gradings.js
@@ -13,4 +13,4 @@ function displayData(){let transformed_gradings=[];gradings.forEach((element,ind
function gradingClickHandler(eventClickInfo){let grading_id=parseInt(eventClickInfo.event.id);let grading_subject=gradings[grading_id]["subject"];let grading_date_obj=gradings[grading_id]["date"];let grading_date=dateString.longFormatted(grading_date_obj);let grading_description=gradings[grading_id]["description"];$("#grading-subject").text(grading_subject);$("#grading-date").text(grading_date);$("#grading-description").text(grading_description);const modal=document.querySelectorAll(".side-modal")[0];M.Sidenav.getInstance(modal).open();}
function setupPickers(){var date_object=new Date();let elems=document.querySelectorAll('#datepicker-add');let options={autoClose:true,format:"dd.mm.yyyy",defaultDate:date_object,setDefaultDate:true,firstDay:1}
instances=M.Datepicker.init(elems,options);}
-document.addEventListener("DOMContentLoaded",()=>{checkLogin();var calendarEl=document.getElementById("calendar");calendar_obj=new FullCalendar.Calendar(calendarEl,{firstDay:1,plugins:["dayGrid"],defaultDate:getDateString(),navLinks:false,editable:false,events:[],eventClick:gradingClickHandler,height:"parent"});calendar_obj.render();setupPickers();const modal_elems=document.querySelectorAll('.modal');const modal_options={onOpenStart:()=>{$("#fab-new").hide()},onCloseEnd:()=>{$("#fab-new").show()},dismissible:false};M.Modal.init(modal_elems,modal_options);loadGradings(true);$("#refresh-icon").click(()=>{loadGradings(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();var calendarEl=document.getElementById("calendar");calendar_obj=new FullCalendar.Calendar(calendarEl,{firstDay:1,plugins:["dayGrid"],defaultDate:getDateString(),navLinks:false,editable:false,events:[],eventClick:gradingClickHandler,height:"parent"});calendar_obj.render();loadGradings(true);$("#refresh-icon").click(()=>{loadGradings(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