From 4857abe2793485b16b24c9da92d79e6c120de521 Mon Sep 17 00:00:00 2001 From: "kilian (dks-laptop)" Date: Tue, 3 Dec 2019 17:07:29 +0100 Subject: [PATCH] vnext --- backoffice/api/db.cgi | 2 +- backoffice/api/file.cgi | 2 +- backoffice/api/index.cgi | 2 +- backoffice/api/upload.cgi | 2 +- backoffice/index.cgi | 2 +- backoffice/js/request.js | 1 + backoffice/tmpl/module/companies/index.js | 8 +- backoffice/tmpl/module/companies/index.tt | 27 +++-- backoffice/tmpl/module/projects/cdm.js | 93 ----------------- backoffice/tmpl/module/projects/cdm.tt | 36 ------- backoffice/tmpl/module/projects/index.js | 105 -------------------- backoffice/tmpl/module/projects/index.tt | 39 -------- backoffice/tmpl/module/submissions/index.js | 105 -------------------- backoffice/tmpl/module/submissions/index.tt | 51 ---------- backoffice/tmpl/module/upload/index.js | 45 --------- backoffice/tmpl/module/upload/index.tt | 24 ----- backoffice/tmpl/skeleton/index.tt | 9 +- index.cgi | 2 +- 18 files changed, 25 insertions(+), 530 deletions(-) delete mode 100644 backoffice/tmpl/module/projects/cdm.js delete mode 100644 backoffice/tmpl/module/projects/cdm.tt delete mode 100644 backoffice/tmpl/module/projects/index.js delete mode 100644 backoffice/tmpl/module/projects/index.tt delete mode 100644 backoffice/tmpl/module/submissions/index.js delete mode 100644 backoffice/tmpl/module/submissions/index.tt delete mode 100644 backoffice/tmpl/module/upload/index.js delete mode 100644 backoffice/tmpl/module/upload/index.tt diff --git a/backoffice/api/db.cgi b/backoffice/api/db.cgi index c9133873..5e529491 100755 --- a/backoffice/api/db.cgi +++ b/backoffice/api/db.cgi @@ -1,4 +1,4 @@ -#!/Users/kilian/perl5/perlbrew/perls/perl-5.24.1/bin/perl +#!/usr/bin/perl use strict; use lib ('./lib/perl5'); use lib ('./lib'); diff --git a/backoffice/api/file.cgi b/backoffice/api/file.cgi index f0af54da..33d3bee8 100755 --- a/backoffice/api/file.cgi +++ b/backoffice/api/file.cgi @@ -1,4 +1,4 @@ -#!/Users/kilian/perl5/perlbrew/perls/perl-5.24.1/bin/perl +#!/usr/bin/perl use strict; use lib ('./lib/perl5'); diff --git a/backoffice/api/index.cgi b/backoffice/api/index.cgi index 619b1ac6..833a85db 100755 --- a/backoffice/api/index.cgi +++ b/backoffice/api/index.cgi @@ -1,4 +1,4 @@ -#!/Users/kilian/perl5/perlbrew/perls/perl-5.24.1/bin/perl +#!/usr/bin/perl use strict; use lib ('./lib/perl5'); use lib ('./lib'); diff --git a/backoffice/api/upload.cgi b/backoffice/api/upload.cgi index 194fca86..47c62fbf 100755 --- a/backoffice/api/upload.cgi +++ b/backoffice/api/upload.cgi @@ -1,4 +1,4 @@ -#!/Users/kilian/perl5/perlbrew/perls/perl-5.24.1/bin/perl +#!/usr/bin/perl use strict; use lib ('./lib/perl5'); diff --git a/backoffice/index.cgi b/backoffice/index.cgi index 69ca6713..91b7ce8f 100755 --- a/backoffice/index.cgi +++ b/backoffice/index.cgi @@ -1,4 +1,4 @@ -#!/Users/kilian/perl5/perlbrew/perls/perl-5.24.1/bin/perl +#!/usr/bin/perl use strict; use lib ('api/lib/perl5'); diff --git a/backoffice/js/request.js b/backoffice/js/request.js index 58ae6aad..22f9146e 100644 --- a/backoffice/js/request.js +++ b/backoffice/js/request.js @@ -81,6 +81,7 @@ var req = { // console.log("Status returned: " + request.status + "resp:" + request.getResponseHeader("Content-Type")); if (request.getResponseHeader("Content-Type").indexOf('application/json') == 0){ if (request.responseText){ + console.log(request.responseText); var xparse = JSON.parse(request.responseText); ret = xparse.result; } else { diff --git a/backoffice/tmpl/module/companies/index.js b/backoffice/tmpl/module/companies/index.js index 6bfb3538..8abcef9b 100644 --- a/backoffice/tmpl/module/companies/index.js +++ b/backoffice/tmpl/module/companies/index.js @@ -7,7 +7,7 @@ var idcompany = "[% company.0.id_company %]"; [% ELSE %] var idcompany=null; [% END %] -var choice = {"submissionaccess":{"projects":null,"cdm":null,"cdm_requests":null}}; +//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; @@ -45,8 +45,8 @@ function initpage(){ columns:[ {title:"entreprise", field:"company",headerFilter:"input"}, {title:"address", field:"address",headerFilter:"input"}, - {title:"nbr. utilsateurs",field:"num_users"}, - {title:"pointeuese",field:"num_users"}, + {title:"nbr. utilsateurs",field:"num_members"}, + {title:"pointeuese",field:"num_timeclocks"}, ]}); gettbldata(); @@ -98,7 +98,7 @@ function remove(){ 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); + //req.reqdata("POST","db.cgi",{"get":"submissionaccess","filter":"id_company=" + id},fillsubmissionaccess); } diff --git a/backoffice/tmpl/module/companies/index.tt b/backoffice/tmpl/module/companies/index.tt index f27ad264..6358aefb 100644 --- a/backoffice/tmpl/module/companies/index.tt +++ b/backoffice/tmpl/module/companies/index.tt @@ -36,21 +36,21 @@ [% fieldeditbox('city','companies','Ville','w3-half','','','') %] [% fieldeditbox('country','companies','Pays','w3-quarter','','','Luxembourg') %] -
+ + +
[% formsavebutton('companies','sauvegarder') %] @@ -59,25 +59,22 @@
-
-

