v202101200734 t1.1.8 1.1.8
authorkilian (dks-laptop) <ksaffran@dks.lu>
Wed, 20 Jan 2021 06:34:34 +0000 (07:34 +0100)
committerkilian (dks-laptop) <ksaffran@dks.lu>
Wed, 20 Jan 2021 06:34:34 +0000 (07:34 +0100)
app/static/css/theme.css
app/tmpl/block/dlgperiodvalidation.tt
app/tmpl/block/dlgstaffperioddays.tt
app/tmpl/index.tt
app/tmpl/module/staff/dlg_addstaff.tt
app/tmpl/module/staff/dlg_staffcontract.tt
app/tmpl/module/staff/staff.js
app/tmpl/module/workplans/dlg_workplanday.tt
desktopapp/package.json

index 5e3bb04..e999b13 100644 (file)
@@ -508,6 +508,7 @@ div.SubHeadTitle
   font-size: 16px;
 }
 
+
 button.toolbarbtn
 {
   margin: 2px;
@@ -515,7 +516,7 @@ button.toolbarbtn
   border-radius: 2px;
   border: 0.5px solid #c6c6c6!important;
        color: #fff;
-       font-size: 8pt!important;
+       
 }
 button.toolbarbtn:hover
 {
@@ -532,8 +533,16 @@ button.toolbarbtn:focus
        border-color: #cccccc!important;
 }
 
