From: kilian Date: Wed, 30 Sep 2020 12:17:54 +0000 (+0200) Subject: v20200929 X-Git-Tag: 1.0.15~11 X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=049941d944de232869b9782fca4d4e7190b097c2;p=pot_lu.git v20200929 --- 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 325b43d8..2f0e87f3 100644 Binary files a/app/static/css/fonts/pot.ttf and b/app/static/css/fonts/pot.ttf differ diff --git a/app/static/css/fonts/pot.woff b/app/static/css/fonts/pot.woff index 19334e82..dbc69a9a 100644 Binary files a/app/static/css/fonts/pot.woff and b/app/static/css/fonts/pot.woff differ diff --git a/app/static/css/icons.css b/app/static/css/icons.css index 5f02d3a7..2d6fc0ed 100644 --- a/app/static/css/icons.css +++ b/app/static/css/icons.css @@ -1,9 +1,9 @@ @font-face { font-family: 'pot'; src: - url('fonts/pot.ttf?cyqpff') format('truetype'), - url('fonts/pot.woff?cyqpff') format('woff'), - url('fonts/pot.svg?cyqpff#pot') format('svg'); + url('fonts/pot.ttf?8s8vvb') format('truetype'), + url('fonts/pot.woff?8s8vvb') format('woff'), + url('fonts/pot.svg?8s8vvb#pot') format('svg'); font-weight: normal; font-style: normal; font-display: block; @@ -24,6 +24,15 @@ -moz-osx-font-smoothing: grayscale; } +.icon-category:before { + content: "\e97d"; +} +.icon-vacancydays:before { + content: "\e97e"; +} +.icon-sector:before { + content: "\e97f"; +} .icon-lock:before { content: "\e97b"; } diff --git a/app/tmpl/index.tt b/app/tmpl/index.tt index 168e26a6..fdcfafc0 100644 --- a/app/tmpl/index.tt +++ b/app/tmpl/index.tt @@ -1,4 +1,4 @@ -[% appversion = '0.9.9.5' %] +[% appversion = '0.9.9.6' %] 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 %]