From a35f6862aeac70b6497d1e305662acc4ee47a9db Mon Sep 17 00:00:00 2001 From: Kilian Saffran Date: Wed, 15 May 2019 11:42:12 +0200 Subject: [PATCH] bugfix childs load plantemplates --- apps/data/db/lechatpotte.sqlite | Bin 1541120 -> 1541120 bytes apps/data/db/underatert.sqlite | Bin 2667520 -> 2667520 bytes apps/tmpl/creorga/modules/childs/js/child.js | 49 ++++++++++--------- apps/tmpl/creorga/modules/staff/coworker.tt | 2 +- 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/apps/data/db/lechatpotte.sqlite b/apps/data/db/lechatpotte.sqlite index 23e32a24f8fbeb667995cb7827a909d221711cb2..b55d8f2862c7c6c574c16efe9ad54e202025576f 100644 GIT binary patch delta 343 zcmZqZh->JGn;^}YK2gS*HJw3EC!jHtTL<$f{Pi> zFdkx@$ymVX&M3$5m7!{)qx9qnhghbE%CKropCrburDl4NdVW|EX@Zm6rl9LhLd&`V6E{fi7M5VHX>I}mdKF((jn0Wmia^8hg~ z5c2^sKM)H5u^YU9z{AMI$X2f_ z#~>*=U4e^RDlsIrxJ1DSLK+zuTIw1Y>l&IuSf+56xvsGxF`hu^Q!uc!GBmU@G-}^s MDYku!rMQn50FC%zwg3PC delta 194 zcmZqZh->JGn;^}YJW-{N)fiOtofEc`LZbF&4RGavM+3_QWLh6vg{PR#fnoP!D(J(Y9ltH2e*7W$%EZ< zR16q>WG+m37q9p1aVzaMeM*1O^EAyS$#3$4?gVG%aa3zNiE%@kZmneb!pZx#kmbB3 zoLa>be$}tIvgDRs*PAtXk*bfE4ET=){})(L9>|4HdVZ#d#e{C$uDD?mP&OWL@Y-3 zLrrZZ(mkeQNzBzWg}pxaC#i0(jYelmZ49BE|FZu1gRaug^v<{=OeZ4?6Bfd&->ADP z{!>32T%Iysb#^hfNx057m9`goqvT%XWov8Pzc-sEsicMrL^P~_Pcghygv>AAzLN>J f{XV3PLp}K{@#)%M8ra&5 delta 408 zcmX}mKS)AR6bA5f?o}(x>ZO^fsnt_o6huUSKm^4hqAAHGf?R@zpr9aV(jgk{1#uy8 zFllLMDxOnAOG`^rR4z@04YjoQ>EQ4?2M!+}r|@;j1vm|G#0+LQQq14wxw0@PZ^%o_ zBwwg3kL8A(l}_;?YN8~zL_%o%$@hHDJDg!Z{n9=?B79(`-6~aPo2t0Nx^=P0Nhyew z`Noshdx9r?hDNK+&LgZRQEE5W_?wqFB$D(;ReqqVHMNF=I?HlQ2#+$e99Mg?AAqYbRMqv!b zq4`e~Vpby;k2aJ$81|@C-G0>^o3`R^ab9UZ`n0v4Hm)5GmO4pY&D8C;?Nlq;8i$s? IV$`?)0XgoKUjP6A diff --git a/apps/tmpl/creorga/modules/childs/js/child.js b/apps/tmpl/creorga/modules/childs/js/child.js index 8a7b28c..9b8bb78 100644 --- a/apps/tmpl/creorga/modules/childs/js/child.js +++ b/apps/tmpl/creorga/modules/childs/js/child.js @@ -43,7 +43,7 @@ function initdata() { } var edt_height = wh; loadtextareas(edt_height); - + loadplantemplates(); if (pconfig && pconfig.activetab) { $('a[href="#'+pconfig.activetab+'"]').tab('show'); @@ -95,6 +95,27 @@ function savetime(obj){ } +function loadplantemplates(){ + //console.log('plantemplate'); + + var xdata = parent.appdb.dbquery("select uuid,templatename from planningtemplate order by templatename;"); + xdata = xdata.sqldata; + //console.log($("#plantemplates").html()); + $("#plantemplates").html(""); + $("#plantemplates").append('
  • multiple
    • '); + for (var i in xdata){ + + $("#plantemplates").append('
  • '+ xdata[i].templatename+'
    • '); + } + $("#plantemplates").append(''); + $("#plantemplates").append('
  • simple
    • '); + for (var i in xdata){ + //console.log("m: " + i); + $("#plantemplates").append('
  • '+ xdata[i].templatename+'
    • '); + } + $("#plantemplates").append('
  • Plan Vide
    • '); +} + function setborderdates() { var minamonths = parent.appdb.dbquery("select minage,maxage from creche LIMIT 1;"); var bday = encodeparam($('#childs_birthday').val(),'date').replace(/'/g,''); @@ -147,6 +168,7 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { }); function load_table_presence() { + var plandatasql = "SELECT ' ' AS action, grp.grpname, strftime('%d.%m.%Y',plan.datebegin) || ' - ' || strftime('%d.%m.%Y',plan.dateend) AS planningdaterange,"; var wda = ['mon','tue','wed','thu','fri','sat']; @@ -157,7 +179,7 @@ function load_table_presence() { plandatasql += awda.join(',') + " FROM planning plan LEFT JOIN groups grp ON ( plan.groupuuid=grp.uuid) WHERE plan.childuuid='" + pconfig.uuid + "' ORDER BY plan.datebegin, plan.dateend;"; var plandata = parent.appdb.dbqueryarray(plandatasql); - + var headerdata = getlabels(plandata.sqlhead.join(",")); $("#tbl_planning").html(""); @@ -175,7 +197,7 @@ function load_table_presence() { "filter": false, "destroy": true }); - loadplantemplates(plandata.sqldata.length); + } @@ -285,6 +307,7 @@ function load_table_files(){ }); } + function dlg_cautionstatus(objuuid,type){ //TODO: dlg_addcautionstatus //dump("Caution: " + type +" " + objuuid.uuid + +"\n"); @@ -925,23 +948,3 @@ function save_file(){ } [% END %] -function loadplantemplates(plarows){ - //jsdump("plarows:" + plarows); - var xdata = parent.appdb.dbquery("select uuid,templatename from planningtemplate order by templatename;"); - xdata = xdata.sqldata; - if (xdata.length > 0){ - $("#plantemplates").html(""); - if ((!plarows) || (plarows == 0)){ - $("#plantemplates").append('
  • multiple
    • '); - for (var i in xdata){ - $("#plantemplates").append('
  • '+ xdata[i].templatename+'
    • '); - } - } - $("#plantemplates").append(''); - $("#plantemplates").append('
  • simple
    • '); - for (var i in xdata){ - $("#plantemplates").append('
  • '+ xdata[i].templatename+'
    • '); - } - $("#plantemplates").append('
  • Plan Vide
    • '); - } -} \ No newline at end of file diff --git a/apps/tmpl/creorga/modules/staff/coworker.tt b/apps/tmpl/creorga/modules/staff/coworker.tt index 77fd2ba..c5d0e9a 100644 --- a/apps/tmpl/creorga/modules/staff/coworker.tt +++ b/apps/tmpl/creorga/modules/staff/coworker.tt @@ -173,7 +173,7 @@
    - +
    -- 2.39.5