-
-a.toolbarbtn
+/* a.toolbarbtn
+{
+  border: 0.5px solid #c6c6c6;
+       background-color: rgba(0%,0%,0%,0);
+       color: #fff;
+       text-align: center;
+  text-decoration: unset;
+  font-size: 8pt!important;
+} */
+ a.toolbarbtn
 {
        border-radius: 2px;
        margin: 2px;
@@ -543,7 +552,7 @@ a.toolbarbtn
        text-align: center;
   text-decoration: unset;
   font-size: 8pt!important;
-}
+} 
 a.toolbarbtn:hover
 {
        background-color: #343434!important;
@@ -831,14 +840,39 @@ span[class^="icon"]::after {
        white-space: pre;
 }
 
-.inlinebtn {
+
+
+a.inlinebtn {
+  border: 0.5px solid #c6c6c6;
+       /* background-color: rgba(0%,0%,0%,0); */
+       color: red;
+       text-align: center;
+  text-decoration: unset;
+  font-size: 8pt!important;
        position: relative;
        height: 28px;
        margin-top: -28px;
        margin-left: -20px; 
        padding: 4px 8px; 
        border: 0!important; 
-       float: right;
+  float: right;
+  
+}
+
+
+a.inlinebtn:hover
+{
+       background-color: #343434!important;
+       color: #fff;
+}
+a.inlinebtn:pressed
+{
+       background-color: #343434!important;
+       color: #fff;
+}
+a.inlinebtn:focus
+{
+       border-color: #cccccc!important;
 }
 
 #loader {
index c62bb0c..f850e2d 100644 (file)
@@ -29,7 +29,7 @@
             </div>
             <div class="container cell">
               <div class="cell" style="width: 86px;">
-                <input class="data_staffreportperiod intervalfield" id="hourstotransfer" name="staffreportperiod_hourstotransfer" onblur="timecalc.validateInterval(this);timecalc.copyInterval(this,'hourstotransfercalc',1.5);return false;"  placeholder="0:00" style="float: left;" type="text" value=""> <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('hourstotransfer');dataform.cleanfield('hourstotransfercalc');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
+                <input class="data_staffreportperiod intervalfield" id="hourstotransfer" name="staffreportperiod_hourstotransfer" onblur="timecalc.validateInterval(this);timecalc.copyInterval(this,'hourstotransfercalc',1.5);return false;"  placeholder="0:00" style="float: left;" type="text" value=""> <a class="inlinebtn" href="javascript:dataform.cleanfield('hourstotransfer');dataform.cleanfield('hourstotransfercalc');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
               </div><label class="label" for="staffreportperiod_hourstotransfer">[% lbl.hours %]</label>
             </div>
             <div class="container cell">
@@ -44,7 +44,7 @@
             </div>
             <div class="container cell">
               <div class="cell" style="width: 86px;">
-                <input class="data_staffreportperiod intervalfield" id="payedhours40" name="staffreportperiod_payedhours40" onblur="timecalc.validateInterval(this);timecalc.copyInterval(this,'payedhours40calc');return false;"  placeholder="0:00" style="float: left;" type="text" value=""> <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('payedhours40');dataform.cleanfield('payedhours40calc');"><span class="icon icon-remove" style="font-size: 10px;" ></span></a>
+                <input class="data_staffreportperiod intervalfield" id="payedhours40" name="staffreportperiod_payedhours40" onblur="timecalc.validateInterval(this);timecalc.copyInterval(this,'payedhours40calc');return false;"  placeholder="0:00" style="float: left;" type="text" value=""> <a class="inlinebtn" href="javascript:dataform.cleanfield('payedhours40');dataform.cleanfield('payedhours40calc');"><span class="icon icon-remove" style="font-size: 10px;" ></span></a>
               </div><label class="label" for="staffreportperiod_payedhours40">[% lbl.hours %]</label>
             </div>
             <div class="container cell">
@@ -59,7 +59,7 @@
             </div>
             <div class="container cell">
               <div class="cell" style="width: 86px;">
-                <input class="data_staffreportperiod intervalfield" id="payedhours0" name="staffreportperiod_payedhours0" onblur="timecalc.validateInterval(this);timecalc.copyInterval(this,'payedhours0calc');return false;return false;"  placeholder="0:00" style="float: left;" type="text" value=""> <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('payedhours0');dataform.cleanfield('payedhours0calc');"><span class="icon icon-remove" style="font-size: 10px;" ></span></a>
+                <input class="data_staffreportperiod intervalfield" id="payedhours0" name="staffreportperiod_payedhours0" onblur="timecalc.validateInterval(this);timecalc.copyInterval(this,'payedhours0calc');return false;return false;"  placeholder="0:00" style="float: left;" type="text" value=""> <a class="inlinebtn" href="javascript:dataform.cleanfield('payedhours0');dataform.cleanfield('payedhours0calc');"><span class="icon icon-remove" style="font-size: 10px;" ></span></a>
               </div><label class="label" for="staffreportperiod_payedhours0">[% lbl.hours %]</label>
             </div>
             <div class="container cell">
index 0f9072c..4fa1a21 100644 (file)
@@ -20,7 +20,7 @@
                       <div class="cell" style="width: 86px;">
                         <input class="timefield data_staffreportperioddays" data-column="timestart1" data-id="" style="float: left;" placeholder="00:00"  data-table="staffreportperioddays" id="timestart1" name="staffreportperioddays_timestart1" onblur=
                         "timecalc.validateTime(this);staffperiodweeks.checkworktime();return false;" type="text" value="">
-                        <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('timestart1');staffperiodweeks.checkworktime();" ><span class="icon icon-remove" style=
+                        <a class="inlinebtn" href="javascript:dataform.cleanfield('timestart1');staffperiodweeks.checkworktime();" ><span class="icon icon-remove" style=
                         "font-size: 10px;"></span></a>
                       </div>
                       <label class="label" for="staffreportperioddays_timestart1">[% lbl.start %] 1</label>
@@ -29,7 +29,7 @@
                       <div class="cell" style="width: 86px;">
                         <input class="timefield data_staffreportperioddays" data-column="timeend1" data-id="" style="float: left;" placeholder="00:00"  data-table="staffreportperioddays" id="timeend1" name="staffreportperioddays_timeend1" onblur=
                         "timecalc.validateTime(this);staffperiodweeks.checkworktime();return false;" type="text" value="">
-                        <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('timeend1');staffperiodweeks.checkworktime();" ><span class="icon icon-remove" style=
+                        <a class="inlinebtn" href="javascript:dataform.cleanfield('timeend1');staffperiodweeks.checkworktime();" ><span class="icon icon-remove" style=
                         "font-size: 10px;"></span></a>
                       </div>
                       <label class="label" for="staffreportperioddays_timeend1">[% lbl.end %] 1</label>
@@ -45,7 +45,7 @@
                       <div class="cell" style="width: 86px;">
                         <input class="timefield data_staffreportperioddays" data-column="timestart2" data-id="" style="float: left;" placeholder="00:00"  data-table="staffreportperioddays" id="timestart2" name="staffreportperioddays_timestart2" onblur=
                         "timecalc.validateTime(this);staffperiodweeks.checkworktime();return false;" type="text" value="">
-                        <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('timestart2');staffperiodweeks.checkworktime();" ><span class="icon icon-remove" style=
+                        <a class="inlinebtn" href="javascript:dataform.cleanfield('timestart2');staffperiodweeks.checkworktime();" ><span class="icon icon-remove" style=
                         "font-size: 10px;"></span></a>
                       </div>
                       <label class="label" for="staffreportperioddays_timestart2">[% lbl.start %] 2</label>
@@ -54,7 +54,7 @@
                       <div class="cell" style="width: 86px;">
                         <input class="timefield data_staffreportperioddays" data-column="timeend2" data-id="" style="float: left;" placeholder="00:00"  data-table="staffreportperioddays" id="timeend2" name="staffreportperioddays_timeend2" onblur=
                         "timecalc.validateTime(this);staffperiodweeks.checkworktime();return false;" type="text" value="">
-                        <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('timeend2');staffperiodweeks.checkworktime();" ><span class="icon icon-remove" style=
+                        <a class="inlinebtn" href="javascript:dataform.cleanfield('timeend2');staffperiodweeks.checkworktime();" ><span class="icon icon-remove" style=
                         "font-size: 10px;"></span></a>
                       </div>
                       <label class="label" for="staffreportperioddays_timeend2">[% lbl.end %] 2</label>
@@ -73,7 +73,7 @@
                       <div class="cell" style="width: 86px;">
                         <input class="timefield data_staffreportperioddays" data-column="pausestart1" data-id="" style="float: left;" placeholder="00:00"  data-table="staffreportperioddays" id="pausestart1" name="staffreportperioddays_pausestart1" onblur=
                         "timecalc.validateTime(this);staffperiodweeks.checkworktime();return false;" type="text" value="">
-                        <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('pausestart1');staffperiodweeks.checkworktime();" ><span class="icon icon-remove" style=
+                        <a class="inlinebtn" href="javascript:dataform.cleanfield('pausestart1');staffperiodweeks.checkworktime();" ><span class="icon icon-remove" style=
                         "font-size: 10px;"></span></a>
                       </div>
                       <label class="label" for="staffreportperioddays_pausestart1">[% lbl.start %] 1</label>
@@ -82,7 +82,7 @@
                       <div class="cell" style="width: 86px;">
                         <input class="timefield data_staffreportperioddays" data-column="pauseend1" data-id="" style="float: left;" placeholder="00:00"  data-table="staffreportperioddays" id="pauseend1" name="staffreportperioddays_pauseend1" onblur=
                         "timecalc.validateTime(this);staffperiodweeks.checkworktime();return false;" type="text" value="">
-                        <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('pauseend1');staffperiodweeks.checkworktime();" ><span class="icon icon-remove" style=
+                        <a class="inlinebtn" href="javascript:dataform.cleanfield('pauseend1');staffperiodweeks.checkworktime();" ><span class="icon icon-remove" style=
                         "font-size: 10px;"></span></a>
                       </div>
                       <label class="label" for="staffreportperioddays_timeend1">[% lbl.end %] 1</label>
@@ -98,7 +98,7 @@
                       <div class="cell" style="width: 86px;">
                         <input class="timefield data_staffreportperioddays" data-column="pausestart2" data-id="" style="float: left;" placeholder="00:00"  data-table="staffreportperioddays" id="pausestart2" name="staffreportperioddays_pausestart2" onblur=
                         "timecalc.validateTime(this);staffperiodweeks.checkworktime();return false;" type="text" value="">
-                        <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('pausestart2');staffperiodweeks.checkworktime();" ><span class="icon icon-remove" style=
+                        <a class="inlinebtn" href="javascript:dataform.cleanfield('pausestart2');staffperiodweeks.checkworktime();" ><span class="icon icon-remove" style=
                         "font-size: 10px;"></span></a>
                       </div>
                       <label class="label" for="staffreportperioddays_pausestart2">[% lbl.start %] 2</label>
                       <div class="cell" style="width: 86px;">
                         <input class="timefield data_staffreportperioddays" data-column="pauseend2" data-id="" style="float: left;" placeholder="00:00"  data-table="staffreportperioddays" id="pauseend2" name="staffreportperioddays_pauseend2" onblur=
                         "timecalc.validateTime(this);staffperiodweeks.checkworktime();return false;" type="text" value="">
-                        <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('pauseend2');staffperiodweeks.checkworktime();" ><span class="icon icon-remove" style=
+                        <a class="inlinebtn" href="javascript:dataform.cleanfield('pauseend2');staffperiodweeks.checkworktime();" ><span class="icon icon-remove" style=
                         "font-size: 10px;"></span></a>
                       </div>
                       <label class="label" for="staffreportperioddays_pauseend2">[% lbl.end %] 2</label>
                     <div class="cell" style="width: 86px;">
                       <input class="timefield data_staffreportperioddays vacdaytotal" data-column="vacancyhours" data-id="" style="float: left;" placeholder="00:00"  data-table="staffreportperioddays" id="vacancyhours" name="staffreportperioddays_vacancyhours" onblur=
                       "staffperiodweeks.checkdaytime();return false;" type="text" value="">
-                      <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('vacancyhours');staffperiodweeks.checkdaytime();" ><span class="icon icon-remove" style=
+                      <a class="inlinebtn" href="javascript:dataform.cleanfield('vacancyhours');staffperiodweeks.checkdaytime();" ><span class="icon icon-remove" style=
                       "font-size: 10px;"></span></a>
                     </div>
                     <label class="label" for="staffreportperioddays_vacancyhours">[% lbl.hours %]</label>
                     <div class="cell" style="width: 86px;">
                       <input class="timefield data_staffreportperioddays repdaytotal" data-column="recuperationhours" data-id="" style="float: left;" placeholder="00:00"  data-table="staffreportperioddays" id="recuperationhours" name="staffreportperioddays_recuperationhours"
                       onblur="staffperiodweeks.checkdaytime();return false;" type="text" value="">
-                      <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('recuperationhours');staffperiodweeks.checkdaytime();" ><span class="icon icon-remove" style=
+                      <a class="inlinebtn" href="javascript:dataform.cleanfield('recuperationhours');staffperiodweeks.checkdaytime();" ><span class="icon icon-remove" style=
                       "font-size: 10px;"></span></a>
                     </div>
                     <label class="label" for="staffreportperioddays_recuperationhours">[% lbl.hours %]</label>
index 7aa6c1a..5939388 100644 (file)
@@ -1,4 +1,4 @@
-[% appversion='1.1.7' %]
+[% appversion='1.1.8' %]
 [% minify = '' %]
 [% PROCESS "lang/${lang}.tt" %]
 <!DOCTYPE html>
index 0bcfe78..b5c7313 100644 (file)
@@ -43,7 +43,7 @@
               <div class="cell" style="width: 120px;">
               <label class="label" for="addstaff_weekhours">[% lbl.weekhours %]</label>
                 <input class="data_addstaff intervalfield" id="addstaff_weekhours" name="addstaff_weekhours" onblur="timecalc.validateInterval(this);return false;"  placeholder="0:00" style="float: left;" data-column="weekhours"  data-table="addstaff" data-id="" type=
-                "text" value="40:00"> <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('addstaff_weekhours');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
+                "text" value="40:00"> <a class="inlinebtn" href="javascript:dataform.cleanfield('addstaff_weekhours');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
               </div>
           </div>
           <div class="container cell">
index af7aae5..98b49c9 100644 (file)
@@ -23,7 +23,7 @@
               <div class="cell" style="width: 120px;">
               <label class="label" for="staffcontract_weekhours">>[% lbl.weekhours %]</label>
                 <input class="data_staffcontract intervalfield" id="weekhours" name="staffcontract_weekhours" onblur="timecalc.validateInterval(this);return false;"  placeholder="0:00" style="float: left;" data-column="weekhours"  data-table="staffcontract" data-id="" type=
-                "text" value=""> <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('weekhours');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
+                "text" value=""> <a class="inlinebtn" href="javascript:dataform.cleanfield('weekhours');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
               </div>
           </div>
           <div class="container cell">
index 28a14f2..8d1913b 100644 (file)
@@ -71,7 +71,7 @@ let staff ={
     staff.initform();
     staff.tbl = new Tabulator("#tbl_staff", {
       height: "calc(100vh - 56px)",
-      layout: "fitDataFill",
+      layout: "fitColumn",
       selectable: 1,
       groupBy:["groupname"],
       groupStartOpen:[true],
index be51fe9..47c27b1 100644 (file)
@@ -20,7 +20,7 @@
                   <div class="container cell">
                       <div class="cell" style="width: 86px;">
                         <input type="text" class="timefield data_workplandays" id="start1" name="workplandays_start1"  data-column="start1"  data-table="workplandays" data-id="" style="float: left;" placeholder="00:00" value="" />
-                        <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('start1');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
+                        <a class="inlinebtn" href="javascript:dataform.cleanfield('start1');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
                       </div>
                       
                     <label for="workplandays_start1" class="label">[% lbl.start %] 1</label>
@@ -28,7 +28,7 @@
                   <div class="container cell">
                       <div class="cell" style="width: 86px;">
                         <input type="text" class="timefield data_workplandays" id="end1" name="workplandays_end1"  data-column="end1"  data-table="workplandays" data-id="" style="float: left;" placeholder="00:00" value="" />
-                        <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('end1');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
+                        <a class="inlinebtn" href="javascript:dataform.cleanfield('end1');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
                       </div>
                     <label for="workplandays_end1" class="label">[% lbl.end %] 1</label>
                   </div>
                     <div class="container cell">
                         <div class="cell" style="width: 86px;">
                           <input type="text" class="timefield data_workplandays" id="start2" name="workplandays_start2"  data-column="start2"  data-table="workplandays" data-id="" style="float: left;" placeholder="00:00" value="" />
-                          <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('start2');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
+                          <a class="inlinebtn" href="javascript:dataform.cleanfield('start2');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
                         </div>
                       <label for="workplandays_start2" class="label">[% lbl.start %] 2</label>
                     </div>
                     <div class="container cell">
                         <div class="cell" style="width: 86px;">
                           <input type="text" class="timefield data_workplandays" id="end2" name="workplandays_end2"  data-column="end2"  data-table="workplandays" data-id="" style="float: left;" placeholder="00:00" value="" />
-                          <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('end2');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
+                          <a class="inlinebtn" href="javascript:dataform.cleanfield('end2');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
                         </div>
                       <label for="workplandays_end2" class="label">[% lbl.end %] 2</label>
                     </div>
                     <div class="container cell">
                         <div class="cell" style="width: 86px;">
                           <input type="text" class="timefield data_workplandays" id="pausestart1" name="workplandays_pausestart1"  data-column="pausestart1"  data-table="workplandays" data-id="" style="float: left;" placeholder="00:00" value="" />
-                          <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('pausestart1');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
+                          <a class="inlinebtn" href="javascript:dataform.cleanfield('pausestart1');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
                         </div>
                       <label for="workplandays_start1" class="label">[% lbl.start %] 1</label>
                     </div>
                     <div class="container cell">
                         <div class="cell" style="width: 86px;">
                           <input type="text" class="timefield data_workplandays" id="pauseend1" name="workplandays_pauseend1"  data-column="pauseend1"  data-table="workplandays" data-id="" style="float: left;" placeholder="00:00" value="" />
-                          <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('pauseend1');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
+                          <a class="inlinebtn" href="javascript:dataform.cleanfield('pauseend1');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
                         </div>
                       <label for="workplandays_end1" class="label">[% lbl.end %] 1</label>
                     </div>
                       <div class="container cell">
                           <div class="cell" style="width: 86px;">
                             <input type="text" class="timefield data_workplandays" id="pausestart2" name="workplandays_pausestart2"  data-column="pausestart2"  data-table="workplandays" data-id="" style="float: left;" placeholder="00:00" value="" />
-                            <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('pausestart2');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
+                            <a class="inlinebtn" href="javascript:dataform.cleanfield('pausestart2');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
                           </div>
                         <label for="workplandays_start2" class="label">[% lbl.start %] 2</label>
                       </div>
                       <div class="container cell">
                           <div class="cell" style="width: 86px;">
                             <input type="text" class="timefield data_workplandays" id="pauseend2" name="workplandays_pauseend2"  data-column="pauseend2"  data-table="workplandays" data-id="" style="float: left;" placeholder="00:00" value="" />
-                            <a class="toolbarbtn text-red inlinebtn" href="javascript:dataform.cleanfield('pauseend2');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
+                            <a class="inlinebtn" href="javascript:dataform.cleanfield('pauseend2');"><span class="icon icon-remove" style="font-size: 10px;"></span></a>
                           </div>
                         <label for="workplandays_end2" class="label">[% lbl.end %] 2</label>
                       </div>
index eef0ed4..db4a231 100644 (file)
@@ -1,6 +1,6 @@
 {
   "name": "POT",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "plan d'organisation du travail",
   "main": "main.js",
   "scripts": {