accès soumissions

+ +

Planning de temps

- [% fieldhidden('id','submissionaccess','ident') %] - [% fieldhidden('id_company','submissionaccess','') %] - [% %] + [% fieldhidden('id_company','timeclocks','') %]
[% dataeditable = "" %] [% IF (session.usergroups.search('admin') != 1) %] [% dataeditable = "readonly" %] [% END %] - [% fieldmultiselectbox('projects','submissionaccess','Accès au projets','',dataeditable,'') %] - [% fieldmultiselectbox('cdm','submissionaccess','Accès au corps de métiers','',dataeditable,'') %] - [% fieldmultiselectbox('cdm_requests','submissionaccess',"Demande d'accès au corps de métiers",'','','') %] + [% fieldmultiselectbox('timeclocklist','timeclocks','Accès Planning du temps','',dataeditable,'') %] +
- [% formsavebutton('submissionaccess','sauvegarder') %] + [% formsavebutton('timeclocks','sauvegarder') %]
diff --git a/backoffice/tmpl/module/projects/cdm.js b/backoffice/tmpl/module/projects/cdm.js deleted file mode 100644 index ad9a2a67..00000000 --- a/backoffice/tmpl/module/projects/cdm.js +++ /dev/null @@ -1,93 +0,0 @@ -var tbl= null; -//var sel_project = null; -var choice = {"cdm":{"project_ids":null}}; -function initpage(){ - choice["cdm"]["project_ids"] = new Choices('#project_ids',{ - searchEnabled: false, - itemSelectText: 'sélectionner...', - removeItemButton: true, - choices : [] - }); - tbl = new Tabulator("#tbl_cdm", { - headerFilterPlaceholder:"filter...", - height: "95vh", - layout:"fitDataFill", - selectable:1, - responsiveLayout:"collapse", - columns:[ - {title:"corps de métier", field:"cdm",headerFilter:"input"}, - {title:"projets", field:"projectlist",headerFilter:"input"}, - - ], - }); - -gettbldata(); -getprojects(); -} - -function gettbldata(){ - req.reqdata("POST","db.cgi",{"get":"cdmlist"},loadtbldata); -} - -function loadtbldata(data){ - if (data && data.sqldata){ - tbl.setData(data.sqldata); - } -} - -function aftersavecdm(){ - gettbldata(); - document.getElementById('dlgcdm').style.display='none'; -} - -function add(){ - fillcdmform(null); -} - -function edit(){ - var udata = tbl.getSelectedData(); - if (udata[0]){ - var uid = udata[0].id; - req.reqdata("POST","db.cgi",{"get":"cdmlist","filter":"id=" + udata[0].id},fillcdmform); - } -} - -function fillcdmform(data){ - cleanform("cdm"); - if (data && data.sqldata){ - fillformbydataclass("cdm",data.sqldata[0],false); - } - - document.getElementById('dlgcdm').style.display='block'; -} - -function remove(){ - var udata = tbl.getSelectedData(); - if (udata[0]){ - if (confirm("êtes-vous sûre de supprimer le corps de métier sélectionné?")){ - req.reqdata("POST","db.cgi",{"del":"1","ident_cdm_id":udata[0].id},gettbldata); - } - } - -} - -function view_projects(){ - parent.admin.loadpage('module/[% module %]/index.html','Projets'); -} - -function view_cdm(){ - parent.admin.loadpage('module/[% module %]/cdm.html','Corps de métiers'); -} - - - -function getprojects(){ - req.reqdata("POST","db.cgi",{"get":"projectlist"},fillprojectlist); -} - -function fillprojectlist(data){ - fillselectlist(choice["cdm"]["project_ids"],data.sqldata,'id','project'); - - return false; -} - diff --git a/backoffice/tmpl/module/projects/cdm.tt b/backoffice/tmpl/module/projects/cdm.tt deleted file mode 100644 index 3f44a138..00000000 --- a/backoffice/tmpl/module/projects/cdm.tt +++ /dev/null @@ -1,36 +0,0 @@ -[% PROCESS macro/fields.tt %] -
-
- - - - - -
-
-
- - -
-
-
- × -

