From: kilian (dks-laptop) Date: Wed, 27 Jan 2021 16:37:28 +0000 (+0100) Subject: v202101271737 t1.3.0 X-Git-Tag: 1.3.0 X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=d9b23cf34b5a55d5ba45eea0af8598d756750ca9;p=pot_lu.git v202101271737 t1.3.0 --- diff --git a/app/lib/POT/Period.pm b/app/lib/POT/Period.pm index abd8dd48..b3ada891 100644 --- 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 1230eebe..b1c27164 100644 --- a/app/lib/POT/Report.pm +++ b/app/lib/POT/Report.pm @@ -437,8 +437,8 @@ sub ReportPage(){ heures contractuelles:
heures travaillées: ".$data->{contracthours}."
".$data->{workhours}." - congé maladie:
congé: - ".(($data->{vacancyill} ne '')?$data->{vacancyill} :"00:00")."
".(($data->{vacancynormal} ne '')?$data->{vacancynormal} :"00:00")." + congé maladie:
congé:
congé except.: + ".(($data->{vacancyill} ne '')?$data->{vacancyill} :"00:00")."
".(($data->{vacancynormal} ne '')?$data->{vacancynormal} :"00:00")."
".(($data->{vacancyextra} ne '')?$data->{vacancyextra} :"00:00")." heures
récupérées: ".$data->{recuperationhours}."
  durée travail
réel prestée: diff --git a/app/lib/dksconfig.pm b/app/lib/dksconfig.pm index 2086bf98..bc0e4a4d 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 0d40d53c..3ca21b22 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} = 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 626b15f3..14ff3109 100644 --- a/app/tmpl/block/dlgstaffperioddays.tt +++ b/app/tmpl/block/dlgstaffperioddays.tt @@ -25,7 +25,7 @@   - Zeitraum 1 + [% lbl.timeperiod %] 1
  - Zeitraum 2 + [% lbl.timeperiod %] 2
@@ -83,7 +83,7 @@ [% lbl.pauses %] - Zeitraum 1 + [% lbl.timeperiod %] 1
- Zeitraum 2 + [% lbl.timeperiod %] 2
diff --git a/app/tmpl/lang/de.tt b/app/tmpl/lang/de.tt index 90ee1c51..17a3d174 100644 --- a/app/tmpl/lang/de.tt +++ b/app/tmpl/lang/de.tt @@ -230,5 +230,6 @@ "validated2" => "val.", "vacancyextra3" => "Sonderurl.", "comment" => "Bemerkung...", - "datasaved" => "Die Daten wurden gespeichert!" + "datasaved" => "Die Daten wurden gespeichert!", + "timeperiod" => "Zeitraum" } %] \ No newline at end of file diff --git a/app/tmpl/lang/fr.tt b/app/tmpl/lang/fr.tt index 8aff4189..8cf8f01c 100644 --- 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
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 15b4709d..6910aea8 100644 --- 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 b0b56736..c21e66a8 100644 --- a/app/tmpl/module/staff.tt +++ b/app/tmpl/module/staff.tt @@ -34,6 +34,7 @@
+