From 72752d22ccf80a1ca7d1557999dbc5cdd2aacc63 Mon Sep 17 00:00:00 2001 From: Kilian Saffran Date: Thu, 20 Jun 2019 22:22:29 +0200 Subject: [PATCH] coworker vacdata problem --- apps/data/db/lechatpotte.sqlite | Bin 1541120 -> 1543168 bytes apps/data/db/underatert.sqlite | Bin 2669568 -> 2670592 bytes apps/tmpl/creorga/modules/childs/js/child.js | 12 ++++++------ .../tmpl/creorga/modules/staff/js/coworker.js | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/data/db/lechatpotte.sqlite b/apps/data/db/lechatpotte.sqlite index b55d8f2862c7c6c574c16efe9ad54e202025576f..0c999763a1d9f38201f63a3a3e8fe5e5ab603c05 100644 GIT binary patch delta 1678 zcmeH{&ubGw6vuaWn%_-pt2SV%rl3uFn097oc6K)h1@YiT@Y17&ot@b>#q_rx#FFNu z^puiAJa`jCkK&;eL9m|u4?MTvKT!z2?GLGq*ql7c=99dK&OqCZtsMm+X3Bxc19WIUH@>%5sAVS_L+R2?>sx1R`(d)qTyERk zrrgFlq8{cR=U9r+!=dMENv0@R!%;pqJUsCLIDVQ5F z9R{qu@^<8UtJ%o{`J3mO(qMV@>$^2vtEy_TeAI9>+4|Bc)s;|Oa~fjDk0>ULJ2+rI zL}4fe4XDe7J{~L{r`M=!Y}=~^>(#}R-s9+W*tXa(2VuyMcRRc04Oqv1I*T3|No&qP zIcwi)B5uuDyT{kgP`~-WYBl%z>MCN2d47D`L}L}f6A6gxV4t|`_oA($%oM^8!z6J^_e;PEIRUM4P# z4@Lc=Q<07zaX#dqyk~_<-xbQ2w1zz@&bhxWXBs zd^QL2uzF+_476^2vI?;-G8Sr#=RndE_32*3ao(){WMIGNx-`xF<;S|Zc%wlR?{ zwe~tAb?~v+%Z@M%Hr9&_!63m&IoQl`6t}-1C*qQ$y5FN)N6GFxcEJYUhfASuWHP^u bUa?Xy;{W>->+a>S;=;oq>V%;Y0;{AVW_lU}MUh-;*p@xR{xw7?`A(_A$q77yQFGlX0>` zPcdtwBC~qvbc0$((TN^>+nw6P_c8KtG2dWdW{zcGZew1*S>Q|{^YnsBA=c?h%#125 z8qA@L?On_u%ml>DK+FQftU$~L#Oy%K0mPg@%mu{UK+FTgyg1g3s-6%|uk@ zr6yXIGTt@n{jpNJkH9-idoJF27hAmQK8)8d&}D3fRrnm{yq6W3qzg*gCh zjIxYtOwocqo>c_rLQSuC%LK)Hem)s*+DH>dhaz%HCMOI({$#Q=Ol#nZS35~k!BKh5 zHx`m#(PkWmYPbRT4LMFvkrf%-TN5d4e7|1fxcYMlwa5_#ND zq#fDEJCtlrQ*&tp053i`v^8Ek5vz2Bx3upnGgPATT!+hZ37%7woT}CSAd4N%%e&#P zI<|7u%i}~g#^LE4S3PwhIpviWlav0+&ie5z@WMVb(T&Y&_c)=oVgoBM~US z-oS@V(T1{l(#F8AnfDUWvS;zF+g7X#gL$H-Av0`~8dcd?`qZv6a{sdVVx=R26 delta 979 zcmaKrT}TvB6vxjwcUM=}&D7nt+`hKPb_y5o?Cz|qETtup1_hN55!k9IWe-KvQ$3i( z6b0q>!Oc>NBA<-NqA7yH3VH~7REUfvsLXtbjJ_VEv)Tvs&@jK@aGC$y|M}0kot;;( z^Xp~o4tTZ#@U?PfsN9Zc=sF7ioccDNTSjovE__8F>kV-je6W^8MC9Rp?7%U~ zkWDABhLTiFZLk(5#5Q=yee6L$o)shMTJLlNs-awbc4Yn8bz!lSvK}_8dT)`Ivkr98 zh-y}AsLYbWk`7BcEtzA{+TV)FC6JTTEci4A2WyXGjo}FOeqs!<}(YJh0G#mF%x8# zFiRPYDYJWzE^8a95c%MR2BM7U;uJYgYNI5c!Ckl-=iwN9fIirV51;{_h+#31t}UH* zVsA)=&f`p|6V0L0H#z+vH0u9n@UD6eZd?d{UobnMK~Vh-`l3KpSVqH!8IcB8=C8^y z!cnQ3`gBblIH$W^vZ^}5w_$7R^-M}Rl6pjq+|ZBPLj!t^D54$Ugr|U`Vn2=J7I>OX z>F(@9&aU|djlrPb4~rV^!7CWNF|pDG$qkr0$>6 vcy%mhW=k0P diff --git a/apps/tmpl/creorga/modules/childs/js/child.js b/apps/tmpl/creorga/modules/childs/js/child.js index 39fd720..4fed6f4 100644 --- a/apps/tmpl/creorga/modules/childs/js/child.js +++ b/apps/tmpl/creorga/modules/childs/js/child.js @@ -56,7 +56,7 @@ function initdata() { var xcheck = $('#childs_checkservicenumber').val().replace(/\s/g,'').substring(0,8); var bday = $('#childs_birthday').val(); - var xcheckdate = xcheck.substring(6,8) + "." + xcheck.substring(4,6) +"."+xcheck.substring(0,4); + var xcheckdate = xcheck.substring(0,4)+'-' + xcheck.substring(4,6) + '-' + xcheck.substring(6,8); if (bday != xcheckdate) { $('#childs_birthday').val(xcheckdate); setborderdates(); @@ -118,9 +118,9 @@ function loadplantemplates(){ function setborderdates() { var minamonths = parent.appdb.dbquery("select minage,maxage from creche LIMIT 1;"); - var bday = encodeparam($('#childs_birthday').val(),'date').replace(/'/g,''); - var centrydate = encodeparam($('#childs_entrydate').val(),'date').replace(/'/g,''); - var cleavedate = encodeparam($('#childs_leavedate').val(),'date').replace(/'/g,''); + var bday = $('#childs_birthday').val(); + var centrydate = $('#childs_entrydate').val(); + var cleavedate = $('#childs_leavedate').val(); var dtbday = new Date(bday); var dtminentrydate = new Date(dtbday.getFullYear(),dtbday.getMonth() + parseInt(minamonths.sqldata[0].minage), dtbday.getDate()); var today = new Date(); @@ -138,8 +138,8 @@ function setborderdates() { $('#childs_leavedate').val(dtmaxleavedate.toISOString().substring(0,10)); } - centrydate = encodeparam($('#childs_entrydate').val(),'date').replace(/'/g,''); - cleavedate = encodeparam($('#childs_leavedate').val(),'date').replace(/'/g,''); + centrydate = $('#childs_entrydate').val(); + cleavedate = $('#childs_leavedate').val(); parent.appdb.dbexec("update childs set birthday=date('"+bday+"'),entrydate=date('"+centrydate+"'),leavedate=date('"+cleavedate+"') where uuid='"+pconfig.uuid+"';"); } diff --git a/apps/tmpl/creorga/modules/staff/js/coworker.js b/apps/tmpl/creorga/modules/staff/js/coworker.js index 2a525ea..7b01ad2 100644 --- a/apps/tmpl/creorga/modules/staff/js/coworker.js +++ b/apps/tmpl/creorga/modules/staff/js/coworker.js @@ -21,7 +21,7 @@ function initdata() { if (pconfig == null) { pconfig = {}; } - + //update vacancycalendar set vacyear=strftime('%Y',datefrom) where vacyear is null; if (!pconfig.year) { pconfig.year=new Date().getFullYear(); @@ -337,7 +337,7 @@ function dlg_vacancy(uuid, type) { }; if (type == 'upd') { - var evsql = "select uuid,vacdatefrom,vacdateto,timefrom,description,staffuuid,case when hours = '0.00' then '" + maxdayhours +"' else hours end as hours,accepted from (SELECT uuid, strftime(\"%d.%m.%Y\",datefrom) as vacdatefrom, strftime(\"%d.%m.%Y\",dateto) as vacdateto, timefrom, description, '"+pconfig.uuid+"' as staffuuid,type, printf(\"%.2f\",cast((cast(strftime(\"%s\",timeto) as int)- cast(strftime(\"%s\",timefrom) as int))/3600 as real)) as hours,accepted FROM vacancycalendar where uuid='" + uuid.uuid + "');"; + var evsql = "select uuid,vacdatefrom,vacdateto,timefrom,description,staffuuid,case when hours = '0.00' then '" + maxdayhours +"' else hours end as hours,accepted from (SELECT uuid, datefrom as vacdatefrom, dateto as vacdateto, timefrom, description, '"+pconfig.uuid+"' as staffuuid,type, printf(\"%.2f\",cast((cast(strftime(\"%s\",timeto) as int)- cast(strftime(\"%s\",timefrom) as int))/3600 as real)) as hours,accepted FROM vacancycalendar where uuid='" + uuid.uuid + "');"; evdata = parent.appdb.dbquery(evsql); evdata = evdata.sqldata[0]; @@ -430,12 +430,12 @@ function save_vacancy() { var savesql = ""; if (type == 'ins') { savesql = "INSERT INTO vacancycalendar (uuid, datefrom, dateto, timefrom, timeto, description, staffuuid, type,vacyear) VALUES " - +"('" + parent.appdb.generate_uuid() + "', date("+encodeparam(evsvdata.datefrom, 'date')+"), date("+encodeparam(evsvdata.dateto, 'date')+"), "+encodeparam(evsvdata.timefrom, 'text')+", strftime(\"%H:%M\",time("+encodeparam(evsvdata.timefrom, 'text')+",'+"+evsvdata.hours+" hours')), "+encodeparam(evsvdata.description, 'text')+", "+encodeparam(evsvdata.staffuuid, 'text')+","+evsvdata.type+","+encodeparam(evsvdata.datefrom, 'year')+");"; + +"('" + parent.appdb.generate_uuid() + "', date('"+evsvdata.datefrom+"'), date('"+evsvdata.dateto+"'), "+encodeparam(evsvdata.timefrom, 'text')+", strftime(\"%H:%M\",time("+encodeparam(evsvdata.timefrom, 'text')+",'+"+evsvdata.hours+" hours')), "+encodeparam(evsvdata.description, 'text')+", "+encodeparam(evsvdata.staffuuid, 'text')+","+evsvdata.type+",strftime(\"%Y\",date('"+evsvdata.datefrom+"')))"; } else { - savesql = "UPDATE vacancycalendar SET vacyear=" + encodeparam(evsvdata.datefrom, 'year') + ", datefrom = date("+encodeparam(evsvdata.datefrom, 'date')+"), dateto = date("+encodeparam(evsvdata.dateto, 'date')+"), timefrom = "+encodeparam(evsvdata.timefrom, 'text')+", timeto = strftime(\"%H:%M\",time("+encodeparam(evsvdata.timefrom, 'text')+",'+"+evsvdata.hours+" hours')), description = "+encodeparam(evsvdata.description, 'text')+", staffuuid = "+encodeparam(evsvdata.staffuuid, 'text')+", type = "+evsvdata.type+" WHERE uuid = '"+evsvdata.uuid+"';"; + savesql = "UPDATE vacancycalendar SET vacyear=strftime(\"%Y\",date('"+evsvdata.datefrom+"')), datefrom = date('"+evsvdata.datefrom+"'), dateto = date('"+evsvdata.dateto+"'), timefrom = "+encodeparam(evsvdata.timefrom, 'text')+", timeto = strftime(\"%H:%M\",time("+encodeparam(evsvdata.timefrom, 'text')+",'+"+evsvdata.hours+" hours')), description = "+encodeparam(evsvdata.description, 'text')+", staffuuid = "+encodeparam(evsvdata.staffuuid, 'text')+", type = "+evsvdata.type+" WHERE uuid = '"+evsvdata.uuid+"';"; } - // console.log("save vacancy"); - // console.log(savesql); + //console.log("save vacancy"); + //console.log(savesql); parent.appdb.dbexec(savesql); load_table_vacancy(); -- 2.39.5