Projet

-
-
- -
- [% fieldhidden("id","cdm","ident",'') %] - [% fieldeditbox("cdm","cdm","Corps de métier",'','','','') %] - [% fieldmultiselectbox('project_ids','cdm','Projets','','','') %] -
-
-
- - [% formdlgsavebutton('cdm','sauvegarder','aftersavecdm') %] -
-
-
- -
\ No newline at end of file diff --git a/backoffice/tmpl/module/projects/index.js b/backoffice/tmpl/module/projects/index.js deleted file mode 100644 index 9384551b..00000000 --- a/backoffice/tmpl/module/projects/index.js +++ /dev/null @@ -1,105 +0,0 @@ -var tbl= null; -function initpage(){ - tinymce.init({ - selector: '.richeditarea', - plugins: 'paste importcss searchreplace autolink autoresize directionality code visualblocks visualchars link charmap advlist lists textpattern noneditable charmap emoticons', - - menubar: false, - statusbar: false, - toolbar: 'undo redo | bold italic underline strikethrough | fontsizeselect | alignleft aligncenter alignright alignjustify | numlist bullist | forecolor removeformat | charmap', - toolbar_sticky: true, - min_height: 350, - language: 'de', - content_css: [ - '[% abspath %]css/w3pro.css' - ], - branding: false, - importcss_append: true, - contextmenu: "link", - }); - tbl = new Tabulator("#tbl_projects", { - headerFilterPlaceholder:"filter...", - height: "95vh", - layout:"fitDataFill", - selectable:1, - responsiveLayout:"collapse", - columns:[ - {title:"projet", field:"project",headerFilter:"input"}, - {title:"description", field:"description",headerFilter:"input", formatter:"html"}, - {title:"corps de métiers", field:"cdmlist",headerFilter:"input"}, - ], - }); - -gettbldata(); -} - -function gettbldata(){ - req.reqdata("POST","db.cgi",{"get":"projectlist"},loadtbldata); -} - -function loadtbldata(data){ - if (data && data.sqldata){ - tbl.setData(data.sqldata); - } -} - -function aftersaveproject(){ - formsaved(); - gettbldata(); - document.getElementById('dlgprojects').style.display='none'; -} - -function add(){ - fillprojectform(null); -} - -function edit(){ - var udata = tbl.getSelectedData(); - if (udata[0]){ - var uid = udata[0].id; - req.reqdata("POST","db.cgi",{"get":"projectlist","filter":"id=" + udata[0].id},fillprojectform); - } -} - -function fillprojectform(data){ - var frm = document.querySelectorAll('.data_projects'); - for (var f in frm){ - if ((frm[f].tagName == 'INPUT') || (frm[f].tagName == 'SELECT') || (frm[f].tagName == 'TEXTAREA')){ - if (frm[f].classList.contains("richeditarea")){ - tinymce.get(frm[f].id).setContent(""); - }else { - frm[f].value=""; - } - } - } - if (data && data.sqldata){ - for (var f in frm){ - if ((frm[f].tagName == 'INPUT') || (frm[f].tagName == 'SELECT') || (frm[f].tagName == 'TEXTAREA')){ - if (frm[f].classList.contains("richeditarea")){ - tinymce.get(frm[f].id).setContent(data.sqldata[0][frm[f].id]); - }else { - frm[f].value=data.sqldata[0][frm[f].id]; - } - } - } - } - document.getElementById('dlgprojects').style.display='block'; -} - -function remove(){ - var udata = tbl.getSelectedData(); - if (udata[0]){ - if (confirm("êtes-vous sûre de supprimer le projet sélectionné?")){ - req.reqdata("POST","db.cgi",{"del":"1","ident_projects_id":udata[0].id},gettbldata); - } - } - -} - -function view_projects(){ - parent.admin.loadpage('module/[% module %]/index.html','Projets'); -} - -function view_cdm(){ - parent.admin.loadpage('module/[% module %]/cdm.html','Corps de métiers'); -} \ No newline at end of file diff --git a/backoffice/tmpl/module/projects/index.tt b/backoffice/tmpl/module/projects/index.tt deleted file mode 100644 index 10130f60..00000000 --- a/backoffice/tmpl/module/projects/index.tt +++ /dev/null @@ -1,39 +0,0 @@ -[% PROCESS macro/fields.tt %] -[% IF (session.usergroups.search('admin') == 1) %] -
-
- - - - - - - - -
-
-
-[% END %] -
-[% IF (session.usergroups.search('admin') == 1) %] -
-
-
- × -

