projects / pot_lu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 988bc76)
v202102072126 t1.3.3 1.3.3
authorkilian (dks-laptop) <ksaffran@dks.lu>
Sun, 7 Feb 2021 20:27:02 +0000 (21:27 +0100)
committerkilian (dks-laptop) <ksaffran@dks.lu>
Sun, 7 Feb 2021 20:27:02 +0000 (21:27 +0100)
app/lib/POT/Period.pm patch | blob | history
app/tmpl/index.tt patch | blob | history
app/tmpl/module/periods/reportperiod.js patch | blob | history
desktopapp/package.json patch | blob | history

diff --git a/app/lib/POT/Period.pm b/app/lib/POT/Period.pm
index 2e79cc6..3c06d6d 100644 (file)
--- a/app/lib/POT/Period.pm
+++ b/app/lib/POT/Period.pm
@@ -281,7 +281,8 @@ sub getPeriodDays(){
             to_char(coalesce(max(wk.mindailyrecuperation),max(wkstd.mindailyrecuperation)),'HH24:MI') as mindailyrecuperation,
             to_char(coalesce(max(wk.maxinterruptionhours),max(wkstd.maxinterruptionhours)),'HH24:MI') as maxinterruptionhours,
             max(vd.vacancyname) as vacancyname,
-            max(tt.trackedtime) as trackedtime,max(tt.incompletetrack) as incompletetrack
+            max(tt.trackedtime) as trackedtime,
+            max(tt.incompletetrack) as incompletetrack
             FROM ".$schema.".staffreportperioddays pd
              JOIN ".$schema.".staff st ON pd.id_staff = st.id and st.id='".$id_staff."' and st.isdeleted is null
              LEFT JOIN ( SELECT yy.id_staff, yy.ndaydate AS daydate,yy.ndaydate + yy.ntimeend AS tmfrom, yy.daydate + yy.timestart AS tmto,
diff --git a/app/tmpl/index.tt b/app/tmpl/index.tt
index 88fce0b..fad4c8e 100644 (file)
--- a/app/tmpl/index.tt
+++ b/app/tmpl/index.tt
@@ -1,4 +1,4 @@
-[% appversion='1.3.2' %]
+[% appversion='1.3.3' %]
 [% minify = '' %]
 [% PROCESS "lang/${lang}.tt" %]
 <!DOCTYPE html>
diff --git a/app/tmpl/module/periods/reportperiod.js b/app/tmpl/module/periods/reportperiod.js
index b790a09..65f6b26 100644 (file)
--- a/app/tmpl/module/periods/reportperiod.js
+++ b/app/tmpl/module/periods/reportperiod.js
@@ -103,11 +103,15 @@ let reportperiod ={
         {title: '<span style="font-size: 9pt;">[% lbl.start %]</span>',width: 150, field:"startdate",headerSort: false,formatter:"datetime",formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""} },
         {title: '<span style="font-size: 9pt;">[% lbl.end %]</span>',width: 150, field:"enddate",headerSort: false,formatter:"datetime",formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""} },
         {title: '<span style="font-size: 9pt;">[% lbl.contract %]</span>',width: 80, field:"contracthours",hozAlign:"right",formatter:nullrFormatter,headerSort: false, bottomCalc:reportperiod.setcontracthours},
-        {title: '<span style="font-size: 9pt;"[% lbl.work %]</span>',width: 75, field:"workhours",hozAlign:"right",headerSort: false, bottomCalc:reportperiod.setworkhours},
+        {title: '<span style="font-size: 9pt;">[% lbl.work %]</span>',width: 75, field:"workhours",hozAlign:"right",headerSort: false, bottomCalc:reportperiod.setworkhours},
         {title: '<span style="font-size: 9pt;">[% lbl.recuperation_short %]</span>',width: 75, field:"recuperationhours",hozAlign:"right",headerSort: false,formatter:periodRecupFormatter, bottomCalc:reportperiod.setrecuperationhours},
-        {title: '<span style="font-size: 9pt;">[% lbl.vacancy %]</span>',width: 75, field:"vacancynormal",hozAlign:"right",headerSort: false, bottomCalc:reportperiod.setvacancynormal},
-        {title: '<span style="font-size: 8pt;">[% lbl.vacancyill2 %]</span>',width:75, field:"vacancyill",hozAlign:"right",headerSort: false, bottomCalc:reportperiod.setvacancyill},
-        {title: '<span style="font-size: 9pt;"[% lbl.total %]</span>',width: 75, field:"totalhours",hozAlign:"right",headerSort: false,formatter:periodTotalFormatter, bottomCalc:reportperiod.settotalhours},
+        {title: '<span style="font-size: 9pt;">[% lbl.vacancy %]</span>',width: 65, field:"vacancynormal",hozAlign:"right",headerSort: false},
+        {title: '<span style="font-size: 8pt;">[% lbl.vacancyill2 %]</span>',width:65, field:"vacancyill",hozAlign:"right",headerSort: false},
+        {title: '<span style="font-size: 8pt;">[% lbl.vacancyextra2 %]</span>',width:65, field:"vacancyextra",hozAlign:"right",headerSort: false},
+        //[% IF (cmpcfg.viewpartunempl == '1') %]
+        {title: '<span style="font-size: 9pt;">[% lbl.partunempl2 %]</span>',width: 65, field:"partunemplhours",hozAlign:"right",headerSort: false},
+        //[% END %]
+        {title: '<span style="font-size: 9pt;">[% lbl.total %]</span>',width: 75, field:"totalhours",hozAlign:"right",headerSort: false,formatter:periodTotalFormatter, bottomCalc:reportperiod.settotalhours},
         {title: '<span style="font-size: 8pt;">[% lbl.statementtransfered2 %]</span>',width: 75, field:"transferedhours",formatter:nullrFormatter,hozAlign:"right",headerSort: false, bottomCalc:reportperiod.settransferedhours},
         {title: '<span style="font-size: 9pt;">[% lbl.supphourspayed2 %]</span>',width: 70, field:"payedhours",formatter:nullrFormatter,hozAlign:"right",headerSort: false,headerVertical:true, bottomCalc:reportperiod.setpayedhours} ,
         {title: '<span style="font-size: 8pt;">[% lbl.finalstatementpot %]</span>',width: 80, field:"hoursdiff",formatter:nullrFormatter,hozAlign:"right",headerSort: false, bottomCalc:reportperiod.sethoursdiff},
diff --git a/desktopapp/package.json b/desktopapp/package.json
index daacc01..3e5a3ff 100644 (file)
--- a/desktopapp/package.json
+++ b/desktopapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "POT",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "plan d'organisation du travail",
   "main": "main.js",
   "scripts": {
Unnamed repository; edit this file 'description' to name the repository.