From: kilian Date: Thu, 2 Jul 2020 07:15:54 +0000 (+0200) Subject: v20200701 X-Git-Tag: 1.0.15~58 X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=96bd50c7b2911e6f29c76a5dec04fc3a4b18b69d;p=pot_lu.git v20200701 --- diff --git a/.gitignore b/.gitignore index 532973fa..c5b114ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,4 @@ -backoffice/api/lib/perl5 -backoffice/data/output/pot -backoffice/data/tmp - - +website/app desktopapp/node_modules desktopapp/node_modules/package-lock.json OLD/ diff --git a/desktopapp/main.js b/desktopapp/main.js index f21b2f1b..35f2c398 100644 --- a/desktopapp/main.js +++ b/desktopapp/main.js @@ -33,7 +33,7 @@ function createWindow () { show: false, icon: __dirname + '/img/POT-logo.png', minWidth: 1260, - minHeight: 600, + minHeight: 720, title: "POT", backgroundColor: "#fff", webPreferences: { @@ -41,7 +41,7 @@ function createWindow () { // nodeIntegration: true } }) - const glshort = globalShortcut.register('CommandOrControl+X', () => { + const glshort = globalShortcut.register('CommandOrControl+Shift+I', () => { //console.log('CommandOrControl+X is pressed') mainWindow.webContents.openDevTools({detached: true}); }) diff --git a/webapp/static/css/fonts/pot.svg b/webapp/static/css/fonts/pot.svg index 4d7f95ab..8cc77382 100644 --- a/webapp/static/css/fonts/pot.svg +++ b/webapp/static/css/fonts/pot.svg @@ -77,4 +77,7 @@ + + + \ No newline at end of file diff --git a/webapp/static/css/fonts/pot.ttf b/webapp/static/css/fonts/pot.ttf index 04fb71c9..678044ba 100644 Binary files a/webapp/static/css/fonts/pot.ttf and b/webapp/static/css/fonts/pot.ttf differ diff --git a/webapp/static/css/fonts/pot.woff b/webapp/static/css/fonts/pot.woff index cd901285..c1b2fbdb 100644 Binary files a/webapp/static/css/fonts/pot.woff and b/webapp/static/css/fonts/pot.woff differ diff --git a/webapp/static/css/icons.css b/webapp/static/css/icons.css index 916bd92e..d091593c 100644 --- a/webapp/static/css/icons.css +++ b/webapp/static/css/icons.css @@ -1,9 +1,9 @@ @font-face { font-family: 'pot'; src: - url('fonts/pot.ttf?acr332') format('truetype'), - url('fonts/pot.woff?acr332') format('woff'), - url('fonts/pot.svg?acr332#pot') format('svg'); + url('fonts/pot.ttf?26rj7t') format('truetype'), + url('fonts/pot.woff?26rj7t') format('woff'), + url('fonts/pot.svg?26rj7t#pot') format('svg'); font-weight: normal; font-style: normal; font-display: block; @@ -24,6 +24,15 @@ -moz-osx-font-smoothing: grayscale; } +.icon-sendemail:before { + content: "\e946"; +} +.icon-exit:before { + content: "\e947"; +} +.icon-key:before { + content: "\e948"; +} .icon-back:before { content: "\e944"; } diff --git a/webapp/static/css/theme.css b/webapp/static/css/theme.css index 6c7cd8d3..0879fa8f 100644 --- a/webapp/static/css/theme.css +++ b/webapp/static/css/theme.css @@ -993,6 +993,7 @@ input[type="time"]::-webkit-calendar-picker-indicator { background-color: #293146; color: #fff; padding:8px!important; + margin-bottom: 10px; } .modal-content > footer { diff --git a/webapp/static/js/formsave.js b/webapp/static/js/formsave.js index d5be87b7..d9a050cf 100644 --- a/webapp/static/js/formsave.js +++ b/webapp/static/js/formsave.js @@ -178,57 +178,66 @@ function cleanform2(frmname,choices){ return false; } -function fillformbydataclass(dataclass,data,readonly = false){ - var frm = document.querySelectorAll('.data_'+ dataclass); - if (data){ - for (var f in frm){ - if (data[frm[f].id]){ - if (readonly){ frm[f].readonly = true;} - if (frm[f].tagName == 'INPUT'){ - if (frm[f].type == "checkbox"){ - if (data[frm[f].id] == "1"){ - frm[f].checked = true; - } else { - frm[f].checked = false; - } - } else if (frm[f].classList.contains("datefield")){ - frm[f]._flatpickr.setDate(data[frm[f].id]); - } else if (frm[f].classList.contains("timefield")){ - frm[f]._flatpickr.setDate(data[frm[f].id]); - }else if (frm[f].classList.contains("choices__input")){ - if ((data[frm[f].id] != null) && (data[frm[f].id] != '[""]')){ - choice[dataclass][frm[f].id].setValue(JSON.parse(data[frm[f].id])); - } - } else { - frm[f].value=data[frm[f].id]; - } - } - if (frm[f].tagName == 'SELECT'){ - if (frm[f].classList.contains("choices__input")){ - if (frm[f].multiple == true){ - choice[dataclass][frm[f].id].setChoiceByValue(JSON.parse(data[frm[f].id])); - }else { - choice[dataclass][frm[f].id].setChoiceByValue(data[frm[f].id]); - } - } else { - frm[f].value=data[frm[f].id]; - } +// function fillformbydataclass(dataclass,data,readonly = false){ +// var frm = document.querySelectorAll('.data_'+ dataclass); +// if (data){ +// for (var f in frm){ +// if (data[frm[f].id]){ +// if (readonly){ frm[f].readonly = true;} +// if (frm[f].tagName == 'INPUT'){ +// if (frm[f].type == "checkbox"){ +// if (data[frm[f].id] == "1"){ +// frm[f].checked = true; +// } else { +// frm[f].checked = false; +// } +// } else if (frm[f].classList.contains("datefield")){ +// frm[f]._flatpickr.setDate(data[frm[f].id]); +// } else if (frm[f].classList.contains("timefield")){ +// frm[f]._flatpickr.setDate(data[frm[f].id]); +// }else if (frm[f].classList.contains("choices__input")){ +// if ((data[frm[f].id] != null) && (data[frm[f].id] != '[""]')){ +// choice[dataclass][frm[f].id].setValue(JSON.parse(data[frm[f].id])); +// } +// } else { +// frm[f].value=data[frm[f].id]; +// } +// } +// if (frm[f].tagName == 'SELECT'){ +// if (frm[f].classList.contains("choices__input")){ +// if (frm[f].multiple == true){ +// choice[dataclass][frm[f].id].setChoiceByValue(JSON.parse(data[frm[f].id])); +// }else { +// choice[dataclass][frm[f].id].setChoiceByValue(data[frm[f].id]); +// } +// } else { +// frm[f].value=data[frm[f].id]; +// } - } - } - } - } -} +// } +// } +// } +// } +// } function fillformbydataclass2(dataclass,choices,data,onblur){ var frm = document.querySelectorAll('.data_'+ dataclass); + console.log("Data to fill"); + console.log(data); if (data){ for (var f in frm){ + console.log(frm[f].id); + if (frm[f].id){ + frm[f].dataset.id=data['id']; + } if (data[frm[f].id]){ + console.log("=>"); + console.log(data[frm[f].id]); // if (onblur){ // frm[f].addEventListener('blur',onblur); // } - frm[f].dataset.id=data['id']; + + //frm[f].dataset.id=data['id']; if (frm[f].tagName == 'INPUT'){ if (frm[f].type == "checkbox"){ if (data[frm[f].id] == "1"){ diff --git a/webapp/static/vendors/choices/choices.css b/webapp/static/vendors/choices/choices.css index 20871456..e75be05c 100644 --- a/webapp/static/vendors/choices/choices.css +++ b/webapp/static/vendors/choices/choices.css @@ -142,7 +142,7 @@ border-bottom: 1px solid #ccc; /* border-radius: 2.5px; */ /* font-size: 14px; */ - min-height: 32px; + min-height: 28px; overflow: hidden; /* font-weight: bold; */ } @@ -168,7 +168,7 @@ .choices__list--single { display: inline-block; - padding: 6px 2px 2px 2px; + padding: 2px 2px 2px 2px; width: 100%; } diff --git a/webapp/tmpl/macro/fields.tt b/webapp/tmpl/macro/fields.tt index f02626d3..964bfb22 100644 --- a/webapp/tmpl/macro/fields.tt +++ b/webapp/tmpl/macro/fields.tt @@ -46,9 +46,14 @@ [% END -%] [% MACRO fieldcheckbox(column,table,title,size,state,value,blurevent) BLOCK -%]
-
- 0 %][% state %][% END %] [% IF blurevent %]onblur="[% blurevent %]"[% END %]> - +
+
+ 0 %][% state %][% END %] [% IF blurevent %]onblur="[% blurevent %]"[% END %]> +
+
+ [% title %] +
+
[% END -%] diff --git a/webapp/tmpl/module/companies.tt b/webapp/tmpl/module/companies.tt index 57649de3..2040072b 100644 --- a/webapp/tmpl/module/companies.tt +++ b/webapp/tmpl/module/companies.tt @@ -17,6 +17,15 @@
+
+
+
 
+
+
+ +
+
+