v202101271737 t1.3.0

diff --git a/app/lib/POT/Period.pm b/app/lib/POT/Period.pm
index abd8dd4..b3ada89 100644 (file)
--- a/app/lib/POT/Period.pm
+++ b/app/lib/POT/Period.pm
@@ -172,9 +172,9 @@ sub getPeriodWeekSums(){
   my $sql = "select ws.weekstart,ws.weekend,ws.calweek,ws.calyear, ws.id_staff
   ,to_char(ws.workhours::interval,'HH24:MI') as workhours
   ,to_char(ws.vacancyhours+ws.vacillhours+ws.vacextrahours,'HH24:MI') as vacancyhours
-  ,to_char(ws.vacancyhours,'HH24:MI') as vacancynormal,
-  ,to_char(ws.vacillhours,'HH24:MI') as vacancyill,
-  ,to_char(ws.vacextrahours,'HH24:MI') as vacancyextra,
+  ,to_char(ws.vacancyhours,'HH24:MI') as vacancynormal
+  ,to_char(ws.vacillhours,'HH24:MI') as vacancyill
+  ,to_char(ws.vacextrahours,'HH24:MI') as vacancyextra
   ,to_char(ws.partunemplhours,'HH24:MI') as partunemplhours
   ,to_char(ws.recuperationhours,'HH24:MI') as recuperationhours
   ,to_char(ws.totalhours,'HH24:MI') as totalhours

diff --git a/app/lib/POT/Report.pm b/app/lib/POT/Report.pm
index 1230eeb..b1c2716 100644 (file)
--- a/app/lib/POT/Report.pm
+++ b/app/lib/POT/Report.pm
@@ -437,8 +437,8 @@ sub ReportPage(){
     <tr>
       <td style=\"text-align: right;background-color: #e6e6e6;\">heures contractuelles:<br/>heures travaill&eacute;es:</td>
       <th style=\"width: 15mm;\">".$data->{contracthours}."<br/>".$data->{workhours}."</th>
-      <td style=\"text-align: right;background-color: #e6e6e6;\">cong&eacute; maladie:<br>cong&eacute;:</td>
-      <th style=\"width: 15mm;\">".(($data->{vacancyill} ne '')?$data->{vacancyill} :"00:00")."<br>".(($data->{vacancynormal} ne '')?$data->{vacancynormal} :"00:00")."</th>
+      <td style=\"text-align: right;background-color: #e6e6e6;\">cong&eacute; maladie:<br>cong&eacute;:<br>congé except.:</td>
+      <th style=\"width: 15mm;\">".(($data->{vacancyill} ne '')?$data->{vacancyill} :"00:00")."<br>".(($data->{vacancynormal} ne '')?$data->{vacancynormal} :"00:00")."<br>".(($data->{vacancyextra} ne '')?$data->{vacancyextra} :"00:00")."</th>
       <td style=\"text-align: right;background-color: #e6e6e6;\">heures<br/>r&eacute;cup&eacute;r&eacute;es:</td>
       <th style=\"width: 15mm;\">".$data->{recuperationhours}."<br/>&nbsp;</th>
       <td style=\"text-align: right;background-color: #e6e6e6;\">dur&eacute;e travail<br/>r&eacute;el prest&eacute;e:</td>

diff --git a/app/lib/dksconfig.pm b/app/lib/dksconfig.pm
index 2086bf9..bc0e4a4 100644 (file)
--- 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 0d40d53..3ca21b2 100644 (file)
--- 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} = 1;
+    $self->{debug} = 0;
     $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/tmpl/block/dlgstaffperioddays.tt b/app/tmpl/block/dlgstaffperioddays.tt
index 626b15f..14ff310 100644 (file)
--- a/app/tmpl/block/dlgstaffperioddays.tt
+++ b/app/tmpl/block/dlgstaffperioddays.tt
@@ -25,7 +25,7 @@
                     </td>
                   <td  class="resultcol">&nbsp;</td>
                 </tr>
-                <tr><th class="labelcol">Zeitraum 1</th>
+                <tr><th class="labelcol">[% lbl.timeperiod %] 1</th>
                   <td>
                     <div class="cell" style="width: 86px;">
                     <input class="timefield data_staffreportperioddays" data-column="timestart1" data-id="" style="display: inline;float: left;" placeholder="00:00"  data-table="staffreportperioddays" id="timestart1" name="staffreportperioddays_timestart1" onblur=
@@ -52,7 +52,7 @@
                     <input class="data_staffreportperioddays white text-black readonly" id="interruptionhours" name="staffreportperioddays_interruptionhours" style="width: 60px;display: inline;" type="text" value=""> </td>
                     <td class="resultcol">&nbsp;</td>
                 </tr>
-                <tr><th class="labelcol">Zeitraum 2</th>
+                <tr><th class="labelcol">[% lbl.timeperiod %] 2</th>
                   <td>
                     <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="">
@@ -83,7 +83,7 @@
                   <th colspan="4" class="moduletoolbar">[% lbl.pauses %]</th>
                 </tr>
                 <tr>
-                  <th  class="labelcol">Zeitraum 1</th>
+                  <th  class="labelcol">[% lbl.timeperiod %] 1</th>
                   <td>
                     <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=
@@ -105,7 +105,7 @@
                   </td>
                 </tr>
                 <tr>
-                  <th class="labelcol">Zeitraum 2</th>
+                  <th class="labelcol">[% lbl.timeperiod %] 2</th>
                   <td>
                     <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=

diff --git a/app/tmpl/index.tt b/app/tmpl/index.tt
index de72bf0..e217f3f 100644 (file)
--- a/app/tmpl/index.tt
+++ b/app/tmpl/index.tt
@@ -1,4 +1,4 @@
-[% appversion='1.1.8' %]
+[% appversion='1.3.0' %]
 [% minify = '' %]
 [% PROCESS "lang/${lang}.tt" %]
 <!DOCTYPE html>

diff --git a/app/tmpl/lang/de.tt b/app/tmpl/lang/de.tt
index 90ee1c5..17a3d17 100644 (file)
--- a/app/tmpl/lang/de.tt
+++ b/app/tmpl/lang/de.tt
@@ -230,5 +230,6 @@
   "validated2" => "val.",\r
   "vacancyextra3" => "Sonderurl.",\r
   "comment" => "Bemerkung...",\r
-  "datasaved" => "Die Daten wurden gespeichert!"\r
+  "datasaved" => "Die Daten wurden gespeichert!",\r
+  "timeperiod" => "Zeitraum"\r
  } %]
