From: kilian (dks-laptop) Date: Sun, 7 Feb 2021 20:27:02 +0000 (+0100) Subject: v202102072126 t1.3.3 X-Git-Tag: 1.3.3 X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=f86daa888177699deb3d6d99012ce13c4981dc88;p=pot_lu.git v202102072126 t1.3.3 --- diff --git a/app/lib/POT/Period.pm b/app/lib/POT/Period.pm index 2e79cc6c..3c06d6db 100644 --- 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 88fce0bd..fad4c8e4 100644 --- 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" %] diff --git a/app/tmpl/module/periods/reportperiod.js b/app/tmpl/module/periods/reportperiod.js index b790a092..65f6b260 100644 --- a/app/tmpl/module/periods/reportperiod.js +++ b/app/tmpl/module/periods/reportperiod.js @@ -103,11 +103,15 @@ let reportperiod ={ {title: '[% lbl.start %]',width: 150, field:"startdate",headerSort: false,formatter:"datetime",formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""} }, {title: '[% lbl.end %]',width: 150, field:"enddate",headerSort: false,formatter:"datetime",formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""} }, {title: '[% lbl.contract %]',width: 80, field:"contracthours",hozAlign:"right",formatter:nullrFormatter,headerSort: false, bottomCalc:reportperiod.setcontracthours}, - {title: '',width: 75, field:"workhours",hozAlign:"right",headerSort: false, bottomCalc:reportperiod.setworkhours}, + {title: '[% lbl.work %]',width: 75, field:"workhours",hozAlign:"right",headerSort: false, bottomCalc:reportperiod.setworkhours}, {title: '[% lbl.recuperation_short %]',width: 75, field:"recuperationhours",hozAlign:"right",headerSort: false,formatter:periodRecupFormatter, bottomCalc:reportperiod.setrecuperationhours}, - {title: '[% lbl.vacancy %]',width: 75, field:"vacancynormal",hozAlign:"right",headerSort: false, bottomCalc:reportperiod.setvacancynormal}, - {title: '[% lbl.vacancyill2 %]',width:75, field:"vacancyill",hozAlign:"right",headerSort: false, bottomCalc:reportperiod.setvacancyill}, - {title: '',width: 75, field:"totalhours",hozAlign:"right",headerSort: false,formatter:periodTotalFormatter, bottomCalc:reportperiod.settotalhours}, + {title: '[% lbl.vacancy %]',width: 65, field:"vacancynormal",hozAlign:"right",headerSort: false}, + {title: '[% lbl.vacancyill2 %]',width:65, field:"vacancyill",hozAlign:"right",headerSort: false}, + {title: '[% lbl.vacancyextra2 %]',width:65, field:"vacancyextra",hozAlign:"right",headerSort: false}, + //[% IF (cmpcfg.viewpartunempl == '1') %] + {title: '[% lbl.partunempl2 %]',width: 65, field:"partunemplhours",hozAlign:"right",headerSort: false}, + //[% END %] + {title: '[% lbl.total %]',width: 75, field:"totalhours",hozAlign:"right",headerSort: false,formatter:periodTotalFormatter, bottomCalc:reportperiod.settotalhours}, {title: '[% lbl.statementtransfered2 %]',width: 75, field:"transferedhours",formatter:nullrFormatter,hozAlign:"right",headerSort: false, bottomCalc:reportperiod.settransferedhours}, {title: '[% lbl.supphourspayed2 %]',width: 70, field:"payedhours",formatter:nullrFormatter,hozAlign:"right",headerSort: false,headerVertical:true, bottomCalc:reportperiod.setpayedhours} , {title: '[% lbl.finalstatementpot %]',width: 80, field:"hoursdiff",formatter:nullrFormatter,hozAlign:"right",headerSort: false, bottomCalc:reportperiod.sethoursdiff}, diff --git a/desktopapp/package.json b/desktopapp/package.json index daacc018..3e5a3ff3 100644 --- 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": {