EmployÃ©(e)

+ [% IF creorga.modules.creche.menu %] + [% END %] @@ -72,7 +72,7 @@ - + diff --git a/apps/tmpl/creorga/modules/staff/coworker.tt b/apps/tmpl/creorga/modules/staff/coworker.tt index e144482..6ec5195 100644 --- a/apps/tmpl/creorga/modules/staff/coworker.tt +++ b/apps/tmpl/creorga/modules/staff/coworker.tt @@ -112,13 +112,7 @@

Compte Bancaire

- +

diff --git a/apps/tmpl/creorga/modules/staff/js/coworker.js b/apps/tmpl/creorga/modules/staff/js/coworker.js index 86df649..ce33f08 100644 --- a/apps/tmpl/creorga/modules/staff/js/coworker.js +++ b/apps/tmpl/creorga/modules/staff/js/coworker.js @@ -9,7 +9,7 @@ var curfreq ={}; var maxdayhours = null; var maxhalfdayhours = null; var tblvac = null; -//var lictype = parent.apppref.getpreference("support.lictype"); + function initdata() { load_helpers(); @@ -22,7 +22,7 @@ function initdata() { pconfig = {}; } parent.appdb.dbexec("update vacancycalendar set vacyear=strftime('%Y',datefrom) where vacyear is null;"); - //"get CoWorker cfg:" +JSON.stringify(pconfig) + "\n"); + if (!pconfig.year) { pconfig.year=new Date().getFullYear(); } @@ -30,7 +30,7 @@ function initdata() { pconfig.printlayout = 'list'; parent.apppref.setpreference("coworker",pconfig); } - var cdatasql = "SELECT jobtitle, prename, surname, address, zip, city, country, entrydate, exitdate, iban, bic, accountname, phone, email, uuid,color,weekhours,maxdayhours,case when password is not null and length(password) > 3 then 1 else 0 end as passwordset FROM staff where uuid='" + pconfig.uuid + "';"; + var cdatasql = "SELECT jobtitle, prename, surname, address, zip, city, country, entrydate, exitdate, iban, bic, accountname, phone, email, uuid,color,weekhours,maxdayhours FROM staff where uuid='" + pconfig.uuid + "';"; var cdata = parent.appdb.dbquery(cdatasql); cdata = cdata.sqldata[0]; for (var ci in cdata) { @@ -39,34 +39,15 @@ function initdata() { } } - - // var crdata = parent.appdb.dbquery("select stafflist from creche;"); - // if ((crdata) && (crdata.sqldata[0].stafflist == "1")){ - // $("#pwddata").hide(); - // } - // if (cdata) { - // set_infoheader(cdata.prename + " " + cdata.surname); - // } $('#staff_color').minicolors({theme:'bootstrap'}); set_selectyears(); - //load_staff_selection('staffuuid'); - if (pconfig && pconfig.activetab) { $('a[href="#'+pconfig.activetab+'"]').tab('show'); }else{ $('a[href="#vacancy"]').tab('show'); pconfig.activetab = 'vacancy'; } - -// if (pconfig && pconfig.vacancyunit){ -// //dump("has vacancy unit:" + pconfig.vacancyunit + "\n"); -// $('#vacancy_unit').val(pconfig.vacancyunit); -// }else { pconfig.vacancyunit = "hours"; -// $('#vacancy_unit').val("days"); -// } - - } @@ -550,7 +531,7 @@ function saveyearvacdays() { [% END %] [% IF creorga.modules.staff.planning %] function load_event_data() { - //dump("Load event Table!\n"); + var where = new Array(); where.push(" st.uuid in ('"+ pconfig.uuid + "')"); @@ -582,8 +563,7 @@ function load_event_data() { for (var c in caldata) { var tblrow = ""; tblrow += ''; - //tblrow += ""+caldata[c].description+"" + caldata[c].description + ""; - //tblrow += "" + caldata[c].staffnames + ""; + tblrow += "" + caldata[c].tbldatefrom + ""; tblrow += "" + caldata[c].timefrom + "- " + caldata[c].timeto + ""; @@ -604,13 +584,12 @@ function load_event_data() { tblrow += "" + rule2.toText() + ""; } catch (ex){ - //"ERROR! loading data!" + ex + " FREQ:" + freq2 + "\n"); + } tblrow += ""; tblbody.push(tblrow); } - - //load table + $("#tbl_activity").append(tblbody.join('')); $("#tbl_activity").append(""); @@ -657,8 +636,7 @@ function dlg_event(uuid, type) { freq: '', staffname: $("#staff_prename").val() + " " + $("#staff_surname").val() }; - //jsdump(JSON.stringify(pconfig) + "\n"); - //jsdump(JSON.stringify(evdata) + "\n"); + if (type == 'upd') { var evsql = "SELECT uuid, strftime(\"%d.%m.%Y\",datefrom) as datefrom, strftime(\"%d.%m.%Y\",dateto) as dateto, timefrom, timeto, description, location, color, freq, '"+ pconfig.uuid+"' as staffuuid FROM eventcalendar ev left join staffplanning st on (ev.uuid=st.eventcalendaruuid) where ev.uuid='" + uuid.uuid + "' group by ev.uuid;"; evdata = parent.appdb.dbquery(evsql); @@ -676,21 +654,9 @@ function dlg_event(uuid, type) { } for (var w in evdata) { if ($("#frmeditevent #" + w)) { - // if (w == 'staffuuid') { - // if (evdata[w] == '') { - // $("#frmeditevent #" + w).multiselect('select',[]); - // } else { - // $("#frmeditevent #" + w).multiselect('select',evdata[w].split(',')); - // } - - // } - // else if (w == 'color') { - // $("#frmeditevent #color").val(evdata[w]); - // $('#frmeditevent #color').minicolors('value',{color: evdata[w]}); - // } - // else { + $("#frmeditevent #" + w).val(evdata[w]); - // } + } } if ((evdata.freq == 'weekly') && (evdata.byday)) { @@ -931,26 +897,5 @@ function setfreq() { } -// function load_staff_selection(objid,option){ -// var stdata = parent.appdb.dbquery("select uuid, coalesce(surname,'') || ' ' || coalesce(prename,'') as name,case when color is null then '#000' else color end as color from staff order by surname,prename"); - -// stdata = stdata.sqldata; -// for (var s in stdata){ -// $('#' + objid).append(''); -// } - -// var copt = {}; -// if (option) { -// copt = option; -// } -// copt['enableHTML'] = true; -// copt['nonSelectedText']="SÃ©lectionner un(e) employÃ©(e)..."; -// copt['numberDisplayed']=5; -// copt['allSelectedText']='Tous'; -// copt['nSelectedText']=' selections'; - -// $('#' + objid).multiselect(copt); - -// } diff --git a/apps/tmpl/skeleton/index.tt b/apps/tmpl/skeleton/index.tt index 64d7749..44a89b7 100644 --- a/apps/tmpl/skeleton/index.tt +++ b/apps/tmpl/skeleton/index.tt @@ -4,24 +4,24 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + DKS - Apps @@ -58,8 +58,8 @@

Editer ActivitÃ©

RÃ©currence - - pas de rÃ©currence - quotidienne - hebdomaire - mensuelle - -

Supprimer ActivitÃ©

Editer CongÃ©

Supprimer CongÃ©

Supprimer un collaborateur

RÃ©currence - -