\ No newline at end of file

diff --git a/app/tmpl/lang/fr.tt b/app/tmpl/lang/fr.tt
index 8aff418..8cf8f01 100644 (file)
--- a/app/tmpl/lang/fr.tt
+++ b/app/tmpl/lang/fr.tt
@@ -87,10 +87,10 @@
   "weekhours_short" => "h/semaine",
   "minmaxvalues" => "Valeurs Minimum/Maximum",
   "maxdayhours" => "max heures/jour",
-  "maxweekhours" => "max heures/semaine",
-  "maxcutoff" => "max coupure",
-  "maxtotal" => "max total",
-  "mindailyfreehours" => "min heures libre quotidienne",
+  "maxweekhours" => "max. semaine",
+  "maxcutoff" => "max. coupure",
+  "maxtotal" => "max. jour",
+  "mindailyfreehours" => "min repos quot.",
   "mindailyouttime" => "min repos quotidien",
   "mindailyouttime2" => "min h. libres<br/>quotidienne",
   "resttime" => "repos quot."
@@ -126,10 +126,10 @@
   "dataset" => "Dataset",
   "usernamechange" => "Changement du Login",
   "newusername" => "nouveau Login",
-  "edittimetracks" => "Editer Pointage",
+  "edittimetracks" => "Pointage",
   "infoouttimes" => "Info heures libres avant/après",
-  "freetimebefore" => "heures libres avant",
-  "freetimeafter" => "heures libres après",
+  "freetimebefore" => "repos quot. avant",
+  "freetimeafter" => "repos quot. après",
   "statementbeforevalidation" => "Décompte avant validation",
   "reopen" => "Reouvrir",
   "transferhours" => "heures à reporter",
@@ -192,34 +192,34 @@
   "days" => "jours",
   "staffnumber" => "No.",
   "ttpincode" => "Code Pin",
