From 049941d944de232869b9782fca4d4e7190b097c2 Mon Sep 17 00:00:00 2001 From: kilian Date: Wed, 30 Sep 2020 14:17:54 +0200 Subject: [PATCH] v20200929 --- app/static/css/fonts/pot.svg | 3 + app/static/css/fonts/pot.ttf | Bin 37056 -> 37936 bytes app/static/css/fonts/pot.woff | Bin 37132 -> 38012 bytes app/static/css/icons.css | 15 ++++- app/tmpl/index.tt | 2 +- app/tmpl/module/admin/companies.js | 9 ++- app/tmpl/module/admin/pnl_basedata.tt | 14 ++--- app/tmpl/module/admin/sectors.js | 81 ++++++++++++++++++++++++++ app/tmpl/module/admin/vacancydays.js | 80 +++++++++++++++++++++++++ app/tmpl/module/admin/vacancytypes.js | 80 +++++++++++++++++++++++++ app/tmpl/module/index.tt | 3 + app/tmpl/module/profile.tt | 54 ----------------- app/tmpl/module/sectors.tt | 41 +++++++++++++ app/tmpl/module/vacancydays.tt | 41 +++++++++++++ app/tmpl/module/vacancytypes.tt | 41 +++++++++++++ 15 files changed, 397 insertions(+), 67 deletions(-) create mode 100644 app/tmpl/module/admin/sectors.js create mode 100644 app/tmpl/module/admin/vacancydays.js create mode 100644 app/tmpl/module/admin/vacancytypes.js delete mode 100644 app/tmpl/module/profile.tt create mode 100644 app/tmpl/module/sectors.tt create mode 100644 app/tmpl/module/vacancydays.tt create mode 100644 app/tmpl/module/vacancytypes.tt diff --git a/app/static/css/fonts/pot.svg b/app/static/css/fonts/pot.svg index a757287e..0858544e 100644 --- a/app/static/css/fonts/pot.svg +++ b/app/static/css/fonts/pot.svg @@ -132,4 +132,7 @@ + + + \ No newline at end of file diff --git a/app/static/css/fonts/pot.ttf b/app/static/css/fonts/pot.ttf index 325b43d84407c0373b5c514328c648e3b92a5785..2f0e87f327ea9c9fb80b887bcd3865b12b9ea08c 100644 GIT binary patch delta 1159 zcmYjROKclu5dLR(z3YviYwyDjP3>KKcM~UZ{M=1(;#Sb|h|?I-HVvYPSZx{;<)tQ# z5>d&K+6!qRYDg3W2Z{ixJs?$zDiwr84iOhnFMv33f(x%RFR4kHb&A9<&CLIOGynYm z%&d0j1M2Q=szHDd;vp-9CYkD~o?IZrevHiLC}ZcRYjeuTH!LA=2=VEO+WZ{aAY#Y5 zC#IG!{yYz2_+`NHFTBd7DbL1=LJ|XMx;DPu|ZF+q8qunu{{XOs|`0HkG^CG{TT-Mh(II~B|7OK-FQ$?1w8-?XDg;{>Z+guN|;tnU1KFt z&gZOR!T67-mf_f5zPNZsoP13jSp)$d?C16#IQr*XaO?&6seJZq8Rg*}hof?ihDLt> zAux$a;q+y@ckz^P2RY>Ft^MDxZ#Kj6$nXJ)wG()>L$A;~*vvtEpdu@WQDs%bOoMG@ z!D?d8fgH>I51EF^a(;(2>@tQbk3$-kZONDcIry}XE0@sH!2C3&dh)S6?7N zN7LzgE*Gy1zc|Tq1A(5Ng;L3|OQms5qvwOc&9SlWmV`E5?tdzB{OPsc-oCjkH5vQ$ z>eWWT-#;_+eYFagK$0r?e5p^p{7aWS#OQ7uvLT z^>En3^AgX4vuHC4c`?bgweruWKr?%LO%y8D#qqHr55OlB#k|6C11v*d1e&HJ%8}M+ z!|jiK_ceeL>Iw|C$gWJv*UiP^EZp-%e7@wLqSx0MSE~ul#VC=2ByD-v_V$;PdWd(& z)t%xb}%sXYXCJUH)a-lRom diff --git a/app/static/css/fonts/pot.woff b/app/static/css/fonts/pot.woff index 19334e82ac69cb2e8d4f3f70b6310a852c4cef05..dbc69a9a754360f16c975e220f8237cc06ddee6b 100644 GIT binary patch delta 1195 zcmYjQU1%It6uxI>c4jC0JG(nGyU}!ac6Vly%}@7tCc4R5v<;f1S&eO4F=9fSW)1nH zNn@ggEwnGj*qA0Eq7N3W&^`!4D5wbbA&8*#MMc3UMG*DL2mc^RJ$D+x3*Wi-eCNAA z=bV|9cbMIqjPhc&r-uN+v2l@joH3cyjXiGv;Y#^-OumcrS|9RaO6q&v2yBE z1+jaJa!j6Ds2BEkflEzDCob5X3r|b8kVBr`+W+m}ZC!x?8|&z(<@1TY!KWs8p*L{&@O-&!*yZwAGRe*bgPS8G?G35qSf%^X z=+VbkJ3G5(bIe5im&=#y0e|=O^taV2oCjI%D-_CI$)xP{X`&i^xi-EvH&8!5qN*+~ zerU3WR_*4?37Mu^(#D*5Pm~k=8hF4~J z#VuBOHWqBpJnj}kk{+x}E{}h4pW%2lBc)rOai^JH&))J`t^{g;`9VPmjG(0EillaxUv~vyAV(CaN860`O<$zyuQ|iR!t>c zoEk04@|K5hZhkhcheUTGk*KCpJa6cyb)6H9kifGou_mTtF3ho~oy+k7*eC29;?vFH zx1SGm{XslVFUj{?xBnr8C(dHMxMIVV?a396@zOB;cj>%6dzAzKv5Uw4?)m!uG33hj IORLx5U$R#1ssI20 delta 307 zcmeyff~jW_lUTXGn;Qco0}xE)Vc-VQ6AmyiPEMR6Hc>~oeo=C6VgUmKV+K$>1cb%I zE;FYm7K6n00QnqHERdd4nFbU)!obkw1H#!ip1#gVO-x~6=n(*_F#};KzYXUzfPz3V z4C!s83FQGEkjeAIKu0AS266&%K{=6DxrH{t}=@ z1u#CrvLi1sHx(#01*j$rgoBnG=`6@E2CA9xX5t@z#+u1KjNXhjn`baqb}57W3B(+t xik0#FHeVUIfkp$t?dfKkFnaQYesjjg%_sU}m1OPK*O= diff --git a/app/tmpl/module/admin/companies.js b/app/tmpl/module/admin/companies.js index 80915cd8..d70f20ba 100644 --- a/app/tmpl/module/admin/companies.js +++ b/app/tmpl/module/admin/companies.js @@ -3,6 +3,7 @@ schemata = "public"; currentview = null; let periodunits = [{"value":"week","text":"Semaine(s)"},{"value":"month","text":"Mois"}]; +let periodtypes = [{"value":"1-14","text":"1-14"},{"value":"15-49","text":"15-49"},{"value":">=50","text":">=50"}]; function initpage(){ companies.inittable(); staffgroups.inittable(); @@ -17,7 +18,7 @@ let companies ={ current_schemata: null, current_view: 'basedata', name: "companies", - choices:{"reportperiodunit":null,"payedpauses":null}, + choices:{"reportperiodunit":null,"payedpauses":null,"periodtypes":null}, initform: function(){ flatpickr("#reportperiodstart",{altInput: true, altFormat: "d.m.Y", @@ -37,7 +38,13 @@ let companies ={ showSearch: false, afterClose: function(){dataform.saveschemafield(document.getElementById('payedpauses'),'public');} }); + companies.choices["periodtypes"] = new SlimSelect({ + select: "#periodtypes", + showSearch: false, + afterClose: function(){dataform.saveschemafield(document.getElementById('periodtypes'),'public');} + }); dataform.fillselectlist(companies.choices["reportperiodunit"],periodunits,'value','text'); + dataform.fillselectlist(companies.choices["periodtypes"],periodtypes,'value','text'); }, inittable: function(){ companies.initform(); diff --git a/app/tmpl/module/admin/pnl_basedata.tt b/app/tmpl/module/admin/pnl_basedata.tt index f1771761..86f26f86 100644 --- a/app/tmpl/module/admin/pnl_basedata.tt +++ b/app/tmpl/module/admin/pnl_basedata.tt @@ -84,6 +84,11 @@
+
+ + +
@@ -104,14 +109,7 @@
- +
diff --git a/app/tmpl/module/admin/sectors.js b/app/tmpl/module/admin/sectors.js new file mode 100644 index 00000000..135bb392 --- /dev/null +++ b/app/tmpl/module/admin/sectors.js @@ -0,0 +1,81 @@ + +schemata = "public"; +currentview = null; + +function initpage(){ + sector.inittable() +} + +let sector ={ + tbl: null, + initform: function(){ + + }, + inittable: function(){ + sector.initform(); + sector.tbl = new Tabulator("#tbl_sector", { + + height: "calc(100vh - 55px)", + layout: "fitDataFill", + selectable: 1, + rowClick:function(e, row){ + sector.edit(); + + }, + rowContext:function(e, row){e.preventDefault();}, + columns:[ + {title:"Type Periode",field:"periodtype",resizable:false}, + {title:"Secteur",field:"sector",resizable:false} + ] + }); + sector.gettbldata(); + }, + gettbldata: function(id){ + // postData("db.cgi", { "get": "companiesdata","schemata":"public"}).then(data => { + // companies.tbl.setData(data.result.sqldata).then(function(){ + // if (companies.current_company){ + // companies.tbl.table.selectRow(companies.current_company); + // } + // }); + // }); + }, + add: function(){ + + }, + confirmremove: function(){ + + }, + remove: function(){ + + }, + edit: function(){ + // let udata = companies.tbl.getSelectedData(); + // if (udata[0]) { + // companies.current_schemata = udata[0].schemata; + // dataform.cleanform2("companies",companies.choices); + // postData("db.cgi",{ "get": "company", "schemata":udata[0].schemata}).then(data => { + // dataform.fillformbydataclass2("companies",companies.choices,data.result.data);}); + // staffgroups.gettbldata(); + // worktimes.gettbldata(); + // users.gettbldata(); + // companies.setview(companies.current_view); + // } else { + // app.viewpanel('nodata'); + // } + }, + save: function(){ + // dataform.saveform("companies",schemata,null); + // app.viewpanel("tbl_companies"); + }, + // afterdeletecallback: function(data){ + // companies.gettbldata(); + // app.viewpanel("tbl_companies"); + // }, + setview: function(viewname){ + // let sel = companies.tbl.getSelectedData(); + // if (sel[0]){ + // companies.current_view = viewname; + // app.viewpanel(viewname); + // } + } +} diff --git a/app/tmpl/module/admin/vacancydays.js b/app/tmpl/module/admin/vacancydays.js new file mode 100644 index 00000000..55bca25b --- /dev/null +++ b/app/tmpl/module/admin/vacancydays.js @@ -0,0 +1,80 @@ + +schemata = "public"; +currentview = null; + +function initpage(){ + vacancydays.inittable(); +} + +let vacancydays ={ + tbl: null, + initform: function(){ + + }, + inittable: function(){ + vacancydays.initform(); + vacancydays.tbl = new Tabulator("#tbl_year", { + + height: "calc(100vh - 55px)", + layout: "fitDataFill", + selectable: 1, + rowClick:function(e, row){ + vacancydays.edit(); + + }, + rowContext:function(e, row){e.preventDefault();}, + columns:[ + {title:"Année",field:"year",resizable:false}, + ] + }); + vacancydays.gettbldata(); + }, + gettbldata: function(id){ + // postData("db.cgi", { "get": "companiesdata","schemata":"public"}).then(data => { + // companies.tbl.setData(data.result.sqldata).then(function(){ + // if (companies.current_company){ + // companies.tbl.table.selectRow(companies.current_company); + // } + // }); + // }); + }, + add: function(){ + + }, + confirmremove: function(){ + + }, + remove: function(){ + + }, + edit: function(){ + // let udata = companies.tbl.getSelectedData(); + // if (udata[0]) { + // companies.current_schemata = udata[0].schemata; + // dataform.cleanform2("companies",companies.choices); + // postData("db.cgi",{ "get": "company", "schemata":udata[0].schemata}).then(data => { + // dataform.fillformbydataclass2("companies",companies.choices,data.result.data);}); + // staffgroups.gettbldata(); + // worktimes.gettbldata(); + // users.gettbldata(); + // companies.setview(companies.current_view); + // } else { + // app.viewpanel('nodata'); + // } + }, + save: function(){ + // dataform.saveform("companies",schemata,null); + // app.viewpanel("tbl_companies"); + }, + // afterdeletecallback: function(data){ + // companies.gettbldata(); + // app.viewpanel("tbl_companies"); + // }, + setview: function(viewname){ + // let sel = companies.tbl.getSelectedData(); + // if (sel[0]){ + // companies.current_view = viewname; + // app.viewpanel(viewname); + // } + } +} diff --git a/app/tmpl/module/admin/vacancytypes.js b/app/tmpl/module/admin/vacancytypes.js new file mode 100644 index 00000000..10389631 --- /dev/null +++ b/app/tmpl/module/admin/vacancytypes.js @@ -0,0 +1,80 @@ + +schemata = "public"; +currentview = null; + +function initpage(){ + vacancytypes.inittable() +} + +let vacancytypes ={ + tbl: null, + initform: function(){ + + }, + inittable: function(){ + vacancytypes.initform(); + vacancytypes.tbl = new Tabulator("#tbl_vacancytype", { + + height: "calc(100vh - 55px)", + layout: "fitDataFill", + selectable: 1, + rowClick:function(e, row){ + vacancytypes.edit(); + + }, + rowContext:function(e, row){e.preventDefault();}, + columns:[ + {title:"Type",field:"vacancytype",resizable:false}, + ] + }); + vacancytypes.gettbldata(); + }, + gettbldata: function(id){ + // postData("db.cgi", { "get": "companiesdata","schemata":"public"}).then(data => { + // companies.tbl.setData(data.result.sqldata).then(function(){ + // if (companies.current_company){ + // companies.tbl.table.selectRow(companies.current_company); + // } + // }); + // }); + }, + add: function(){ + + }, + confirmremove: function(){ + + }, + remove: function(){ + + }, + edit: function(){ + // let udata = companies.tbl.getSelectedData(); + // if (udata[0]) { + // companies.current_schemata = udata[0].schemata; + // dataform.cleanform2("companies",companies.choices); + // postData("db.cgi",{ "get": "company", "schemata":udata[0].schemata}).then(data => { + // dataform.fillformbydataclass2("companies",companies.choices,data.result.data);}); + // staffgroups.gettbldata(); + // worktimes.gettbldata(); + // users.gettbldata(); + // companies.setview(companies.current_view); + // } else { + // app.viewpanel('nodata'); + // } + }, + save: function(){ + // dataform.saveform("companies",schemata,null); + // app.viewpanel("tbl_companies"); + }, + // afterdeletecallback: function(data){ + // companies.gettbldata(); + // app.viewpanel("tbl_companies"); + // }, + setview: function(viewname){ + // let sel = companies.tbl.getSelectedData(); + // if (sel[0]){ + // companies.current_view = viewname; + // app.viewpanel(viewname); + // } + } +} diff --git a/app/tmpl/module/index.tt b/app/tmpl/module/index.tt index d51ff5de..be6b4877 100644 --- a/app/tmpl/module/index.tt +++ b/app/tmpl/module/index.tt @@ -39,6 +39,9 @@
Entreprises + Secteurs + jours feriés + types de congés
[% END %] diff --git a/app/tmpl/module/profile.tt b/app/tmpl/module/profile.tt deleted file mode 100644 index 13e1f015..00000000 --- a/app/tmpl/module/profile.tt +++ /dev/null @@ -1,54 +0,0 @@ - - -[% quserdata = dksdb.query("select * from users where id='${session.id}';") %] -[% user = quserdata.get_all() %] -
-
- retour -
Profile
-
-
-
-
-
-
-
- données d'accès - -
-
- -
- - - -
-
- -
 
- - - -
-
-
- - -
-
-
-
-
- -
- - - -
- - - [% INCLUDE module/profile/dlgpassword.tt %] - [% INCLUDE module/profile/dlgusername.tt %] - - - diff --git a/app/tmpl/module/sectors.tt b/app/tmpl/module/sectors.tt new file mode 100644 index 00000000..5fbcb539 --- /dev/null +++ b/app/tmpl/module/sectors.tt @@ -0,0 +1,41 @@ + +
+
+ retour +
Configuration Secteurs
+ [% IF (session.usergroup == 'admin') %] + + [% END %] +
+
+[% IF (session.usergroup == 'admin') %] +
+
+
+
+
+
+ [% INCLUDE block/pnl_nodata.tt %] + +
+
+
+ +[% END %] diff --git a/app/tmpl/module/vacancydays.tt b/app/tmpl/module/vacancydays.tt new file mode 100644 index 00000000..14605ead --- /dev/null +++ b/app/tmpl/module/vacancydays.tt @@ -0,0 +1,41 @@ + +
+
+ retour +
Jours feriés
+ [% IF (session.usergroup == 'admin') %] + + [% END %] +
+
+[% IF (session.usergroup == 'admin') %] +
+
+
+
+
+
+ [% INCLUDE block/pnl_nodata.tt %] + +
+
+
+ +[% END %] diff --git a/app/tmpl/module/vacancytypes.tt b/app/tmpl/module/vacancytypes.tt new file mode 100644 index 00000000..2a617162 --- /dev/null +++ b/app/tmpl/module/vacancytypes.tt @@ -0,0 +1,41 @@ + +
+
+ retour +
Configuration Types de congés
+ [% IF (session.usergroup == 'admin') %] + + [% END %] +
+
+[% IF (session.usergroup == 'admin') %] +
+
+
+
+
+
+ [% INCLUDE block/pnl_nodata.tt %] + +
+
+
+ +[% END %] -- 2.39.5