From: Kilian Saffran Date: Tue, 19 Jan 2021 10:21:43 +0000 (+0100) Subject: v20210119 X-Git-Tag: 1.1.7~1 X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=8db8079ab0bcba17445bdf3a30714b8295c6f709;p=pot_lu.git v20210119 --- diff --git a/app/lib/POT/User.pm b/app/lib/POT/User.pm index 3a6662ed..90be80d0 100644 --- a/app/lib/POT/User.pm +++ b/app/lib/POT/User.pm @@ -69,7 +69,7 @@ sub getUserList(){ $ugroups .= " and id_usergroup in ('".join("','",@{$id_usergroups})."') "; } my $ussql = "select * from ( -SELECT us.username,us.isblocked,us.surname,us.prename,us.id_company,us.id_usergroup,us.id,cp.company,cp.datasetname,grp.groupname, +SELECT us.username,us.isblocked,us.surname,us.prename,us.id_company,us.id_usergroup,us.id,cp.company,cp.datasetname,grp.groupname,us.lang, case when us.id_usergroup = 'teamleader' then string_agg(stgrp.groupname,',') else null end as staffgroups, json_array_elements_text(us.schemaaccess) AS xschema FROM public.users us join public.companies cp on (us.id_company=cp.id) @@ -77,7 +77,7 @@ case when us.id_usergroup = 'teamleader' then string_agg(stgrp.groupname,',') el left join (select stu.id as id_user,stu.id_staffgroup,stg.groupname from ".$schema.".staffgroups stg join (select id,json_array_elements_text(id_staffgroups) as id_staffgroup from public.users) stu on (stu.id_staffgroup=stg.id)) stgrp on (us.id=stgrp.id_user) WHERE us.isdeleted IS null ".$ugroups." group by us.id,cp.id,grp.id - ) xus where xschema='".$schema."' group by xus.id,xus.username,xus.groupname,xus.isblocked,xus.surname,xus.prename,xus.id_company,xus.id_usergroup,xus.company,xus.datasetname,xus.xschema,xus.staffgroups;"; + ) xus where xschema='".$schema."' group by xus.id,xus.username,xus.groupname,xus.isblocked,xus.surname,xus.prename,xus.id_company,xus.id_usergroup,xus.company,xus.datasetname,xus.xschema,xus.staffgroups,xus.lang;"; return $self->{db}->querysorted($ussql); } diff --git a/app/lib/dksconfig.pm b/app/lib/dksconfig.pm index bc0e4a4d..2086bf98 100644 --- a/app/lib/dksconfig.pm +++ b/app/lib/dksconfig.pm @@ -11,8 +11,8 @@ our @EXPORT_OK = qw($sitecfg); our $sitecfg ={ cookiename => 'potlu', dbtype => 'PgPP', - #dsn => 'DBI:PgPP:dbname=potlu2_db;host=localhost', - dsn => 'DBI:PgPP:dbname=potlu2_db;host=sql12.your-server.de', + dsn => 'DBI:PgPP:dbname=potlu2_db;host=localhost', + #dsn => 'DBI:PgPP:dbname=potlu2_db;host=sql12.your-server.de', dbuser => 'potlu2_user', dbpassword => 'dMY8xGB6cBLzrDGE', page => 'index.tt', diff --git a/app/lib/dksdb.pm b/app/lib/dksdb.pm index 3ca21b22..0d40d53c 100644 --- a/app/lib/dksdb.pm +++ b/app/lib/dksdb.pm @@ -20,7 +20,7 @@ sub new { my $class = shift; my $p = shift; my $self = bless {}, $class; - $self->{debug} = 0; + $self->{debug} = 1; $self->{dbh} = DBI->connect($p->{dsn},$p->{dbuser},$p->{dbpassword},{PrintError=>1,RaiseError=>1,AutoCommit=>1}) or return "query Connection Error!".$!; return $self; } diff --git a/app/static/css/theme.css b/app/static/css/theme.css index 08ba9120..5e3bb04b 100644 --- a/app/static/css/theme.css +++ b/app/static/css/theme.css @@ -39,13 +39,13 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0} .hoverable tbody tr:hover,.ul.hoverable li:hover{background-color:#ccc}.centered tr th,.centered tr td{text-align:center} .table td,.table th,.table-all td,.table-all th{padding:8px 8px;display:table-cell;text-align:left;vertical-align:top} .table th:first-child,.table td:first-child,.table-all th:first-child,.table-all td:first-child{padding-left:16px} -.btn,.button{border:none;display:inline-block;padding:8px 16px;vertical-align:middle;overflow:hidden;text-decoration:none;color:inherit;background-color:inherit;text-align:center;cursor:pointer;white-space:nowrap} -.btn:hover{box-shadow:0 8px 16px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)} +.btn,.button{border:none;display:inline-block;padding:4px 8px;vertical-align:middle;overflow:hidden;text-decoration:none;color:inherit;background-color:inherit;text-align:center;cursor:pointer;white-space:nowrap} +.btn:hover{box-shadow:0 4px 8px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)} .btn,.button{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} .disabled,.btn:disabled,.button:disabled{cursor:not-allowed;background-color: #e6e6e6}.disabled *,:disabled *{pointer-events:none} .btn.disabled:hover,.btn:disabled:hover{box-shadow:none} .badge,.tag{background-color:#000;color:#fff;display:inline-block;padding-left:8px;padding-right:8px;text-align:center}.badge{border-radius:50%} -.ul{list-style-type:none;padding:0;margin:0}.ul li{padding:8px 16px;border-bottom:1px solid #ddd}.ul li:last-child{border-bottom:none} +.ul{list-style-type:none;padding:0;margin:0}.ul li{padding:4px 8px;border-bottom:1px solid #ddd}.ul li:last-child{border-bottom:none} .tooltip,.display-container{position:relative}.tooltip .text{display:none}.tooltip:hover .text{display:inline-block} .ripple:active{opacity:0.5}.ripple{transition:opacity 0s} .input{padding:6px;display:block;border: 1px solid #ccc;width:100%;background-color: #fff; }/*#e8f0fe*/ @@ -59,15 +59,15 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0} .sidebar{height:100%;width:160px;background-color:#fff;position:fixed!important;z-index:1;overflow:auto} .bar-block .dropdown-hover,.bar-block .dropdown-click{width:100%} .bar-block .dropdown-hover .dropdown-content,.bar-block .dropdown-click .dropdown-content{min-width:100%} -.bar-block .dropdown-hover .button,.bar-block .dropdown-click .button{width:100%;text-align:left;padding:8px 16px} +.bar-block .dropdown-hover .button,.bar-block .dropdown-click .button{width:100%;text-align:left;padding:4px 8px} .main,#main{transition:margin-left .4s} .modal{z-index:3;display:none;padding-top:100px;position:fixed;left:0;top:0;width:100%;height:100%;overflow:auto;background-color:rgb(0,0,0);background-color:rgba(0,0,0,0.4)} .modal-content{margin:auto;background-color:#fff;position:relative;padding:0;outline:0;width:600px} .bar{width:100%}.center .bar{display:inline-block;width:auto} -.bar .bar-item{padding:8px 16px;float:left;width:auto;border:none;display:block;outline:0} +.bar .bar-item{padding:4px 8px;float:left;width:auto;border:none;display:block;outline:0} .bar .dropdown-hover,.bar .dropdown-click{position:static;float:left} .bar .button{white-space:normal} -.bar-block .bar-item{width:100%;display:block;padding:8px 16px;text-align:left;border:none;white-space:normal;float:none;outline:0} +.bar-block .bar-item{width:100%;display:block;padding:4px 8px;text-align:left;border:none;white-space:normal;float:none;outline:0} .bar-block.center .bar-item{text-align:center}.block{display:block;width:100%} .responsive{display:block;overflow-x:auto} .container:after,.container:before,.datapanel:after,.datapanel:before,.row:after,.row:before,.row-padding:after,.row-padding:before, @@ -141,7 +141,7 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0} .section,.code{margin-top:16px!important;margin-bottom:16px!important} .margin{margin:16px!important}.margin-top{margin-top:16px!important}.margin-bottom{margin-bottom:16px!important} .margin-left{margin-left:16px!important}.margin-right{margin-right:16px!important} -.padding-small{padding:4px 8px!important}.padding{padding:8px 16px!important}.padding-large{padding:12px 24px!important} +.padding-small{padding:4px 8px!important}.padding{padding:4px 8px!important}.padding-large{padding:12px 24px!important} .padding-16{padding-top:16px!important;padding-bottom:16px!important}.padding-24{padding-top:24px!important;padding-bottom:24px!important} .padding-32{padding-top:32px!important;padding-bottom:32px!important}.padding-48{padding-top:48px!important;padding-bottom:48px!important} .padding-64{padding-top:64px!important;padding-bottom:64px!important} @@ -471,45 +471,6 @@ footer box-sizing: border-box; } - -div.group_container -{ - background-color: #e3e3e3; - border-top-color: rgba(80%,80%,80%,1); - border-right-color: rgba(80%,80%,80%,1); - border-bottom-color: rgba(80%,80%,80%,1); - border-left-color: rgba(80%,80%,80%,1); - border-top-style: solid; - border-right-style: solid; - border-bottom-style: solid; - border-left-style: solid; - border-top-width: 1pt; - border-right-width: 1pt; - border-bottom-width: 1pt; - border-left-width: 1pt; - padding-top: 4px; - padding-bottom: 8px; -} - -/* Custom Styles */ -.ListView_Default -{ - - background-color: rgba(0%,0%,0%,0); - border-top-style: none; - border-right-style: none; - border-bottom-style: none; - border-left-style: none; - - color: #000; - text-align: left; - margin-top: 2pt; - margin-right: 2pt; - margin-bottom: 2pt; - margin-left: 2pt; -} - - button.btnNavigation { @@ -525,44 +486,12 @@ button.btnNavigation padding-left: 0pt; } -div.PageListHeader -{ - border-top-color: rgba(80%,80%,80%,1); - border-right-color: rgba(80%,80%,80%,1); - border-bottom-color: rgba(80%,80%,80%,1); - border-left-color: rgba(80%,80%,80%,1); - border-top-style: solid; - border-right-style: solid; - border-bottom-style: solid; - border-left-style: solid; - border-top-width: 1pt; - border-right-width: 1pt; - border-bottom-width: 1pt; - border-left-width: 1pt; - color: #fff; - -fm-text-vertical-align: center; -} -div.PageListHeader .inner_border -{ - padding-top: 5pt; - padding-right: 5pt; - padding-bottom: 5pt; - padding-left: 5pt; -} - .moduletoolbar { background-color: #293146; color: #fff; } -div.BodySectionHeader -{ - font-family: -fm-font-family(Arial,Arial-BoldMT); - font-weight: bold; -} - - div.PageHeadTitle { font-size: 18pt; @@ -575,157 +504,108 @@ div.SubHeadTitle color: #fff; } -div.SectionHeader -{ - - background-color: rgba(22.3529%,26.6667%,38.4314%,1); - +.toolbarbtn > .icon { + font-size: 16px; } button.toolbarbtn { - border: 0.5px solid #c6c6c6; - background-color: rgba(0%,0%,0%,0); + margin: 2px; + background-color:#394462!important; + border-radius: 2px; + border: 0.5px solid #c6c6c6!important; color: #fff; + font-size: 8pt!important; } button.toolbarbtn:hover { - - background-color: #343434; + background-color: #343434!important; color: #fff; } button.toolbarbtn:pressed { - - background-color: rgba(20.3922%,20.3922%,20.3922%,1); + background-color: #343434!important; color: #fff; } button.toolbarbtn:focus { - border-top-color: rgba(80%,80%,80%,1); - border-right-color: rgba(80%,80%,80%,1); - border-bottom-color: rgba(80%,80%,80%,1); - border-left-color: rgba(80%,80%,80%,1); + border-color: #cccccc!important; } a.toolbarbtn { - border: 0.5px solid #c6c6c6; - background-color: rgba(0%,0%,0%,0); + border-radius: 2px; + margin: 2px; + background-color:#394462!important; + border: 0.5px solid #c6c6c6!important; color: #fff; text-align: center; - text-decoration: unset; + text-decoration: unset; + font-size: 8pt!important; } a.toolbarbtn:hover { - - background-color: rgba(20.3922%,20.3922%,20.3922%,1); + background-color: #343434!important; color: #fff; } a.toolbarbtn:pressed { - background-color: rgba(20.3922%,20.3922%,20.3922%,1); + background-color: #343434!important; color: #fff; } a.toolbarbtn:focus { - border-top-color: rgba(80%,80%,80%,1); - border-right-color: rgba(80%,80%,80%,1); - border-bottom-color: rgba(80%,80%,80%,1); - border-left-color: rgba(80%,80%,80%,1); + border-color: #cccccc!important; } button.bodybtn { + border-radius: 2px; border: 0.5px solid #c6c6c6; - - background-color: rgba(0%,0%,0%,0); - color: #000; } button.bodybtn:hover { - - background-color: rgba(20.3922%,20.3922%,20.3922%,1); + background-color: #343434; color: #fff; } button.bodybtn:pressed { - - background-color: rgba(20.3922%,20.3922%,20.3922%,1); + background-color: #343434; color: #fff; } button.bodybtn:focus { - border-top-color: rgba(80%,80%,80%,1); - border-right-color: rgba(80%,80%,80%,1); - border-bottom-color: rgba(80%,80%,80%,1); - border-left-color: rgba(80%,80%,80%,1); + border-color: #cccccc; } a.bodybtn { - border: 0.5px solid #c6c6c6; - - background-color: rgba(0%,0%,0%,0); - + border-radius: 2px; color: #000; text-align: center; text-decoration: unset; } a.bodybtn:hover { - - background-color: rgba(20.3922%,20.3922%,20.3922%,1); + background-color: #343434; color: #fff; } a.bodybtn:pressed { - background-color: rgba(20.3922%,20.3922%,20.3922%,1); + background-color: #343434; color: #fff; } a.bodybtn:focus { - border-top-color: rgba(80%,80%,80%,1); - border-right-color: rgba(80%,80%,80%,1); - border-bottom-color: rgba(80%,80%,80%,1); - border-left-color: rgba(80%,80%,80%,1); -} - - -div.ListView_Header -{ - border-top-color: rgba(80%,80%,80%,1); - border-right-color: rgba(80%,80%,80%,1); - border-bottom-color: rgba(80%,80%,80%,1); - border-left-color: rgba(80%,80%,80%,1); - border-top-style: solid; - border-right-style: solid; - border-bottom-style: solid; - border-left-style: solid; - border-top-width: 1pt; - border-right-width: 1pt; - border-bottom-width: 1pt; - border-left-width: 1pt; - font-weight: normal; - color: #fff; - -fm-text-vertical-align: center; -} -div.ListView_Header .inner_border -{ - padding-top: 2pt; - padding-right: 2pt; - padding-bottom: 2pt; - padding-left: 2pt; + border-color: #cccccc; } div.toolbar { - background-color: rgba(32.1569%,38.8235%,55.6863%,1); - } div.sectiontoolbar @@ -736,20 +616,6 @@ div.sectiontoolbar } -div.FooterLabel -{ - color: #fff; -} - -button.Buttom_BodyNav:hover -{ - - background-color: rgb(141, 141, 141); - - /* color: #fff; */ -} - - ::-webkit-scrollbar { -webkit-appearance: none; width: 10px; @@ -770,10 +636,6 @@ div.portaltextheader { border: 1px solid white; } - - - - select { /* -webkit-appearance: none; */ display: block; @@ -819,34 +681,6 @@ select:focus div.DataFooter{ background: #384462; } -.input-sum{padding:2px;display:block;border: 1px solid #ccc;width:100%;background-color: #4D4D4D; } - - -.currency-sum {padding:2px;display:block;border: 1px solid #ccc;width:100%;background-color: #4D4D4D;} - -.currency-sum,.currency-sum:read-only { - display: block; - color: #fff; - padding: 2px; - padding-right: 12px; - width: 100%; - max-width: 100%; - box-sizing: border-box; - margin: 0; - border: 1px solid #ccc; - border-radius: unset; - -moz-appearance: none; - -webkit-appearance: none; - appearance: none; - background-color: #4D4D4D; - background-image: url('data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%22225%22%20height=%22300%22%3E%3Cpath%20fill=%22white%22%20stroke=%22none%22%20d=%22m%20224.99996,16.22698%20-8.11342,36.41161%20q%20-24.14255,-19.78892%20-54.61741,-19.78892%20-41.3588,0%20-65.00658,23.74671%20-23.647774,23.7467%20-28.397115,53.23215%20l%20134.960355,0%20-5.14505,26.71508%20-132.981532,0%20-0.395848,7.71771%200.395848,18.20566%20127.242642,0%20-5.14505,26.71508%20-117.941954,0%20q%207.519719,40.17154%2032.552754,59.06997%2025.03303,18.89844%2056.49745,18.89844%2037.20302,0%2057.98149,-19.59107%20l%200,40.9631%20Q%20192.34828,300%20162.26913,300%2053.034301,300%2030.474864,189.18206%20l%20-30.474864,0%205.738751,-26.71508%2020.580475,0%20q%20-0.395708,-4.74934%20-0.395708,-17.80995%20l%200,-8.11342%20-25.923518,0%205.738751,-26.71508%2023.152999,0%20Q%2039.181988,55.21112%2076.583149,27.60556%20113.98417,0%20163.06069,0%20199.868,0%20224.99996,16.22698%20z%22%20/%3E%3C/svg%3E'); - background-repeat: no-repeat, repeat; - background-position: right 2px top 50%, 0 0; - background-size: 9px auto, 100%; -} - - - /* input[type=date]::-webkit-inner-spin-button, input[type=date]::-webkit-outer-spin-button { @@ -871,10 +705,6 @@ input display:block; border-radius: unset; } -/* input:focus -{ - border: #0070cf; -} */ input:focus { border: 1px solid #3a6fc3; @@ -891,12 +721,6 @@ input[type=number]::-webkit-outer-spin-button { -webkit-appearance: none; margin: 0; } -/* input[type=checkbox]{ - appearance: none; - display:inline-block; - font-size: 24px!important; - border: 1px solid green; -} */ input[class=currency] { padding: 2px; @@ -972,21 +796,6 @@ input[type="checkbox"] { background:rgba(255,255,255,0.3); } - - body.mceContentBody { - background:#e8f0fe; - color:#000; -} - -/* .mceContentBody { - background: #e8f0fe; - color:#000; -} */ - -/* .tabulator-row-even { - background-color: #757575; -} */ - :focus { outline: 1px solid #607d8b; } diff --git a/app/tmpl/block/dlgstaffpointages.tt b/app/tmpl/block/dlgstaffpointages.tt index b4742ea8..97cc52d8 100644 --- a/app/tmpl/block/dlgstaffpointages.tt +++ b/app/tmpl/block/dlgstaffpointages.tt @@ -6,9 +6,9 @@
[% lbl.edittimetracks %] / -
- - - + + +
diff --git a/app/tmpl/index.tt b/app/tmpl/index.tt index 2a26b593..7aa6c1a6 100644 --- a/app/tmpl/index.tt +++ b/app/tmpl/index.tt @@ -1,4 +1,4 @@ -[% appversion='1.1.6' %] +[% appversion='1.1.7' %] [% minify = '' %] [% PROCESS "lang/${lang}.tt" %] diff --git a/app/tmpl/module/admin/admin.tt b/app/tmpl/module/admin/admin.tt index fd85e537..a6052836 100644 --- a/app/tmpl/module/admin/admin.tt +++ b/app/tmpl/module/admin/admin.tt @@ -1,15 +1,15 @@
- [% lbl.back %] + [% lbl.back %]
[% lbl.companies %]
[% IF (session.usergroup == 'admin') %] - - - + + +
- - + +
[% END %]
@@ -27,9 +27,9 @@
[% lbl.sectorconfigpot %]
- - - + + +
@@ -37,9 +37,9 @@