Projet

-
-
-
- [% fieldhidden("id","projects","ident",'') %] - [% fieldeditbox("project","projects","Projet",'','','','') %] - [% fieldrichtextarea("description","projects","Description",'','','300px','') %] -
-
-
- - [% formdlgsavebutton('projects','sauvegarder','aftersaveproject') %] -
-
-
-[% END %] diff --git a/backoffice/tmpl/module/submissions/index.js b/backoffice/tmpl/module/submissions/index.js deleted file mode 100644 index 72d75224..00000000 --- a/backoffice/tmpl/module/submissions/index.js +++ /dev/null @@ -1,105 +0,0 @@ -var tbl= null; -function initpage(){ - tbl = new Tabulator("#tbl_submissions", { - headerFilterPlaceholder:"filter...", - height: "95vh", - layout:"fitDataFill", - selectable:1, - responsiveLayout:"collapse", - columns:[ - {title:"projet", field:"project",headerFilter:"input",download:true}, - {title:"corps de métier", field:"cdm",headerFilter:"input",download:true}, - {title:"fichier", field:"file",headerFilter:"input",download:true}, - ], - }); - -//gettbldata(); -} - -function gettbldata(){ - [% IF (session.usergroups.search('admin') == 1) %] - req.reqdata("POST","db.cgi",{"get":"documentlist"},loadtbldata); - [% ELSE %] - req.reqdata("POST","db.cgi",{"get":"documentlist","filter":"userlist like '%\""+ session.id +"\"%"},loadtbldata); - [% END %] - -} - -function loadtbldata(data){ - if (data && data.sqldata){ - tbl.setData(data.sqldata); - } -} - -function add(){ - fillsubmissionform(null); -} - -function edit(){ - var udata = tbl.getSelectedData(); - if (udata[0]){ - var uid = udata[0].id; - req.reqdata("POST","db.cgi",{"get":"submissionlist","filter":"id=" + udata[0].id},fillsubmissionform); - } -} - -function fillsubmissionform(data){ - console.log(data); - var frm = document.querySelectorAll('.data_submissions'); - for (var f in frm){ - if ((frm[f].tagName == 'INPUT') || (frm[f].tagName == 'SELECT') || (frm[f].tagName == 'TEXTAREA')){ - frm[f].value=""; - } - } - if (data && data.sqldata){ - for (var f in frm){ - if ((frm[f].tagName == 'INPUT') || (frm[f].tagName == 'SELECT') || (frm[f].tagName == 'TEXTAREA')){ - frm[f].value=data.sqldata[0][frm[f].id]; - } - } - } - - document.getElementById('dlgsubmissions').style.display='block'; -} - -function remove(){ - var udata = tbl.getSelectedData(); - if (udata[0]){ - if (confirm("êtes-vous sûre de supprimer bordereau sélectionné?")){ - req.reqdata("POST","db.cgi",{"del":"1","ident_submissions_id":udata[0].id},gettbldata); - } - } - -} - - -// function xlsxexport(){ -// tbl.download("xlsx", "soumissions.xlsx", {sheetName:"soumissions"}); -// } - -// function pdfexport(){ -// tbl.download("pdf", "soumissions.pdf", { -// orientation:"landscape", - -// jsPDF:{ -// unit:"mm", -// }, -// autoTable(doc){ -// doc.text("Liste des soumissions sur solana-architecture.lu", 10, 10); -// // styles: { -// // fillColor: [100, 255, 255] -// // }, -// // columnStyles: { -// // id: {fillColor: 255} -// // }, -// return { -// margin: {top: 20}, -// } - -// }, -// documentProcessing:function(doc){ -// //carry out an action on the doc object -// } -// }); -// } - diff --git a/backoffice/tmpl/module/submissions/index.tt b/backoffice/tmpl/module/submissions/index.tt deleted file mode 100644 index a234d40f..00000000 --- a/backoffice/tmpl/module/submissions/index.tt +++ /dev/null @@ -1,51 +0,0 @@ -[% PROCESS macro/fields.tt %] -[% sid = session.id %] -[% company %] -[% IF (session.usergroups.search('admin') != 1) %] -[% qcompany = dksdb.query("select ul.id_company,cp.validated from vw_userlist ul join vw_companydata cp on (ul.id_company=cp.id) where ul.id=$sid;") %] -[% company = qcompany.get_all() %] -[% END %] -[% IF (session.usergroups.search('admin') == 1) || company.0.validated == "1" %] -
-
- - - -
-
- -
- -
-
-
- × -

Ajouter Soumission

-
-
- [% fieldeditbox("project","display","Projet",'','','','') %] - [% fieldeditbox("cdm","display","Corps de Métier",'','','','') %] -
- [% fieldhidden("id","submissions","ident",'') %] - [% fieldfile("filepdf","submissions","Fichier Bordereau (PDF)",'','','') %] - [% fieldfile("filexls","submissions","Fichier Bordereau (XLSX)",'','','') %] - [% fieldfile("fileother","submissions","Fichier",'','','') %] -
-
-
- - -
-
-
- -[% ELSE %] -
Votre Entreprise n'est pas validé, il se peux que vous données d'entreprise sont incomplètes!
-[% END %] diff --git a/backoffice/tmpl/module/upload/index.js b/backoffice/tmpl/module/upload/index.js deleted file mode 100644 index f3db79c2..00000000 --- a/backoffice/tmpl/module/upload/index.js +++ /dev/null @@ -1,45 +0,0 @@ -var tbl= null; -function initpage(){ - tbl = new Tabulator("#tbl_upload", { - headerFilterPlaceholder:"filter...", - height: "95vh", - layout:"fitDataFill", - selectable:1, - responsiveLayout:"collapse", - columns:[ - {title:"entreprise", field:"company",headerFilter:"input",download:true}, - {title:"projet", field:"project",headerFilter:"input",download:true}, - {title:"corps de métier", field:"cdm",headerFilter:"input",download:true}, - {title:"fichier", field:"file",headerFilter:"input",download:true}, - ], - }); - -gettbldata(); -} - -function gettbldata(){ - [% IF (session.usergroups.search('admin') == 1) %] - req.reqdata("POST","db.cgi",{"get":"documentlist"},loadtbldata); - [% ELSE %] - req.reqdata("POST","db.cgi",{"get":"documentlist","filter":"userlist like '%\""+ session.id +"\"%"},loadtbldata); - [% END %] - -} - -function loadtbldata(data){ - if (data && data.sqldata){ - tbl.setData(data.sqldata); - } -} - -function xlsxexport(){ - tbl.download("xlsx", "uploads.xlsx", {sheetName:"uploads"}); -} - -function add(){ - -} - -function remove(){ - -} \ No newline at end of file diff --git a/backoffice/tmpl/module/upload/index.tt b/backoffice/tmpl/module/upload/index.tt deleted file mode 100644 index 861c4e03..00000000 --- a/backoffice/tmpl/module/upload/index.tt +++ /dev/null @@ -1,24 +0,0 @@ -[% sid = session.id %] -[% company %] -[% IF (session.usergroups.search('admin') != 1) %] -[% qcompany = dksdb.query("select ul.id_company,cp.validated from vw_userlist ul join vw_companydata cp on (ul.id_company=cp.id) where ul.id=$sid;") %] -[% company = qcompany.get_all() %] -[% END %] -[% IF (session.usergroups.search('admin') == 1) || company.0.validated == "1" %] -
-
- - -
-
-
- -[% ELSE %] -
Votre Entreprise n'est pas validé, il se peux que vous données d'entreprise sont incomplètes!
-[% END %] \ No newline at end of file diff --git a/backoffice/tmpl/skeleton/index.tt b/backoffice/tmpl/skeleton/index.tt index 141c89c6..8b347c20 100644 --- a/backoffice/tmpl/skeleton/index.tt +++ b/backoffice/tmpl/skeleton/index.tt @@ -1,6 +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=? -and menutype='global' group by ap.id,ug.id order by ap.sort;")%] [% appsaccess = 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=? and menutype='schema' group by ap.id,ug.id order by ap.sort;")%] + group by ap.id,ug.id order by ap.sort;")%] [% INCLUDE block/head.tt %] @@ -21,11 +20,7 @@ where uig.id_user=? and menutype='schema' group by ap.id,ug.id order by ap.sort;  [% ap.name %] [% END %] - [% FOREACH ap = appsaccess.execute(session.id) %] - -  [% ap.name %] - - [% END %] +
diff --git a/index.cgi b/index.cgi index 81e50758..38180d85 100755 --- a/index.cgi +++ b/index.cgi @@ -1,4 +1,4 @@ -#!/Users/kilian/perl5/perlbrew/perls/perl-5.24.1/bin/perl +#!/usr/bin/perl use strict; use lib ('backoffice/api/lib/perl5'); -- 2.39.5