From 96bd50c7b2911e6f29c76a5dec04fc3a4b18b69d Mon Sep 17 00:00:00 2001 From: kilian Date: Thu, 2 Jul 2020 09:15:54 +0200 Subject: [PATCH] v20200701 --- .gitignore | 6 +- desktopapp/main.js | 4 +- webapp/static/css/fonts/pot.svg | 3 + webapp/static/css/fonts/pot.ttf | Bin 15004 -> 15500 bytes webapp/static/css/fonts/pot.woff | Bin 15080 -> 15576 bytes webapp/static/css/icons.css | 15 ++- webapp/static/css/theme.css | 1 + webapp/static/js/formsave.js | 91 ++++++++------- webapp/static/vendors/choices/choices.css | 4 +- webapp/tmpl/macro/fields.tt | 11 +- webapp/tmpl/module/companies.tt | 39 +++++-- webapp/tmpl/module/companies/companies.js | 27 +++-- webapp/tmpl/module/companies/worktimes.js | 2 +- webapp/tmpl/module/periods.tt | 47 +++++--- webapp/tmpl/module/periods/reportperiod.js | 25 +++- .../tmpl/module/periods/staffperiodweeks.js | 24 ++-- webapp/tmpl/module/profile.tt | 53 ++++++--- webapp/tmpl/module/profile/dlgpassword.tt | 6 +- webapp/tmpl/module/profile/dlgusername.tt | 2 +- webapp/tmpl/module/staff.tt | 13 ++- webapp/tmpl/module/staff/staff.js | 7 +- webapp/tmpl/module/users.tt | 107 ++++++++++++++---- webapp/tmpl/module/users/users.js | 62 +++++----- website/app | 1 - 24 files changed, 368 insertions(+), 182 deletions(-) delete mode 120000 website/app 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 04fb71c9741a4fdede017b441a40856eeb66fee0..678044ba87efd17e74ba584155d6d1f6eeb46a51 100644 GIT binary patch delta 771 zcmX9+O-vI(6n?L}?6gZ^S!lbO!q!sSHT;!A%YqOHib_EKp_mBN3J3{Bng9u$%7Kf) z#0bI(FX}-qAR#114Izq&o=h}w(HNsA5-%ot@Q1}$oXLAL-~0J8^UbVG-I_@N0zfLv z0tY3no&HiOQy8VlbF!-gW6`)0e)kptvk7+%M@P2K?7YM{_Yw89&yC$63X`I#EhehUuona9#9L0<(Sxskx z$5hF4#xEgDFn;qU)5|NJopbpGqQJ~vHOJSoYScCQy?K6%#cU0f-0kZfbe5fn81Kzy zEaXJt({PvUwPOntxggJY;}2uV^JYGIbrUE@JKO=c0|MAd6@`V|A$J1ZvM1zLWOt}c zcH6yN)!Lfz4A1}lX!_QD`29A{b{hr8f$7cq`qUJT8rui`hp!Hd?X4{$bP(YSB9x(w z2y+D{*j!0v%7cCq!K0Nr2-+kP#g9x={!gZ%qWOZgSc7GzuL)*N5yd4jTO^;7CS==u z85^p)uZC6oVw2pG)+4t{jqSKTKCh~KlF!CXr0`;nxMUG6#|s&M+`A$^iKx>50V! zKw1FE2hkkqIhARW&HCGc{0asJ(}IlD#1zSpsmu%vW-oy9W*I;M_9HA@3=HN9K)y;w zZb^k4gI*Mn?*i1Lk&~ZnnaK6?Zyy7LMGjEGwA{ps0)`mII0gnw79d|CFEKYYXvvXI zAYTQjA*>+3xCH1>Ah4>LxWk>%brPdDqw8iL#<`}-Ab$XHi@qm&JipCX25yiE3=FrW jG@N1dM_5hc0E&Zjd2Rk>HHi@bS(rR$ diff --git a/webapp/static/css/fonts/pot.woff b/webapp/static/css/fonts/pot.woff index cd9012851d951fd92934d392f0048155af133964..c1b2fbdb10762ef78b7de87e9c2da6a2ad8ca826 100644 GIT binary patch delta 821 zcmXYwOH30{6o&8V40GF|SVr0zO<`(*b_}mt+A{J8hz~+|KT0tXs1=YVfRL0%Sk(m^ zgNc#~aiJS!Asdho5~79>#f2-Q2124SMmIKbg5&zV0tXYPE9?@o!= zTkGlw5L{KeB>nJyi$L;ig*aQ3l^E_Hjf@ilQA`ANq|m!JLy?%SJ;&JipUk0=sjH}M z5u&!~e3|?FG&&d=Af()iHDx--!*nrDMVBB{L&q{a9CB zv4BPQb=)ofE2EJ~EUG+%@rgsi(045|I*8h3d@-ccv9NV>d@MGB{jAUKwL*Qe2^yh( z^&UJ3BpAYy8kR62l1Ef>o{%g~l0gzBQLP5GOjTTr!qFo@ImNA%fa2C=6~s~%WXJ(3 zIZ+h+Wvc45aum2+1xg@bH`&CVv*+5p9#6NTIQrpXP1x=Aj@MMz4s-@%_UsJCZ0v<% zW5PzEnB@*ev`RrfLb*IcIm>9jxGYZl%^D0ZFLicK7ZmawHM-;+cgvzy+u(8KdrT&y z*?a14Z_j|;cPy;EHyWXc;ki#kLBVB%7Robzma^I(N`YmKEKY_Ph;*>Yq?k>@5gU$0 zq5)^XnE`-wlc9ame1kmOuPwq zHm%uWS#gBqZHL2_l-jMK^tPiN4NLF@>qGL6#e$vdM;UokH{BSvRQ)9Bhw~sG9FciK yF{eKyFXBgSUcIB91T&^tL_);m`ssPmUStp2A0PTOLl3sAF9ZG%S*x+~IQ#`GPqc{u delta 320 zcmcan`Jz;;+~3WOfsp|StX?p1gXuX8jFS)Ah)vWHuFpu$O)OwwV9WqYgn+Pk*rhY+ ziNzqXJwQGO6bq#1RHgyNjxaEo0_98#B%AfOXQU>kFff>#0M(d*uw=+o<_w@9P%H%6BP?7Qxg`}qu?ax^8Xzpkpcj>spA1xIXR!mQXc`D}{ruaPn^*xf+%f>jR{-M} z#<;x1+*F_#P@FLggoBnG=`6@EE&=-I#Kb@TjINV?7`+)?H_u?4YpM+LClI&jd$Py# z+k9o 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 @@
+
+
+
 
+
+
+ +
+
+