bugfix childs load plantemplates

diff --git a/apps/data/db/lechatpotte.sqlite b/apps/data/db/lechatpotte.sqlite
index 23e32a2..b55d8f2 100644 (file)
Binary files a/apps/data/db/lechatpotte.sqlite and b/apps/data/db/lechatpotte.sqlite differ

diff --git a/apps/data/db/underatert.sqlite b/apps/data/db/underatert.sqlite
index be78aee..6aa861c 100644 (file)
Binary files a/apps/data/db/underatert.sqlite and b/apps/data/db/underatert.sqlite differ

diff --git a/apps/tmpl/creorga/modules/childs/js/child.js b/apps/tmpl/creorga/modules/childs/js/child.js
index 8a7b28c..9b8bb78 100644 (file)
--- 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('<li style="font-weight: bold; padding-left: 5px;">multiple</li>');
+      for (var i in xdata){
+   
+        $("#plantemplates").append('<li><a href="javascript:dlg_planning({\'uuid\':\'\'},\'insproposal\',\''+xdata[i].uuid+'\');">'+ xdata[i].templatename+'</a></li>');  
+      } 
+    $("#plantemplates").append('<li role="separator" class="divider"></li>');
+    $("#plantemplates").append('<li style="font-weight: bold; padding-left: 5px;">simple</li>');
+    for (var i in xdata){
+      //console.log("m: " + i);
+      $("#plantemplates").append('<li><a href="javascript:dlg_planning({\'uuid\':\'\'},\'ins\',\''+xdata[i].uuid+'\');">'+ xdata[i].templatename+'</a></li>');  
+    }
+    $("#plantemplates").append('<li><a href="javascript:dlg_planning({\'uuid\':\'\'},\'ins\');">Plan Vide</a></li>');
+}
+
 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 '<button type=\"button\" class=\"btn btn-primary\" onclick=\"dlg_planning({''uuid'':''' || plan.uuid || '''},''upd'');\" title=\"editer\"><span class=\"glyphicon glyphicon-pencil\"></span></button> <button type=\"button\" class=\"btn btn-danger\" onclick=\"dlg_planning({''uuid'':''' || plan.uuid || '''},''del'');\" title=\"supprimer\"><span class=\"glyphicon glyphicon-remove\"></span></button> ' 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('<li style="font-weight: bold; padding-left: 5px;">multiple</li>');
-      for (var i in xdata){
-        $("#plantemplates").append('<li><a href="javascript:dlg_planning({\'uuid\':\'\'},\'insproposal\',\''+xdata[i].uuid+'\');">'+ xdata[i].templatename+'</a></li>');  
-      } 
-    }
-    $("#plantemplates").append('<li role="separator" class="divider"></li>');
-    $("#plantemplates").append('<li style="font-weight: bold; padding-left: 5px;">simple</li>');
-    for (var i in xdata){
-      $("#plantemplates").append('<li><a href="javascript:dlg_planning({\'uuid\':\'\'},\'ins\',\''+xdata[i].uuid+'\');">'+ xdata[i].templatename+'</a></li>');  
-    }
-    $("#plantemplates").append('<li><a href="javascript:dlg_planning({\'uuid\':\'\'},\'ins\');">Plan Vide</a></li>');
-  } 
-}
\ 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 (file)
--- a/apps/tmpl/creorga/modules/staff/coworker.tt
+++ b/apps/tmpl/creorga/modules/staff/coworker.tt
@@ -173,7 +173,7 @@
                         
                       </div>
                       <div class="form-group">
-                        <label for="vacancy_total">congé normale ouvert</label>
+                        <label for="vacancy_total">congé normale restant</label>
                         
                         <div class="input-group" style="width: 120px;">
                           <input type="text" id="vacancyyeartotalopen" class="form-control" value="" disabled>