From: kilian (ksmachome) Date: Wed, 4 Dec 2019 09:42:59 +0000 (+0100) Subject: v20191203 X-Git-Tag: 1.0.15~85 X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=08d039e32755a8a98d3a5390b17a734af8c9a0c2;p=pot_lu.git v20191203 --- diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..d1b19e16 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "pretty-formatter.formatting": false +} \ No newline at end of file diff --git a/backoffice/api/db.cgi b/backoffice/api/db.cgi index 5e529491..c9133873 100755 --- a/backoffice/api/db.cgi +++ b/backoffice/api/db.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/Users/kilian/perl5/perlbrew/perls/perl-5.24.1/bin/perl use strict; use lib ('./lib/perl5'); use lib ('./lib'); diff --git a/backoffice/api/file.cgi b/backoffice/api/file.cgi index 33d3bee8..f0af54da 100755 --- a/backoffice/api/file.cgi +++ b/backoffice/api/file.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/Users/kilian/perl5/perlbrew/perls/perl-5.24.1/bin/perl use strict; use lib ('./lib/perl5'); diff --git a/backoffice/api/index.cgi b/backoffice/api/index.cgi index 833a85db..619b1ac6 100755 --- a/backoffice/api/index.cgi +++ b/backoffice/api/index.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/Users/kilian/perl5/perlbrew/perls/perl-5.24.1/bin/perl use strict; use lib ('./lib/perl5'); use lib ('./lib'); diff --git a/backoffice/api/upload.cgi b/backoffice/api/upload.cgi index 47c62fbf..194fca86 100755 --- a/backoffice/api/upload.cgi +++ b/backoffice/api/upload.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/Users/kilian/perl5/perlbrew/perls/perl-5.24.1/bin/perl use strict; use lib ('./lib/perl5'); diff --git a/backoffice/index.cgi b/backoffice/index.cgi index 91b7ce8f..69ca6713 100755 --- a/backoffice/index.cgi +++ b/backoffice/index.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/Users/kilian/perl5/perlbrew/perls/perl-5.24.1/bin/perl use strict; use lib ('api/lib/perl5'); diff --git a/backoffice/tmpl/module/companies/index.js b/backoffice/tmpl/module/companies/index.js index 8abcef9b..fa6309ab 100644 --- a/backoffice/tmpl/module/companies/index.js +++ b/backoffice/tmpl/module/companies/index.js @@ -1,164 +1,192 @@ var tbl = null; [% sid = session.id %] -[% IF (session.usergroups.search('admin') != 1) %] +[% IF(session.usergroups.search('admin') != 1) %] [% qcompany = dksdb.query("select id_company from vw_userlist where id=$sid;") %] [% company = qcompany.get_all() %] -var idcompany = "[% company.0.id_company %]"; +var idcompany = "[% company.0.id_company %]"; [% ELSE %] -var idcompany=null; +var idcompany = null; [% END %] //var choice = {"submissionaccess":{"projects":null,"cdm":null,"cdm_requests":null}}; var tab_id_projects = null; var tab_id_cdms = null; var tab_id_cdm_requests = null; -function initpage(){ - [% IF (session.usergroups.search('admin') == 1) %] - // choice["submissionaccess"]["projects"] = new Choices('#projects',{ - // searchEnabled: false, - // itemSelectText: 'sélectionner...', - // removeItemButton: true, - // choices : [] - // }); - - // choice["submissionaccess"]["cdm"] = new Choices('#cdm',{ - // searchEnabled: false, - // itemSelectText: 'sélectionner...', - // removeItemButton: true, - // choices : [] - // }); - // [% END %] - // choice["submissionaccess"]["cdm_requests"] = new Choices('#cdm_requests',{ - // searchEnabled: false, - // itemSelectText: 'sélectionner...', - // removeItemButton: true, - // choices : [] - // }); - getprojects(); - getcdms(); - [% IF (session.usergroups.search('admin') == 1) %] - tbl = new Tabulator("#tbl_companies", { - headerFilterPlaceholder:"filter...", - height: "95vh", - layout:"fitDataFill", - selectable:1, - responsiveLayout:"collapse", - columns:[ - {title:"entreprise", field:"company",headerFilter:"input"}, - {title:"address", field:"address",headerFilter:"input"}, - {title:"nbr. utilsateurs",field:"num_members"}, - {title:"pointeuese",field:"num_timeclocks"}, - ]}); - gettbldata(); - - [% ELSE %] - getcompanydata(idcompany); - [% END %] - - -} -[% IF (session.usergroups.search('admin') == 1) %] -function gettbldata(){ - req.reqdata("POST","db.cgi",{"get":"companylist"},loadtbldata); - -} -function loadtbldata(data){ - if (data && data.sqldata){ - tbl.setData(data.sqldata); - } -} +function initpage() { + [% IF(session.usergroups.search('admin') == 1) %] + // choice["submissionaccess"]["projects"] = new Choices('#projects',{ + // searchEnabled: false, + // itemSelectText: 'sélectionner...', + // removeItemButton: true, + // choices : [] + // }); + + // choice["submissionaccess"]["cdm"] = new Choices('#cdm',{ + // searchEnabled: false, + // itemSelectText: 'sélectionner...', + // removeItemButton: true, + // choices : [] + // }); + // [% END %] + // choice["submissionaccess"]["cdm_requests"] = new Choices('#cdm_requests',{ + // searchEnabled: false, + // itemSelectText: 'sélectionner...', + // removeItemButton: true, + // choices : [] + // }); + //getprojects(); + //getcdms(); + [% IF(session.usergroups.search('admin') == 1) %] + tbl = new Tabulator("#tbl_companies", { + headerFilterPlaceholder: "filter...", + height: "95vh", + layout: "fitDataFill", + selectable: 1, + responsiveLayout: "collapse", + columns: [{ + title: "entreprise", + field: "company", + headerFilter: "input" + }, { + title: "address", + field: "address", + headerFilter: "input" + }, { + title: "cp", + field: "zip", + headerFilter: "input" + }, { + title: "ville", + field: "city", + headerFilter: "input" + }, { + title: "pays", + field: "country", + headerFilter: "input" + }] + }); + gettbldata(); + + [% ELSE %] + getcompanydata(idcompany); + [% END %] + -function edit(){ - var udata = tbl.getSelectedData(); - if (udata[0]){ - var uid = udata[0].id; - getcompanydata(uid); - document.getElementById("pnl_table").style.display = 'none'; - document.getElementById("pnl_company").style.display = 'block'; - } - } +[% IF(session.usergroups.search('admin') == 1) %] + +function gettbldata() { + req.reqdata("POST", "db.cgi", { + "get": "companylist" + }, loadtbldata); -function add(){ - cleanform('companies'); - viewtable(); } -function remove(){ - var udata = tbl.getSelectedData(); - if (udata[0]){ - if (confirm("Êtes vous sûre de supprimer l'entreprise selectionné?")){ - req.reqdata("POST","db.cgi",{"del":"1","ident_companies_id":udata[0].id},gettbldata); +function loadtbldata(data) { + if (data && data.sqldata) { + tbl.setData(data.sqldata); } - } - } -[% END %] +function edit() { + var udata = tbl.getSelectedData(); + if (udata[0]) { + var uid = udata[0].id; + getcompanydata(uid); + document.getElementById("pnl_table").style.display = 'none'; + document.getElementById("pnl_company").style.display = 'block'; + } -function getcompanydata(id){ - req.reqdata("POST","db.cgi",{"get":"companydata","filter":"id=" + id},fillformcompany); - //req.reqdata("POST","db.cgi",{"get":"submissionaccess","filter":"id_company=" + id},fillsubmissionaccess); } - -function fillsubmissionaccess(data){ - console.log("FILL Submission Access!"); - console.log(data); - cleanform('submissionaccess'); - if (data && data.sqldata){ - //var frm = document.querySelectorAll('.data_submissionaccess'); - fillformbydataclass('submissionaccess',data.sqldata[0],false); - - } +function add() { + cleanform('companies'); + viewtable(); } -function fillformcompany(data){ - // console.log(data); - cleanform('companies'); - var isreadonly = false; - [% IF (session.usergroups.search('admin') != 1) %] - if (data.sqldata[0]["validated"] == 1){isreadonly = true;} - [% END %] - if (data && data.sqldata){ - fillformbydataclass('companies',data.sqldata[0],isreadonly); - } - if (isreadonly == true){ - document.getElementById("btnsave_companies").style.display = 'none'; - } -} +function remove() { + var udata = tbl.getSelectedData(); + if (udata[0]) { + if (confirm("Êtes vous sûre de supprimer l'entreprise selectionné?")) { + req.reqdata("POST", "db.cgi", { + "del": "1", + "ident_companies_id": udata[0].id + }, gettbldata); + } + } -function viewtable(){ - gettbldata(); - document.getElementById("pnl_table").style.display = 'block'; - document.getElementById("pnl_company").style.display = 'none'; } +[% END %] -[% IF (session.usergroups.search('admin') == 1) %] -function getprojects(){ - req.reqdata("POST","db.cgi",{"get":"projectlist"},fillprojectlist); -} -function fillprojectlist(data){ - console.log("fill projectlist"); - fillselectlist(choice["submissionaccess"]["projects"],data.sqldata,'id','project'); - return false; +function getcompanydata(id) { + req.reqdata("POST", "db.cgi", { + "get": "companydata", + "filter": "id=" + id + }, fillformcompany); + //req.reqdata("POST","db.cgi",{"get":"submissionaccess","filter":"id_company=" + id},fillsubmissionaccess); } -[% END %] -function getcdms(){ - req.reqdata("POST","db.cgi",{"get":"cdmlist"},fillcdmlist); +// function fillsubmissionaccess(data){ +// console.log("FILL Submission Access!"); +// console.log(data); +// cleanform('submissionaccess'); +// if (data && data.sqldata){ +// //var frm = document.querySelectorAll('.data_submissionaccess'); +// fillformbydataclass('submissionaccess',data.sqldata[0],false); + +// } +// } + +function fillformcompany(data) { + // console.log(data); + cleanform('companies'); + var isreadonly = false; + [% IF(session.usergroups.search('admin') != 1) %] + if (data.sqldata[0]["validated"] == 1) { + isreadonly = true; + } + [% END %] + if (data && data.sqldata) { + fillformbydataclass('companies', data.sqldata[0], isreadonly); + } + if (isreadonly == true) { + document.getElementById("btnsave_companies").style.display = 'none'; + } +} + +function viewtable() { + gettbldata(); + document.getElementById("pnl_table").style.display = 'block'; + document.getElementById("pnl_company").style.display = 'none'; } -function fillcdmlist(data){ - console.log("fill cdmlist"); - fillselectlist(choice["submissionaccess"]["cdm_requests"],data.sqldata,'id','cdm'); - //var cdmlist = []; - [% IF (session.usergroups.search('admin') == 1) %] - fillselectlist(choice["submissionaccess"]["cdm"],data.sqldata,'id','cdm'); - //choice["submissionaccess"]["cdm"].clearStore(); - [% END %] - - return false; -} \ No newline at end of file +//[% IF(session.usergroups.search('admin') == 1) %] +// function getprojects(){ +// req.reqdata("POST","db.cgi",{"get":"projectlist"},fillprojectlist); +// } + +// function fillprojectlist(data){ +// console.log("fill projectlist"); +// fillselectlist(choice["submissionaccess"]["projects"],data.sqldata,'id','project'); +// return false; +// } + +//[% END %] + +// function getcdms(){ +// req.reqdata("POST","db.cgi",{"get":"cdmlist"},fillcdmlist); +// } + +// function fillcdmlist(data){ +// console.log("fill cdmlist"); +// fillselectlist(choice["submissionaccess"]["cdm_requests"],data.sqldata,'id','cdm'); +// //var cdmlist = []; +// [% IF (session.usergroups.search('admin') == 1) %] +// fillselectlist(choice["submissionaccess"]["cdm"],data.sqldata,'id','cdm'); +// //choice["submissionaccess"]["cdm"].clearStore(); +// [% END %] + +// return false; +// } \ No newline at end of file diff --git a/backoffice/tmpl/module/planning/index.js b/backoffice/tmpl/module/planning/index.js new file mode 100644 index 00000000..59296322 --- /dev/null +++ b/backoffice/tmpl/module/planning/index.js @@ -0,0 +1,4 @@ +var tbl_planning = null; +function initpage() { + +} \ No newline at end of file diff --git a/backoffice/tmpl/module/planning/index.tt b/backoffice/tmpl/module/planning/index.tt new file mode 100644 index 00000000..03211b34 --- /dev/null +++ b/backoffice/tmpl/module/planning/index.tt @@ -0,0 +1,15 @@ +
+
+ + + + + +
+
+
+
+
\ No newline at end of file diff --git a/backoffice/tmpl/module/sites/index.js b/backoffice/tmpl/module/sites/index.js new file mode 100644 index 00000000..e69de29b diff --git a/backoffice/tmpl/module/sites/index.tt b/backoffice/tmpl/module/sites/index.tt new file mode 100644 index 00000000..e69de29b diff --git a/backoffice/tmpl/module/staff/index.js b/backoffice/tmpl/module/staff/index.js new file mode 100644 index 00000000..e69de29b diff --git a/backoffice/tmpl/module/staff/index.tt b/backoffice/tmpl/module/staff/index.tt new file mode 100644 index 00000000..e69de29b diff --git a/backoffice/tmpl/skeleton/index.tt b/backoffice/tmpl/skeleton/index.tt index 8b347c20..282dc687 100644 --- a/backoffice/tmpl/skeleton/index.tt +++ b/backoffice/tmpl/skeleton/index.tt @@ -1,5 +1,5 @@ [% USE dksdb = DBI(dsn, dbuser, dbpassword) %] [% appgaccess = dksdb.prepare("select ap.icon,ap.app,ap.name,ug.usergroup from useringroups uig join apps ap on (uig.id_group=ap.id_usergroup) join usergroups ug on (uig.id_group=ug.id) where uig.id_user=? - group by ap.id,ug.id order by ap.sort;")%] +group by ap.id,ug.id order by ap.sort;")%] [% INCLUDE block/head.tt %] @@ -14,13 +14,13 @@
diff --git a/index.cgi b/index.cgi index 38180d85..81e50758 100755 --- a/index.cgi +++ b/index.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/Users/kilian/perl5/perlbrew/perls/perl-5.24.1/bin/perl use strict; use lib ('backoffice/api/lib/perl5');