-  "timetracker" => "Pointeuse",
-  "timetrackers" => "Pointeuses",
+  "timetracker" => "pointeuse",
+  "timetrackers" => "pointeuses",
   "cleanfp" => "supprimer empr. digitales",
   "staffpwd" => "Mot de Passe Calendrier",
   "vacancyhours" => "heures/année",
-  "vacancyyears" => "Congé annuelle",
+  "vacancyyears" => "congé annuelle",
   "year" => "année",
-  "fixtime" => "Minuten (+/-)",
+  "fixtime" => "minutes (+/-)",
   "staffvacancy" => "Congé",
   "vacancyill" => "maladie",
   "vacancyextra" => "extraordinaire",
   "vacancyextra2" => "c. except.",
-  "partunempl" => "Chômage partielle",
-  "ttentry" => "Entrée",
-  "ttexit" => "Sortie",
+  "partunempl" => "chômage part.",
+  "ttentry" => "entrée",
+  "ttexit" => "sortie",
   "tttotal" => "Total",
   "msgworkhoursinside" => "les pauses doivent être dans l`heure de travail",
   "freeday" => "jour de repos",
   "date" => "Date",
-  "vacdescription" => "Description",
+  "vacdescription" => "description",
   "note" => "Note",
-  "exception" => "Exceptions",
+  "exception" => "exceptions",
   "restriction" => "Restriction",
   "none" => "aucune",
   "onlyworkdays" => "seulement si heures configurées",
   "flexworktime" => "heures de travail flexible",
   "strictworktime" => "heures de travail stricte",
-  "totalwork" => "Total Arbeit",
+  "totalwork" => "Total travail",
   "filter" => "filtrer...",
    "statementtransfered3" => "trans.",
   "supphourspayed2" => "payé",
@@ -230,5 +230,6 @@
   "validated2" => "val.",
   "vacancyextra3" => "c. except.",
   "comment" => "note...",
-  "datasaved" => "Les données ont été sauvegardées!"
+  "datasaved" => "Les données ont été sauvegardées!",
+  "timeperiod" => "période"
  } %]
\ No newline at end of file

diff --git a/app/tmpl/module/periods/reportperiod.js b/app/tmpl/module/periods/reportperiod.js
index 15b4709..6910aea 100644 (file)
--- a/app/tmpl/module/periods/reportperiod.js
+++ b/app/tmpl/module/periods/reportperiod.js
@@ -187,7 +187,8 @@ let reportperiod ={
     }
     let repdata = {"schemata":schemata,"id_reportperiod":udata[0].id,"staff_exclude":staffexcl};
     if (udata[0]) {
-      report.generate('pot',"periode_" + moment(udata[0].startdate).format("YYYYMMDD") + "-" + moment(udata[0].enddate).format("YYYYMMDD"),repdata);
+      let cdate=moment().format("YYYYMMDD-HHmm");
+      report.generate('pot',"periode_" + moment(udata[0].startdate).format("YYYYMMDD") + "-" + moment(udata[0].enddate).format("YYYYMMDD") + "_" + cdate,repdata);
     }
   },
   datarefresh: function(){

diff --git a/app/tmpl/module/staff.tt b/app/tmpl/module/staff.tt
index b0b5673..c21e66a 100644 (file)
--- a/app/tmpl/module/staff.tt
+++ b/app/tmpl/module/staff.tt
@@ -34,6 +34,7 @@
         </div>
   <div id="tbl_staffperiods" ></div>
   <div id="tbl_spsplitted" style="display: none;"></div>
+  
 </div>
 <div id="pnl_staffperiodweeks" class="panel" style="display: none;">
   <div class="bar moduletoolbar">
@@ -43,6 +44,7 @@
           [% INCLUDE module/periods/tlb_staffperiodweeks.tt %]
         </div>
   <div id="tbl_staffperiodweeks" ></div>
+  <div id="tbl_staffperiodfooter"style="border-top: 2px solid black;"></div>
 </div>
 <div id="pnl_staffvacancy" class="panel" style="display: none;">
   <div class="bar moduletoolbar">

diff --git a/desktopapp/package.json b/desktopapp/package.json
index db4a231..ad2052a 100644 (file)
--- a/desktopapp/package.json
+++ b/desktopapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "POT",
-  "version": "1.1.8",
+  "version": "1.3.0",
   "description": "plan d'organisation du travail",
   "main": "main.js",
   "scripts": {