v202020829

diff --git a/dev/db/demo.livedbupdate.sql b/dev/db/demo.livedbupdate.sql
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/dev/db/portanova.livedbupdate.sql b/dev/db/portanova.livedbupdate.sql
index e69de29..e8a7aa0 100644 (file)
--- a/dev/db/portanova.livedbupdate.sql
+++ b/dev/db/portanova.livedbupdate.sql
@@ -0,0 +1,10 @@
+ALTER TABLE portanova.staffcontract ADD COLUMN freeweekdaysonend json;
+ALTER TABLE portanova.staffcontract ADD COLUMN freeweekdaysonstart json;
+ALTER TABLE portanova.staffreportperiod ADD COLUMN status44hcount integer;
+ALTER TABLE portanova.staffreportperiod ADD COLUMN statussuncount integer;
+ALTER TABLE portanova.staffreportperiod ADD COLUMN suppvacancy44hours integer;
+ALTER TABLE portanova.staffreportperiod ADD COLUMN suppvacancysunwork integer;
+ALTER TABLE portanova.staffreportperiod ADD COLUMN transferedhourscalc interval;
+ALTER TABLE portanova.staffreportperiod ADD COLUMN transferedhours interval;
+ALTER TABLE portanova.staffreportperioddays ADD COLUMN payedpause boolean;
+ALTER TABLE portanova.worktimes ADD COLUMN maxhourspercents numeric;

diff --git a/dev/db/potlu2_db.demo.columns.live.txt b/dev/db/potlu2_db.demo.columns.live.txt
new file mode 100644 (file)
index 0000000..24efa96
--- /dev/null
+++ b/dev/db/potlu2_db.demo.columns.live.txt
@@ -0,0 +1,344 @@
+
+demo|reportperiod|BASETABLE|created|timestampwithouttimezone
+demo|reportperiod|BASETABLE|enddate|date
+demo|reportperiod|BASETABLE|id_parentreportperiod|text
+demo|reportperiod|BASETABLE|id|text
+demo|reportperiod|BASETABLE|modified|timestampwithouttimezone
+demo|reportperiod|BASETABLE|periodname|text
+demo|reportperiod|BASETABLE|startdate|date
+demo|reports|BASETABLE|actioncase|text
+demo|reports|BASETABLE|content|text
+demo|reports|BASETABLE|footer|text
+demo|reports|BASETABLE|header|text
+demo|reports|BASETABLE|id|text
+demo|reports|BASETABLE|pdfbottom|numeric
+demo|reports|BASETABLE|pdfencoding|text
+demo|reports|BASETABLE|pdfform|boolean
+demo|reports|BASETABLE|pdfleft|numeric
+demo|reports|BASETABLE|pdforientation|text
+demo|reports|BASETABLE|pdfright|numeric
+demo|reports|BASETABLE|pdfsize|text
+demo|reports|BASETABLE|pdftop|numeric
+demo|reports|BASETABLE|pdfunit|text
+demo|reports|BASETABLE|prefix|text
+demo|reports|BASETABLE|report|text
+demo|reports|BASETABLE|sqlfilename|text
+demo|reports|BASETABLE|templatetype|text
+demo|staff|BASETABLE|address|text
+demo|staff|BASETABLE|birthdate|date
+demo|staff|BASETABLE|city|text
+demo|staff|BASETABLE|country|text
+demo|staff|BASETABLE|created|timestampwithouttimezone
+demo|staff|BASETABLE|email|text
+demo|staff|BASETABLE|id_staffgroup|text
+demo|staff|BASETABLE|id|text
+demo|staff|BASETABLE|isdeleted|boolean
+demo|staff|BASETABLE|job|text
+demo|staff|BASETABLE|matricule|text
+demo|staff|BASETABLE|modified|timestampwithouttimezone
+demo|staff|BASETABLE|phone|text
+demo|staff|BASETABLE|prename|text
+demo|staff|BASETABLE|staffnumber|text
+demo|staff|BASETABLE|surname|text
+demo|staff|BASETABLE|zip|text
+demo|staffcontract|BASETABLE|created|timestampwithouttimezone
+demo|staffcontract|BASETABLE|defaultfreedays|json
+demo|staffcontract|BASETABLE|enddate|date
+demo|staffcontract|BASETABLE|id_contractworkplan|text
+demo|staffcontract|BASETABLE|id_staff|text
+demo|staffcontract|BASETABLE|id|text
+demo|staffcontract|BASETABLE|modified|timestampwithouttimezone
+demo|staffcontract|BASETABLE|startdate|date
+demo|staffcontract|BASETABLE|weekdays|integer
+demo|staffcontract|BASETABLE|weekhours|interval
+demo|staffgroups|BASETABLE|created|timestampwithouttimezone
+demo|staffgroups|BASETABLE|editoruser_ids|json
+demo|staffgroups|BASETABLE|groupcolor|text
+demo|staffgroups|BASETABLE|groupname|text
+demo|staffgroups|BASETABLE|id|text
+demo|staffgroups|BASETABLE|isdefault|boolean
+demo|staffgroups|BASETABLE|modified|timestampwithouttimezone
+demo|staffreportperiod|BASETABLE|contracthours|interval
+demo|staffreportperiod|BASETABLE|created|timestampwithouttimezone
+demo|staffreportperiod|BASETABLE|diffhourspayed|interval
+demo|staffreportperiod|BASETABLE|hoursdiff|interval
+demo|staffreportperiod|BASETABLE|id_reportperiod|text
+demo|staffreportperiod|BASETABLE|id_staff|text
+demo|staffreportperiod|BASETABLE|id|text
+demo|staffreportperiod|BASETABLE|modified|timestampwithouttimezone
+demo|staffreportperiod|BASETABLE|payedhours|interval
+demo|staffreportperiod|BASETABLE|recuperationhours|interval
+demo|staffreportperiod|BASETABLE|totalhours|interval
+demo|staffreportperiod|BASETABLE|vacancyhours|interval
+demo|staffreportperiod|BASETABLE|workhours|interval
+demo|staffreportperioddays|BASETABLE|contracthours|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|created|timestampwithouttimezone
+demo|staffreportperioddays|BASETABLE|daydate|date
+demo|staffreportperioddays|BASETABLE|dayhours|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|daytype|text
+demo|staffreportperioddays|BASETABLE|id_recuperationtype|text
+demo|staffreportperioddays|BASETABLE|id_reportperiod|text
+demo|staffreportperioddays|BASETABLE|id_staffgroup|text
+demo|staffreportperioddays|BASETABLE|id_staff|text
+demo|staffreportperioddays|BASETABLE|id|text
+demo|staffreportperioddays|BASETABLE|id_vacancytype|text
+demo|staffreportperioddays|BASETABLE|interruptionhours|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|modified|timestampwithouttimezone
+demo|staffreportperioddays|BASETABLE|pauseend1|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|pauseend2|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|pausestart1|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|pausestart2|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|recuperationhours|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|timeend1|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|timeend2|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|timepause|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|timestart1|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|timestart2|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|trackedhours|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|vacancyhours|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|wdcontracthours|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|workhours|timewithouttimezone
+demo|staffreportperiodweeks|BASETABLE|caldays|integer
+demo|staffreportperiodweeks|BASETABLE|calweek|doubleprecision
+demo|staffreportperiodweeks|BASETABLE|calyear|integer
+demo|staffreportperiodweeks|BASETABLE|contractdays|integer
+demo|staffreportperiodweeks|BASETABLE|contracthours|interval
+demo|staffreportperiodweeks|BASETABLE|created|timestampwithouttimezone
+demo|staffreportperiodweeks|BASETABLE|diffhours|interval
+demo|staffreportperiodweeks|BASETABLE|hoursrestbefore|interval
+demo|staffreportperiodweeks|BASETABLE|id_reportperiod|text
+demo|staffreportperiodweeks|BASETABLE|id_staff|text
+demo|staffreportperiodweeks|BASETABLE|id|text
+demo|staffreportperiodweeks|BASETABLE|modified|timestampwithouttimezone
+demo|staffreportperiodweeks|BASETABLE|recuperationhours|interval
+demo|staffreportperiodweeks|BASETABLE|totalhours|interval
+demo|staffreportperiodweeks|BASETABLE|trackedhours|interval
+demo|staffreportperiodweeks|BASETABLE|vacancyhours|interval
+demo|staffreportperiodweeks|BASETABLE|weekstart|date
+demo|staffreportperiodweeks|BASETABLE|workdays|integer
+demo|staffreportperiodweeks|BASETABLE|workhours|interval
+demo|staffvacancy|BASETABLE|created|timestampwithouttimezone
+demo|staffvacancy|BASETABLE|daydate|date
+demo|staffvacancy|BASETABLE|id_staff|integer
+demo|staffvacancy|BASETABLE|id|text
+demo|staffvacancy|BASETABLE|id_vacancytype|text
+demo|staffvacancy|BASETABLE|modified|timestampwithouttimezone
+demo|staffvacancy|BASETABLE|vacancyhours|timewithouttimezone
+demo|vacancydays|BASETABLE|created|timestampwithouttimezone
+demo|vacancydays|BASETABLE|daydate|date
+demo|vacancydays|BASETABLE|id|text
+demo|vacancydays|BASETABLE|modified|timestampwithouttimezone
+demo|vacancydays|BASETABLE|vacancyname|text
+demo|vacancytypes|BASETABLE|color|text
+demo|vacancytypes|BASETABLE|created|timestampwithouttimezone
+demo|vacancytypes|BASETABLE|id|text
+demo|vacancytypes|BASETABLE|isfreetime|boolean
+demo|vacancytypes|BASETABLE|isworktime|boolean
+demo|vacancytypes|BASETABLE|modified|timestampwithouttimezone
+demo|vacancytypes|BASETABLE|vacancyname|text
+demo|vw_reportperioddata|VIEW|enddate|date
+demo|vw_reportperioddata|VIEW|id_parentreportperiod|text
+demo|vw_reportperioddata|VIEW|id|text
+demo|vw_reportperioddata|VIEW|periodname|text
+demo|vw_reportperioddata|VIEW|startdate|date
+demo|vw_reportperiodlist|VIEW|enddate|date
+demo|vw_reportperiodlist|VIEW|id_parentreportperiod|text
+demo|vw_reportperiodlist|VIEW|id|text
+demo|vw_reportperiodlist|VIEW|periodname|text
+demo|vw_reportperiodlist|VIEW|startdate|date
+demo|vw_rplbygrpname|VIEW|enddate|date
+demo|vw_rplbygrpname|VIEW|groupname|text
+demo|vw_rplbygrpname|VIEW|id_reportperiod|text
+demo|vw_rplbygrpname|VIEW|id_staffgroup|text
+demo|vw_rplbygrpname|VIEW|startdate|date
+demo|vw_staffcontractdata|VIEW|defaultfreedays|json
+demo|vw_staffcontractdata|VIEW|enddate|date
+demo|vw_staffcontractdata|VIEW|id_contractworkplan|text
+demo|vw_staffcontractdata|VIEW|id_staffcontract|text
+demo|vw_staffcontractdata|VIEW|id_staff|text
+demo|vw_staffcontractdata|VIEW|id|text
+demo|vw_staffcontractdata|VIEW|startdate|date
+demo|vw_staffcontractdata|VIEW|weekdays|integer
+demo|vw_staffcontractdata|VIEW|weekhours|interval
+demo|vw_staffcontractlist|VIEW|defaultfreedays|text
+demo|vw_staffcontractlist|VIEW|enddate|date
+demo|vw_staffcontractlist|VIEW|id_contractworkplan|text
+demo|vw_staffcontractlist|VIEW|id_staff|text
+demo|vw_staffcontractlist|VIEW|id|text
+demo|vw_staffcontractlist|VIEW|startdate|date
+demo|vw_staffcontractlist|VIEW|weekdays|integer
+demo|vw_staffcontractlist|VIEW|weekhours|text
+demo|vw_staffcontractlist|VIEW|workplan|text
+demo|vw_staffdata|VIEW|address|text
+demo|vw_staffdata|VIEW|birthdate|date
+demo|vw_staffdata|VIEW|city|text
+demo|vw_staffdata|VIEW|country|text
+demo|vw_staffdata|VIEW|email|text
+demo|vw_staffdata|VIEW|id_staffgroup|text
+demo|vw_staffdata|VIEW|id|text
+demo|vw_staffdata|VIEW|job|text
+demo|vw_staffdata|VIEW|matricule|text
+demo|vw_staffdata|VIEW|phone|text
+demo|vw_staffdata|VIEW|prename|text
+demo|vw_staffdata|VIEW|staffnumber|text
+demo|vw_staffdata|VIEW|surname|text
+demo|vw_staffdata|VIEW|zip|text
+demo|vw_staffgroupsdata|VIEW|groupcolor|text
+demo|vw_staffgroupsdata|VIEW|groupname|text
+demo|vw_staffgroupsdata|VIEW|id|text
+demo|vw_staffgroupsdata|VIEW|isdefault|boolean
+demo|vw_staffgroupsdata|VIEW|staffmembers|bigint
+demo|vw_staffgroupslist|VIEW|groupname|text
+demo|vw_staffgroupslist|VIEW|id|text
+demo|vw_staffgroupslist|VIEW|isdefault|boolean
+demo|vw_staffgroupslist|VIEW|staffmembers|bigint
+demo|vw_stafflist|VIEW|birthdate|date
+demo|vw_stafflist|VIEW|dspname|text
+demo|vw_stafflist|VIEW|entrydate|date
+demo|vw_stafflist|VIEW|groupname|text
+demo|vw_stafflist|VIEW|id|text
+demo|vw_stafflist|VIEW|job|text
+demo|vw_stafflist|VIEW|prename|text
+demo|vw_stafflist|VIEW|staffnumber|text
+demo|vw_stafflist|VIEW|surname|text
+demo|vw_staffreportperioddays|VIEW|contracthours|text
+demo|vw_staffreportperioddays|VIEW|daydate|date
+demo|vw_staffreportperioddays|VIEW|dayhours|text
+demo|vw_staffreportperioddays|VIEW|daytype|text
+demo|vw_staffreportperioddays|VIEW|dsppausedata|text
+demo|vw_staffreportperioddays|VIEW|dspweekdates|text
+demo|vw_staffreportperioddays|VIEW|dspweekshort|text
+demo|vw_staffreportperioddays|VIEW|dspweek|text
+demo|vw_staffreportperioddays|VIEW|dspworkdata|text
+demo|vw_staffreportperioddays|VIEW|freehoursafter|text
+demo|vw_staffreportperioddays|VIEW|id_recuperationtype|text
+demo|vw_staffreportperioddays|VIEW|id_reportperiod|text
+demo|vw_staffreportperioddays|VIEW|id_staff|text
+demo|vw_staffreportperioddays|VIEW|id|text
+demo|vw_staffreportperioddays|VIEW|id_vacancytype|text
+demo|vw_staffreportperioddays|VIEW|id_week|text
+demo|vw_staffreportperioddays|VIEW|interruptionhours|text
+demo|vw_staffreportperioddays|VIEW|pauseend1|text
+demo|vw_staffreportperioddays|VIEW|pauseend2|text
+demo|vw_staffreportperioddays|VIEW|pausestart1|text
+demo|vw_staffreportperioddays|VIEW|pausestart2|text
+demo|vw_staffreportperioddays|VIEW|periodend|date
+demo|vw_staffreportperioddays|VIEW|periodstart|date
+demo|vw_staffreportperioddays|VIEW|recuperationhours|text
+demo|vw_staffreportperioddays|VIEW|timeend1|text
+demo|vw_staffreportperioddays|VIEW|timeend2|text
+demo|vw_staffreportperioddays|VIEW|timepause|text
+demo|vw_staffreportperioddays|VIEW|timestart1|text
+demo|vw_staffreportperioddays|VIEW|timestart2|text
+demo|vw_staffreportperioddays|VIEW|vacancyhours|text
+demo|vw_staffreportperioddays|VIEW|week_contracthours|text
+demo|vw_staffreportperioddays|VIEW|weekdates|text
+demo|vw_staffreportperioddays|VIEW|week_diffhours|text
+demo|vw_staffreportperioddays|VIEW|weekident|text
+demo|vw_staffreportperioddays|VIEW|week_recuperationhours|text
+demo|vw_staffreportperioddays|VIEW|week_totalhours|text
+demo|vw_staffreportperioddays|VIEW|week_vacancyhours|text
+demo|vw_staffreportperioddays|VIEW|week_workhours|text
+demo|vw_staffreportperioddays|VIEW|workhours|text
+demo|vw_staffreportperiodlist|VIEW|contracthours|text
+demo|vw_staffreportperiodlist|VIEW|enddate|date
+demo|vw_staffreportperiodlist|VIEW|groupname|text
+demo|vw_staffreportperiodlist|VIEW|hoursdiff|text
+demo|vw_staffreportperiodlist|VIEW|id_reportperiod|text
+demo|vw_staffreportperiodlist|VIEW|id_staffgroup|text
+demo|vw_staffreportperiodlist|VIEW|id_staff|text
+demo|vw_staffreportperiodlist|VIEW|id|text
+demo|vw_staffreportperiodlist|VIEW|payedhours|text
+demo|vw_staffreportperiodlist|VIEW|prename|text
+demo|vw_staffreportperiodlist|VIEW|recuperationhours|text
+demo|vw_staffreportperiodlist|VIEW|staffname|text
+demo|vw_staffreportperiodlist|VIEW|startdate|date
+demo|vw_staffreportperiodlist|VIEW|surname|text
+demo|vw_staffreportperiodlist|VIEW|totalhours|text
+demo|vw_staffreportperiodlist|VIEW|vacancyhours|text
+demo|vw_staffreportperiodlist|VIEW|workhours|text
+demo|vw_vacancylist|VIEW|id|text
+demo|vw_vacancylist|VIEW|isworktime|boolean
+demo|vw_vacancylist|VIEW|vacancyname|text
+demo|vw_workplandaysdata|VIEW|end1|timewithouttimezone
+demo|vw_workplandaysdata|VIEW|end2|timewithouttimezone
+demo|vw_workplandaysdata|VIEW|id|text
+demo|vw_workplandaysdata|VIEW|id_workplan|text
+demo|vw_workplandaysdata|VIEW|pauseend1|timewithouttimezone
+demo|vw_workplandaysdata|VIEW|pauseend2|timewithouttimezone
+demo|vw_workplandaysdata|VIEW|pausestart1|timewithouttimezone
+demo|vw_workplandaysdata|VIEW|pausestart2|timewithouttimezone
+demo|vw_workplandaysdata|VIEW|pause|timewithouttimezone
+demo|vw_workplandaysdata|VIEW|start1|timewithouttimezone
+demo|vw_workplandaysdata|VIEW|start2|timewithouttimezone
+demo|vw_workplandaysdata|VIEW|weekday|integer
+demo|vw_workplandayslist|VIEW|dayhours|text
+demo|vw_workplandayslist|VIEW|dsppausedata|text
+demo|vw_workplandayslist|VIEW|dspworkdata|text
+demo|vw_workplandayslist|VIEW|end1|text
+demo|vw_workplandayslist|VIEW|end2|text
+demo|vw_workplandayslist|VIEW|id|text
+demo|vw_workplandayslist|VIEW|id_workplan|text
+demo|vw_workplandayslist|VIEW|interruption|text
+demo|vw_workplandayslist|VIEW|pauseend1|text
+demo|vw_workplandayslist|VIEW|pauseend2|text
+demo|vw_workplandayslist|VIEW|pausestart1|text
+demo|vw_workplandayslist|VIEW|pausestart2|text
+demo|vw_workplandayslist|VIEW|pause|text
+demo|vw_workplandayslist|VIEW|staffcount|bigint
+demo|vw_workplandayslist|VIEW|start1|text
+demo|vw_workplandayslist|VIEW|start2|text
+demo|vw_workplandayslist|VIEW|weekday|integer
+demo|vw_workplandayslist|VIEW|weekhours|text
+demo|vw_workplandayslist|VIEW|weeknum|integer
+demo|vw_workplandayslist|VIEW|workplan|text
+demo|vw_workplanlist|VIEW|dspworkplandetail|text
+demo|vw_workplanlist|VIEW|id|text
+demo|vw_workplanlist|VIEW|isdefault|boolean
+demo|vw_workplanlist|VIEW|staffcount|bigint
+demo|vw_workplanlist|VIEW|workplan|text
+demo|vw_worktimeslist|VIEW|defaultdayhours|text
+demo|vw_worktimeslist|VIEW|defaultweekhours|text
+demo|vw_worktimeslist|VIEW|enddate|date
+demo|vw_worktimeslist|VIEW|id|text
+demo|vw_worktimeslist|VIEW|isdefault|boolean
+demo|vw_worktimeslist|VIEW|maxdayhours|text
+demo|vw_worktimeslist|VIEW|maxinterruptionhours|text
+demo|vw_worktimeslist|VIEW|maxweekhours|text
+demo|vw_worktimeslist|VIEW|mindailyrecuperation|text
+demo|vw_worktimeslist|VIEW|startdate|date
+demo|workplandays|BASETABLE|created|timestampwithouttimezone
+demo|workplandays|BASETABLE|end1|timewithouttimezone
+demo|workplandays|BASETABLE|end2|timewithouttimezone
+demo|workplandays|BASETABLE|id|text
+demo|workplandays|BASETABLE|id_workplan|text
+demo|workplandays|BASETABLE|modified|timestampwithouttimezone
+demo|workplandays|BASETABLE|pauseend1|timewithouttimezone
+demo|workplandays|BASETABLE|pauseend2|timewithouttimezone
+demo|workplandays|BASETABLE|pausestart1|timewithouttimezone
+demo|workplandays|BASETABLE|pausestart2|timewithouttimezone
+demo|workplandays|BASETABLE|pause|timewithouttimezone
+demo|workplandays|BASETABLE|start1|timewithouttimezone
+demo|workplandays|BASETABLE|start2|timewithouttimezone
+demo|workplandays|BASETABLE|weekday|integer
+demo|workplandays|BASETABLE|weeknum|integer
+demo|workplans|BASETABLE|created|timestampwithouttimezone
+demo|workplans|BASETABLE|freeweekdayslist|json
+demo|workplans|BASETABLE|id|text
+demo|workplans|BASETABLE|isdefault|boolean
+demo|workplans|BASETABLE|modified|timestampwithouttimezone
+demo|workplans|BASETABLE|weekdays|integer
+demo|workplans|BASETABLE|weekhours|interval
+demo|workplans|BASETABLE|workplan|text
+demo|worktimes|BASETABLE|created|timestampwithouttimezone
+demo|worktimes|BASETABLE|defaultdayhours|interval
+demo|worktimes|BASETABLE|defaultweekhours|interval
+demo|worktimes|BASETABLE|enddate|date
+demo|worktimes|BASETABLE|id|text
+demo|worktimes|BASETABLE|isdefault|boolean
+demo|worktimes|BASETABLE|maxdayhours|interval
+demo|worktimes|BASETABLE|maxinterruptionhours|interval
+demo|worktimes|BASETABLE|maxweekhours|interval
+demo|worktimes|BASETABLE|mindailyrecuperation|timewithouttimezone
+demo|worktimes|BASETABLE|modified|timestampwithouttimezone
+demo|worktimes|BASETABLE|startdate|date

diff --git a/dev/db/potlu2_db.demo.columns.local.txt b/dev/db/potlu2_db.demo.columns.local.txt
new file mode 100644 (file)
index 0000000..c8e0cf5
--- /dev/null
+++ b/dev/db/potlu2_db.demo.columns.local.txt
@@ -0,0 +1,325 @@
+
+demo|reportperiod|BASETABLE|created|timestampwithouttimezone
+demo|reportperiod|BASETABLE|enddate|date
+demo|reportperiod|BASETABLE|id_parentreportperiod|text
+demo|reportperiod|BASETABLE|id|text
+demo|reportperiod|BASETABLE|modified|timestampwithouttimezone
+demo|reportperiod|BASETABLE|periodname|text
+demo|reportperiod|BASETABLE|startdate|date
+demo|reports|BASETABLE|actioncase|text
+demo|reports|BASETABLE|content|text
+demo|reports|BASETABLE|footer|text
+demo|reports|BASETABLE|header|text
+demo|reports|BASETABLE|id|text
+demo|reports|BASETABLE|pdfbottom|numeric
+demo|reports|BASETABLE|pdfencoding|text
+demo|reports|BASETABLE|pdfform|boolean
+demo|reports|BASETABLE|pdfleft|numeric
+demo|reports|BASETABLE|pdforientation|text
+demo|reports|BASETABLE|pdfright|numeric
+demo|reports|BASETABLE|pdfsize|text
+demo|reports|BASETABLE|pdftop|numeric
+demo|reports|BASETABLE|pdfunit|text
+demo|reports|BASETABLE|prefix|text
+demo|reports|BASETABLE|report|text
+demo|reports|BASETABLE|sqlfilename|text
+demo|reports|BASETABLE|templatetype|text
+demo|staff|BASETABLE|address|text
+demo|staff|BASETABLE|birthdate|date
+demo|staff|BASETABLE|city|text
+demo|staff|BASETABLE|country|text
+demo|staff|BASETABLE|created|timestampwithouttimezone
+demo|staff|BASETABLE|email|text
+demo|staff|BASETABLE|id_staffgroup|text
+demo|staff|BASETABLE|id|text
+demo|staff|BASETABLE|isdeleted|boolean
+demo|staff|BASETABLE|job|text
+demo|staff|BASETABLE|matricule|text
+demo|staff|BASETABLE|modified|timestampwithouttimezone
+demo|staff|BASETABLE|phone|text
+demo|staff|BASETABLE|prename|text
+demo|staff|BASETABLE|staffnumber|text
+demo|staff|BASETABLE|surname|text
+demo|staff|BASETABLE|zip|text
+demo|staffcontract|BASETABLE|created|timestampwithouttimezone
+demo|staffcontract|BASETABLE|defaultfreedays|json
+demo|staffcontract|BASETABLE|enddate|date
+demo|staffcontract|BASETABLE|id_contractworkplan|text
+demo|staffcontract|BASETABLE|id_staff|text
+demo|staffcontract|BASETABLE|id|text
+demo|staffcontract|BASETABLE|modified|timestampwithouttimezone
+demo|staffcontract|BASETABLE|startdate|date
+demo|staffcontract|BASETABLE|weekdays|integer
+demo|staffcontract|BASETABLE|weekhours|interval
+demo|staffgroups|BASETABLE|created|timestampwithouttimezone
+demo|staffgroups|BASETABLE|editoruser_ids|json
+demo|staffgroups|BASETABLE|groupcolor|text
+demo|staffgroups|BASETABLE|groupname|text
+demo|staffgroups|BASETABLE|id|text
+demo|staffgroups|BASETABLE|isdefault|boolean
+demo|staffgroups|BASETABLE|modified|timestampwithouttimezone
+demo|staffreportperiod|BASETABLE|contracthours|interval
+demo|staffreportperiod|BASETABLE|created|timestampwithouttimezone
+demo|staffreportperiod|BASETABLE|diffhourspayed|interval
+demo|staffreportperiod|BASETABLE|hoursdiff|interval
+demo|staffreportperiod|BASETABLE|id_reportperiod|text
+demo|staffreportperiod|BASETABLE|id_staff|text
+demo|staffreportperiod|BASETABLE|id|text
+demo|staffreportperiod|BASETABLE|modified|timestampwithouttimezone
+demo|staffreportperiod|BASETABLE|payedhours|interval
+demo|staffreportperiod|BASETABLE|recuperationhours|interval
+demo|staffreportperiod|BASETABLE|totalhours|interval
+demo|staffreportperiod|BASETABLE|vacancyhours|interval
+demo|staffreportperiod|BASETABLE|workhours|interval
+demo|staffreportperioddays|BASETABLE|contracthours|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|created|timestampwithouttimezone
+demo|staffreportperioddays|BASETABLE|daydate|date
+demo|staffreportperioddays|BASETABLE|dayhours|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|daytype|text
+demo|staffreportperioddays|BASETABLE|id_recuperationtype|text
+demo|staffreportperioddays|BASETABLE|id_reportperiod|text
+demo|staffreportperioddays|BASETABLE|id_staffgroup|text
+demo|staffreportperioddays|BASETABLE|id_staff|text
+demo|staffreportperioddays|BASETABLE|id|text
+demo|staffreportperioddays|BASETABLE|id_vacancytype|text
+demo|staffreportperioddays|BASETABLE|interruptionhours|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|modified|timestampwithouttimezone
+demo|staffreportperioddays|BASETABLE|pauseend1|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|pauseend2|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|pausestart1|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|pausestart2|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|recuperationhours|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|timeend1|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|timeend2|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|timepause|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|timestart1|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|timestart2|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|trackedhours|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|vacancyhours|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|wdcontracthours|timewithouttimezone
+demo|staffreportperioddays|BASETABLE|workhours|timewithouttimezone
+demo|staffreportperiodweeks|BASETABLE|caldays|integer
+demo|staffreportperiodweeks|BASETABLE|calweek|doubleprecision
+demo|staffreportperiodweeks|BASETABLE|calyear|integer
+demo|staffreportperiodweeks|BASETABLE|contractdays|integer
+demo|staffreportperiodweeks|BASETABLE|contracthours|interval
+demo|staffreportperiodweeks|BASETABLE|created|timestampwithouttimezone
+demo|staffreportperiodweeks|BASETABLE|diffhours|interval
+demo|staffreportperiodweeks|BASETABLE|hoursrestbefore|interval
+demo|staffreportperiodweeks|BASETABLE|id_reportperiod|text
+demo|staffreportperiodweeks|BASETABLE|id_staff|text
+demo|staffreportperiodweeks|BASETABLE|id|text
+demo|staffreportperiodweeks|BASETABLE|modified|timestampwithouttimezone
+demo|staffreportperiodweeks|BASETABLE|recuperationhours|interval
+demo|staffreportperiodweeks|BASETABLE|totalhours|interval
+demo|staffreportperiodweeks|BASETABLE|trackedhours|interval
+demo|staffreportperiodweeks|BASETABLE|vacancyhours|interval
+demo|staffreportperiodweeks|BASETABLE|weekstart|date
+demo|staffreportperiodweeks|BASETABLE|workdays|integer
+demo|staffreportperiodweeks|BASETABLE|workhours|interval
+demo|staffvacancy|BASETABLE|created|timestampwithouttimezone
+demo|staffvacancy|BASETABLE|daydate|date
+demo|staffvacancy|BASETABLE|id_staff|integer
+demo|staffvacancy|BASETABLE|id|text
+demo|staffvacancy|BASETABLE|id_vacancytype|text
+demo|staffvacancy|BASETABLE|modified|timestampwithouttimezone
+demo|staffvacancy|BASETABLE|vacancyhours|timewithouttimezone
+demo|vacancydays|BASETABLE|created|timestampwithouttimezone
+demo|vacancydays|BASETABLE|daydate|date
+demo|vacancydays|BASETABLE|id|text
+demo|vacancydays|BASETABLE|modified|timestampwithouttimezone
+demo|vacancydays|BASETABLE|vacancyname|text
+demo|vacancytypes|BASETABLE|color|text
+demo|vacancytypes|BASETABLE|created|timestampwithouttimezone
+demo|vacancytypes|BASETABLE|id|text
+demo|vacancytypes|BASETABLE|isfreetime|boolean
+demo|vacancytypes|BASETABLE|isworktime|boolean
+demo|vacancytypes|BASETABLE|modified|timestampwithouttimezone
+demo|vacancytypes|BASETABLE|vacancyname|text
+demo|vw_reportperioddata|VIEW|enddate|date
+demo|vw_reportperioddata|VIEW|id_parentreportperiod|text
+demo|vw_reportperioddata|VIEW|id|text
+demo|vw_reportperioddata|VIEW|periodname|text
+demo|vw_reportperioddata|VIEW|startdate|date
+demo|vw_reportperiodlist|VIEW|enddate|date
+demo|vw_reportperiodlist|VIEW|id_parentreportperiod|text
+demo|vw_reportperiodlist|VIEW|id|text
+demo|vw_reportperiodlist|VIEW|periodname|text
+demo|vw_reportperiodlist|VIEW|startdate|date
+demo|vw_rplbygrpname|VIEW|enddate|date
+demo|vw_rplbygrpname|VIEW|groupname|text
+demo|vw_rplbygrpname|VIEW|id_reportperiod|text
+demo|vw_rplbygrpname|VIEW|id_staffgroup|text
+demo|vw_rplbygrpname|VIEW|startdate|date
+demo|vw_staffcontractdata|VIEW|defaultfreedays|json
+demo|vw_staffcontractdata|VIEW|enddate|date
+demo|vw_staffcontractdata|VIEW|id_contractworkplan|text
+demo|vw_staffcontractdata|VIEW|id_staffcontract|text
+demo|vw_staffcontractdata|VIEW|id_staff|text
+demo|vw_staffcontractdata|VIEW|id|text
+demo|vw_staffcontractdata|VIEW|startdate|date
+demo|vw_staffcontractdata|VIEW|weekdays|integer
+demo|vw_staffcontractdata|VIEW|weekhours|interval
+demo|vw_staffcontractlist|VIEW|defaultfreedays|text
+demo|vw_staffcontractlist|VIEW|enddate|date
+demo|vw_staffcontractlist|VIEW|id_contractworkplan|text
+demo|vw_staffcontractlist|VIEW|id_staff|text
+demo|vw_staffcontractlist|VIEW|id|text
+demo|vw_staffcontractlist|VIEW|startdate|date
+demo|vw_staffcontractlist|VIEW|weekdays|integer
+demo|vw_staffcontractlist|VIEW|weekhours|interval
+demo|vw_staffcontractlist|VIEW|workplan|text
+demo|vw_staffdata|VIEW|address|text
+demo|vw_staffdata|VIEW|birthdate|date
+demo|vw_staffdata|VIEW|city|text
+demo|vw_staffdata|VIEW|country|text
+demo|vw_staffdata|VIEW|email|text
+demo|vw_staffdata|VIEW|id_staffgroup|text
+demo|vw_staffdata|VIEW|id|text
+demo|vw_staffdata|VIEW|job|text
+demo|vw_staffdata|VIEW|matricule|text
+demo|vw_staffdata|VIEW|phone|text
+demo|vw_staffdata|VIEW|prename|text
+demo|vw_staffdata|VIEW|staffnumber|text
+demo|vw_staffdata|VIEW|surname|text
+demo|vw_staffdata|VIEW|zip|text
+demo|vw_staffgroupsdata|VIEW|groupcolor|text
+demo|vw_staffgroupsdata|VIEW|groupname|text
+demo|vw_staffgroupsdata|VIEW|id|text
+demo|vw_staffgroupsdata|VIEW|isdefault|boolean
+demo|vw_staffgroupsdata|VIEW|staffmembers|bigint
+demo|vw_staffgroupslist|VIEW|groupname|text
+demo|vw_staffgroupslist|VIEW|id|text
+demo|vw_staffgroupslist|VIEW|isdefault|boolean
+demo|vw_staffgroupslist|VIEW|staffmembers|bigint
+demo|vw_stafflist|VIEW|birthdate|date
+demo|vw_stafflist|VIEW|dspname|text
+demo|vw_stafflist|VIEW|entrydate|date
+demo|vw_stafflist|VIEW|groupname|text
+demo|vw_stafflist|VIEW|id|text
+demo|vw_stafflist|VIEW|job|text
+demo|vw_stafflist|VIEW|prename|text
+demo|vw_stafflist|VIEW|staffnumber|text
+demo|vw_stafflist|VIEW|surname|text
+demo|vw_staffreportperioddays|VIEW|contracthours|text
+demo|vw_staffreportperioddays|VIEW|daydate|date
+demo|vw_staffreportperioddays|VIEW|dayhours|text
+demo|vw_staffreportperioddays|VIEW|daytype|text
+demo|vw_staffreportperioddays|VIEW|dspweekdates|text
+demo|vw_staffreportperioddays|VIEW|dspweekshort|text
+demo|vw_staffreportperioddays|VIEW|dspweek|text
+demo|vw_staffreportperioddays|VIEW|id_recuperationtype|text
+demo|vw_staffreportperioddays|VIEW|id_reportperiod|text
+demo|vw_staffreportperioddays|VIEW|id_staff|text
+demo|vw_staffreportperioddays|VIEW|id|text
+demo|vw_staffreportperioddays|VIEW|id_vacancytype|text
+demo|vw_staffreportperioddays|VIEW|id_week|text
+demo|vw_staffreportperioddays|VIEW|interruptionhours|text
+demo|vw_staffreportperioddays|VIEW|periodend|date
+demo|vw_staffreportperioddays|VIEW|periodstart|date
+demo|vw_staffreportperioddays|VIEW|recuperationhours|text
+demo|vw_staffreportperioddays|VIEW|timeend1|text
+demo|vw_staffreportperioddays|VIEW|timeend2|text
+demo|vw_staffreportperioddays|VIEW|timepause|text
+demo|vw_staffreportperioddays|VIEW|timestart1|text
+demo|vw_staffreportperioddays|VIEW|timestart2|text
+demo|vw_staffreportperioddays|VIEW|vacancyhours|text
+demo|vw_staffreportperioddays|VIEW|week_contracthours|text
+demo|vw_staffreportperioddays|VIEW|weekdates|text
+demo|vw_staffreportperioddays|VIEW|week_diffhours|text
+demo|vw_staffreportperioddays|VIEW|weekident|text
+demo|vw_staffreportperioddays|VIEW|week_recuperationhours|text
+demo|vw_staffreportperioddays|VIEW|week_totalhours|text
+demo|vw_staffreportperioddays|VIEW|week_vacancyhours|text
+demo|vw_staffreportperioddays|VIEW|week_workhours|text
+demo|vw_staffreportperioddays|VIEW|workhours|text
+demo|vw_staffreportperiodlist|VIEW|contracthours|text
+demo|vw_staffreportperiodlist|VIEW|enddate|date
+demo|vw_staffreportperiodlist|VIEW|groupname|text
+demo|vw_staffreportperiodlist|VIEW|hoursdiff|text
+demo|vw_staffreportperiodlist|VIEW|id_reportperiod|text
+demo|vw_staffreportperiodlist|VIEW|id_staffgroup|text
+demo|vw_staffreportperiodlist|VIEW|id_staff|text
+demo|vw_staffreportperiodlist|VIEW|id|text
+demo|vw_staffreportperiodlist|VIEW|payedhours|text
+demo|vw_staffreportperiodlist|VIEW|prename|text
+demo|vw_staffreportperiodlist|VIEW|recuperationhours|text
+demo|vw_staffreportperiodlist|VIEW|staffname|text
+demo|vw_staffreportperiodlist|VIEW|startdate|date
+demo|vw_staffreportperiodlist|VIEW|surname|text
+demo|vw_staffreportperiodlist|VIEW|totalhours|text
+demo|vw_staffreportperiodlist|VIEW|vacancyhours|text
+demo|vw_staffreportperiodlist|VIEW|workhours|text
+demo|vw_vacancylist|VIEW|id|text
+demo|vw_vacancylist|VIEW|isworktime|boolean
+demo|vw_vacancylist|VIEW|vacancyname|text
+demo|vw_workplandaysdata|VIEW|end1|timewithouttimezone
+demo|vw_workplandaysdata|VIEW|end2|timewithouttimezone
+demo|vw_workplandaysdata|VIEW|id|text
+demo|vw_workplandaysdata|VIEW|id_workplan|text
+demo|vw_workplandaysdata|VIEW|pause|timewithouttimezone
+demo|vw_workplandaysdata|VIEW|start1|timewithouttimezone
+demo|vw_workplandaysdata|VIEW|start2|timewithouttimezone
+demo|vw_workplandaysdata|VIEW|weekday|integer
+demo|vw_workplandayslist|VIEW|dayhours|text
+demo|vw_workplandayslist|VIEW|end1|text
+demo|vw_workplandayslist|VIEW|end2|text
+demo|vw_workplandayslist|VIEW|id|text
+demo|vw_workplandayslist|VIEW|id_workplan|text
+demo|vw_workplandayslist|VIEW|interruption|text
+demo|vw_workplandayslist|VIEW|pause|text
+demo|vw_workplandayslist|VIEW|staffcount|bigint
+demo|vw_workplandayslist|VIEW|start1|text
+demo|vw_workplandayslist|VIEW|start2|text
+demo|vw_workplandayslist|VIEW|weekday|integer
+demo|vw_workplandayslist|VIEW|weekhours|text
+demo|vw_workplandayslist|VIEW|weeknum|integer
+demo|vw_workplandayslist|VIEW|workplan|text
+demo|vw_workplanlist|VIEW|dspworkplandetail|text
+demo|vw_workplanlist|VIEW|id|text
+demo|vw_workplanlist|VIEW|isdefault|boolean
+demo|vw_workplanlist|VIEW|staffcount|bigint
+demo|vw_workplanlist|VIEW|workplan|text
+demo|vw_worktimeslist|VIEW|defaultdayhours|text
+demo|vw_worktimeslist|VIEW|defaultweekhours|text
+demo|vw_worktimeslist|VIEW|enddate|date
+demo|vw_worktimeslist|VIEW|id|text
+demo|vw_worktimeslist|VIEW|isdefault|boolean
+demo|vw_worktimeslist|VIEW|maxdayhours|text
+demo|vw_worktimeslist|VIEW|maxinterruptionhours|text
+demo|vw_worktimeslist|VIEW|maxweekhours|text
+demo|vw_worktimeslist|VIEW|startdate|date
+demo|workplandays|BASETABLE|created|timestampwithouttimezone
+demo|workplandays|BASETABLE|end1|timewithouttimezone
+demo|workplandays|BASETABLE|end2|timewithouttimezone
+demo|workplandays|BASETABLE|id|text
+demo|workplandays|BASETABLE|id_workplan|text
+demo|workplandays|BASETABLE|modified|timestampwithouttimezone
+demo|workplandays|BASETABLE|pauseend1|timewithouttimezone
+demo|workplandays|BASETABLE|pauseend2|timewithouttimezone
+demo|workplandays|BASETABLE|pausestart1|timewithouttimezone
+demo|workplandays|BASETABLE|pausestart2|timewithouttimezone
+demo|workplandays|BASETABLE|pause|timewithouttimezone
+demo|workplandays|BASETABLE|start1|timewithouttimezone
+demo|workplandays|BASETABLE|start2|timewithouttimezone
+demo|workplandays|BASETABLE|weekday|integer
+demo|workplandays|BASETABLE|weeknum|integer
+demo|workplans|BASETABLE|created|timestampwithouttimezone
+demo|workplans|BASETABLE|freeweekdayslist|json
+demo|workplans|BASETABLE|id|text
+demo|workplans|BASETABLE|isdefault|boolean
+demo|workplans|BASETABLE|modified|timestampwithouttimezone
+demo|workplans|BASETABLE|weekdays|integer
+demo|workplans|BASETABLE|weekhours|interval
+demo|workplans|BASETABLE|workplan|text
+demo|worktimes|BASETABLE|created|timestampwithouttimezone
+demo|worktimes|BASETABLE|defaultdayhours|interval
+demo|worktimes|BASETABLE|defaultweekhours|interval
+demo|worktimes|BASETABLE|enddate|date
+demo|worktimes|BASETABLE|id|text
+demo|worktimes|BASETABLE|isdefault|boolean
+demo|worktimes|BASETABLE|maxdayhours|interval
+demo|worktimes|BASETABLE|maxinterruptionhours|interval
+demo|worktimes|BASETABLE|maxweekhours|interval
+demo|worktimes|BASETABLE|modified|timestampwithouttimezone
+demo|worktimes|BASETABLE|startdate|date

diff --git a/dev/db/potlu2_db.demo.tables.live.txt b/dev/db/potlu2_db.demo.tables.live.txt
new file mode 100644 (file)
index 0000000..eccbc08
--- /dev/null
+++ b/dev/db/potlu2_db.demo.tables.live.txt
@@ -0,0 +1,31 @@
+
+demo|reportperiod|BASETABLE
+demo|reports|BASETABLE
+demo|staff|BASETABLE
+demo|staffcontract|BASETABLE
+demo|staffgroups|BASETABLE
+demo|staffreportperiod|BASETABLE
+demo|staffreportperioddays|BASETABLE
+demo|staffreportperiodweeks|BASETABLE
+demo|staffvacancy|BASETABLE
+demo|vacancydays|BASETABLE
+demo|vacancytypes|BASETABLE
+demo|vw_reportperioddata|VIEW
+demo|vw_reportperiodlist|VIEW
+demo|vw_rplbygrpname|VIEW
+demo|vw_staffcontractdata|VIEW
+demo|vw_staffcontractlist|VIEW
+demo|vw_staffdata|VIEW
+demo|vw_staffgroupsdata|VIEW
+demo|vw_staffgroupslist|VIEW
+demo|vw_stafflist|VIEW
+demo|vw_staffreportperioddays|VIEW
+demo|vw_staffreportperiodlist|VIEW
+demo|vw_vacancylist|VIEW
+demo|vw_workplandaysdata|VIEW
+demo|vw_workplandayslist|VIEW
+demo|vw_workplanlist|VIEW
+demo|vw_worktimeslist|VIEW
+demo|workplandays|BASETABLE
+demo|workplans|BASETABLE
+demo|worktimes|BASETABLE

diff --git a/dev/db/potlu2_db.demo.tables.local.txt b/dev/db/potlu2_db.demo.tables.local.txt
new file mode 100644 (file)
index 0000000..eccbc08
--- /dev/null
+++ b/dev/db/potlu2_db.demo.tables.local.txt
@@ -0,0 +1,31 @@
+
+demo|reportperiod|BASETABLE
+demo|reports|BASETABLE
+demo|staff|BASETABLE
+demo|staffcontract|BASETABLE
+demo|staffgroups|BASETABLE
+demo|staffreportperiod|BASETABLE
+demo|staffreportperioddays|BASETABLE
+demo|staffreportperiodweeks|BASETABLE
+demo|staffvacancy|BASETABLE
+demo|vacancydays|BASETABLE
+demo|vacancytypes|BASETABLE
+demo|vw_reportperioddata|VIEW
+demo|vw_reportperiodlist|VIEW
+demo|vw_rplbygrpname|VIEW
+demo|vw_staffcontractdata|VIEW
+demo|vw_staffcontractlist|VIEW
+demo|vw_staffdata|VIEW
+demo|vw_staffgroupsdata|VIEW
+demo|vw_staffgroupslist|VIEW
+demo|vw_stafflist|VIEW
+demo|vw_staffreportperioddays|VIEW
+demo|vw_staffreportperiodlist|VIEW
+demo|vw_vacancylist|VIEW
+demo|vw_workplandaysdata|VIEW
+demo|vw_workplandayslist|VIEW
+demo|vw_workplanlist|VIEW
+demo|vw_worktimeslist|VIEW
+demo|workplandays|BASETABLE
+demo|workplans|BASETABLE
+demo|worktimes|BASETABLE

diff --git a/dev/db/potlu2_db.portanova.columns.live.txt b/dev/db/potlu2_db.portanova.columns.live.txt
index e10319e..80ee980 100644 (file)
--- a/dev/db/potlu2_db.portanova.columns.live.txt
+++ b/dev/db/potlu2_db.portanova.columns.live.txt
@@ -84,6 +84,10 @@ portanova|staffreportperioddays|BASETABLE|id|text
 portanova|staffreportperioddays|BASETABLE|id_vacancytype|text
 portanova|staffreportperioddays|BASETABLE|interruptionhours|timewithouttimezone
 portanova|staffreportperioddays|BASETABLE|modified|timestampwithouttimezone
+portanova|staffreportperioddays|BASETABLE|pauseend1|timewithouttimezone
+portanova|staffreportperioddays|BASETABLE|pauseend2|timewithouttimezone
+portanova|staffreportperioddays|BASETABLE|pausestart1|timewithouttimezone
+portanova|staffreportperioddays|BASETABLE|pausestart2|timewithouttimezone
 portanova|staffreportperioddays|BASETABLE|recuperationhours|timewithouttimezone
 portanova|staffreportperioddays|BASETABLE|timeend1|timewithouttimezone
 portanova|staffreportperioddays|BASETABLE|timeend2|timewithouttimezone
@@ -163,7 +167,7 @@ portanova|vw_staffcontractlist|VIEW|id_staff|text
 portanova|vw_staffcontractlist|VIEW|id|text
 portanova|vw_staffcontractlist|VIEW|startdate|date
 portanova|vw_staffcontractlist|VIEW|weekdays|integer
-portanova|vw_staffcontractlist|VIEW|weekhours|interval
+portanova|vw_staffcontractlist|VIEW|weekhours|text
 portanova|vw_staffcontractlist|VIEW|workplan|text
 portanova|vw_staffdata|VIEW|address|text
 portanova|vw_staffdata|VIEW|birthdate|date
@@ -201,9 +205,12 @@ portanova|vw_staffreportperioddays|VIEW|contracthours|text
 portanova|vw_staffreportperioddays|VIEW|daydate|date
 portanova|vw_staffreportperioddays|VIEW|dayhours|text
 portanova|vw_staffreportperioddays|VIEW|daytype|text
+portanova|vw_staffreportperioddays|VIEW|dsppausedata|text
 portanova|vw_staffreportperioddays|VIEW|dspweekdates|text
 portanova|vw_staffreportperioddays|VIEW|dspweekshort|text
 portanova|vw_staffreportperioddays|VIEW|dspweek|text
+portanova|vw_staffreportperioddays|VIEW|dspworkdata|text
+portanova|vw_staffreportperioddays|VIEW|freehoursafter|text
 portanova|vw_staffreportperioddays|VIEW|id_recuperationtype|text
 portanova|vw_staffreportperioddays|VIEW|id_reportperiod|text
 portanova|vw_staffreportperioddays|VIEW|id_staff|text
@@ -211,6 +218,10 @@ portanova|vw_staffreportperioddays|VIEW|id|text
 portanova|vw_staffreportperioddays|VIEW|id_vacancytype|text
 portanova|vw_staffreportperioddays|VIEW|id_week|text
 portanova|vw_staffreportperioddays|VIEW|interruptionhours|text
+portanova|vw_staffreportperioddays|VIEW|pauseend1|text
+portanova|vw_staffreportperioddays|VIEW|pauseend2|text
+portanova|vw_staffreportperioddays|VIEW|pausestart1|text
+portanova|vw_staffreportperioddays|VIEW|pausestart2|text
 portanova|vw_staffreportperioddays|VIEW|periodend|date
 portanova|vw_staffreportperioddays|VIEW|periodstart|date
 portanova|vw_staffreportperioddays|VIEW|recuperationhours|text
@@ -253,16 +264,26 @@ portanova|vw_workplandaysdata|VIEW|end1|timewithouttimezone
 portanova|vw_workplandaysdata|VIEW|end2|timewithouttimezone
 portanova|vw_workplandaysdata|VIEW|id|text
 portanova|vw_workplandaysdata|VIEW|id_workplan|text
+portanova|vw_workplandaysdata|VIEW|pauseend1|timewithouttimezone
+portanova|vw_workplandaysdata|VIEW|pauseend2|timewithouttimezone
+portanova|vw_workplandaysdata|VIEW|pausestart1|timewithouttimezone
+portanova|vw_workplandaysdata|VIEW|pausestart2|timewithouttimezone
 portanova|vw_workplandaysdata|VIEW|pause|timewithouttimezone
 portanova|vw_workplandaysdata|VIEW|start1|timewithouttimezone
 portanova|vw_workplandaysdata|VIEW|start2|timewithouttimezone
 portanova|vw_workplandaysdata|VIEW|weekday|integer
 portanova|vw_workplandayslist|VIEW|dayhours|text
+portanova|vw_workplandayslist|VIEW|dsppausedata|text
+portanova|vw_workplandayslist|VIEW|dspworkdata|text
 portanova|vw_workplandayslist|VIEW|end1|text
 portanova|vw_workplandayslist|VIEW|end2|text
 portanova|vw_workplandayslist|VIEW|id|text
 portanova|vw_workplandayslist|VIEW|id_workplan|text
 portanova|vw_workplandayslist|VIEW|interruption|text
+portanova|vw_workplandayslist|VIEW|pauseend1|text
+portanova|vw_workplandayslist|VIEW|pauseend2|text
+portanova|vw_workplandayslist|VIEW|pausestart1|text
+portanova|vw_workplandayslist|VIEW|pausestart2|text
 portanova|vw_workplandayslist|VIEW|pause|text
 portanova|vw_workplandayslist|VIEW|staffcount|bigint
 portanova|vw_workplandayslist|VIEW|start1|text
@@ -284,6 +305,7 @@ portanova|vw_worktimeslist|VIEW|isdefault|boolean
 portanova|vw_worktimeslist|VIEW|maxdayhours|text
 portanova|vw_worktimeslist|VIEW|maxinterruptionhours|text
 portanova|vw_worktimeslist|VIEW|maxweekhours|text
+portanova|vw_worktimeslist|VIEW|mindailyrecuperation|text
 portanova|vw_worktimeslist|VIEW|startdate|date
 portanova|workplandays|BASETABLE|created|timestampwithouttimezone
 portanova|workplandays|BASETABLE|end1|timewithouttimezone
@@ -291,6 +313,10 @@ portanova|workplandays|BASETABLE|end2|timewithouttimezone
 portanova|workplandays|BASETABLE|id|text
 portanova|workplandays|BASETABLE|id_workplan|text
 portanova|workplandays|BASETABLE|modified|timestampwithouttimezone
+portanova|workplandays|BASETABLE|pauseend1|timewithouttimezone
+portanova|workplandays|BASETABLE|pauseend2|timewithouttimezone
+portanova|workplandays|BASETABLE|pausestart1|timewithouttimezone
+portanova|workplandays|BASETABLE|pausestart2|timewithouttimezone
 portanova|workplandays|BASETABLE|pause|timewithouttimezone
 portanova|workplandays|BASETABLE|start1|timewithouttimezone
 portanova|workplandays|BASETABLE|start2|timewithouttimezone
@@ -313,5 +339,6 @@ portanova|worktimes|BASETABLE|isdefault|boolean
 portanova|worktimes|BASETABLE|maxdayhours|interval
 portanova|worktimes|BASETABLE|maxinterruptionhours|interval
 portanova|worktimes|BASETABLE|maxweekhours|interval
+portanova|worktimes|BASETABLE|mindailyrecuperation|timewithouttimezone
 portanova|worktimes|BASETABLE|modified|timestampwithouttimezone
 portanova|worktimes|BASETABLE|startdate|date

diff --git a/dev/db/potlu2_db.portanova.columns.local.txt b/dev/db/potlu2_db.portanova.columns.local.txt
index e10319e..4289d36 100644 (file)
--- a/dev/db/potlu2_db.portanova.columns.local.txt
+++ b/dev/db/potlu2_db.portanova.columns.local.txt
@@ -44,6 +44,8 @@ portanova|staff|BASETABLE|zip|text
 portanova|staffcontract|BASETABLE|created|timestampwithouttimezone
 portanova|staffcontract|BASETABLE|defaultfreedays|json
 portanova|staffcontract|BASETABLE|enddate|date
+portanova|staffcontract|BASETABLE|freeweekdaysonend|json
+portanova|staffcontract|BASETABLE|freeweekdaysonstart|json
 portanova|staffcontract|BASETABLE|id_contractworkplan|text
 portanova|staffcontract|BASETABLE|id_staff|text
 portanova|staffcontract|BASETABLE|id|text
@@ -68,7 +70,13 @@ portanova|staffreportperiod|BASETABLE|id|text
 portanova|staffreportperiod|BASETABLE|modified|timestampwithouttimezone
 portanova|staffreportperiod|BASETABLE|payedhours|interval
 portanova|staffreportperiod|BASETABLE|recuperationhours|interval
+portanova|staffreportperiod|BASETABLE|status44hcount|integer
+portanova|staffreportperiod|BASETABLE|statussuncount|integer
+portanova|staffreportperiod|BASETABLE|suppvacancy44hours|integer
+portanova|staffreportperiod|BASETABLE|suppvacancysunwork|integer
 portanova|staffreportperiod|BASETABLE|totalhours|interval
+portanova|staffreportperiod|BASETABLE|transferedhourscalc|interval
+portanova|staffreportperiod|BASETABLE|transferedhours|interval
 portanova|staffreportperiod|BASETABLE|vacancyhours|interval
 portanova|staffreportperiod|BASETABLE|workhours|interval
 portanova|staffreportperioddays|BASETABLE|contracthours|timewithouttimezone
@@ -84,6 +92,11 @@ portanova|staffreportperioddays|BASETABLE|id|text
 portanova|staffreportperioddays|BASETABLE|id_vacancytype|text
 portanova|staffreportperioddays|BASETABLE|interruptionhours|timewithouttimezone
 portanova|staffreportperioddays|BASETABLE|modified|timestampwithouttimezone
+portanova|staffreportperioddays|BASETABLE|pauseend1|timewithouttimezone
+portanova|staffreportperioddays|BASETABLE|pauseend2|timewithouttimezone
+portanova|staffreportperioddays|BASETABLE|pausestart1|timewithouttimezone
+portanova|staffreportperioddays|BASETABLE|pausestart2|timewithouttimezone
+portanova|staffreportperioddays|BASETABLE|payedpause|boolean
 portanova|staffreportperioddays|BASETABLE|recuperationhours|timewithouttimezone
 portanova|staffreportperioddays|BASETABLE|timeend1|timewithouttimezone
 portanova|staffreportperioddays|BASETABLE|timeend2|timewithouttimezone
@@ -94,32 +107,6 @@ portanova|staffreportperioddays|BASETABLE|trackedhours|timewithouttimezone
 portanova|staffreportperioddays|BASETABLE|vacancyhours|timewithouttimezone
 portanova|staffreportperioddays|BASETABLE|wdcontracthours|timewithouttimezone
 portanova|staffreportperioddays|BASETABLE|workhours|timewithouttimezone
-portanova|staffreportperiodweeks|BASETABLE|caldays|integer
-portanova|staffreportperiodweeks|BASETABLE|calweek|doubleprecision
-portanova|staffreportperiodweeks|BASETABLE|calyear|integer
-portanova|staffreportperiodweeks|BASETABLE|contractdays|integer
-portanova|staffreportperiodweeks|BASETABLE|contracthours|interval
-portanova|staffreportperiodweeks|BASETABLE|created|timestampwithouttimezone
-portanova|staffreportperiodweeks|BASETABLE|diffhours|interval
-portanova|staffreportperiodweeks|BASETABLE|hoursrestbefore|interval
-portanova|staffreportperiodweeks|BASETABLE|id_reportperiod|text
-portanova|staffreportperiodweeks|BASETABLE|id_staff|text
-portanova|staffreportperiodweeks|BASETABLE|id|text
-portanova|staffreportperiodweeks|BASETABLE|modified|timestampwithouttimezone
-portanova|staffreportperiodweeks|BASETABLE|recuperationhours|interval
-portanova|staffreportperiodweeks|BASETABLE|totalhours|interval
-portanova|staffreportperiodweeks|BASETABLE|trackedhours|interval
-portanova|staffreportperiodweeks|BASETABLE|vacancyhours|interval
-portanova|staffreportperiodweeks|BASETABLE|weekstart|date
-portanova|staffreportperiodweeks|BASETABLE|workdays|integer
-portanova|staffreportperiodweeks|BASETABLE|workhours|interval
-portanova|staffvacancy|BASETABLE|created|timestampwithouttimezone
-portanova|staffvacancy|BASETABLE|daydate|date
-portanova|staffvacancy|BASETABLE|id_staff|integer
-portanova|staffvacancy|BASETABLE|id|text
-portanova|staffvacancy|BASETABLE|id_vacancytype|text
-portanova|staffvacancy|BASETABLE|modified|timestampwithouttimezone
-portanova|staffvacancy|BASETABLE|vacancyhours|timewithouttimezone
 portanova|vacancydays|BASETABLE|created|timestampwithouttimezone
 portanova|vacancydays|BASETABLE|daydate|date
 portanova|vacancydays|BASETABLE|id|text
@@ -132,165 +119,16 @@ portanova|vacancytypes|BASETABLE|isfreetime|boolean
 portanova|vacancytypes|BASETABLE|isworktime|boolean
 portanova|vacancytypes|BASETABLE|modified|timestampwithouttimezone
 portanova|vacancytypes|BASETABLE|vacancyname|text
-portanova|vw_reportperioddata|VIEW|enddate|date
-portanova|vw_reportperioddata|VIEW|id_parentreportperiod|text
-portanova|vw_reportperioddata|VIEW|id|text
-portanova|vw_reportperioddata|VIEW|periodname|text
-portanova|vw_reportperioddata|VIEW|startdate|date
-portanova|vw_reportperiodlist|VIEW|enddate|date
-portanova|vw_reportperiodlist|VIEW|id_parentreportperiod|text
-portanova|vw_reportperiodlist|VIEW|id|text
-portanova|vw_reportperiodlist|VIEW|periodname|text
-portanova|vw_reportperiodlist|VIEW|startdate|date
-portanova|vw_rplbygrpname|VIEW|enddate|date
-portanova|vw_rplbygrpname|VIEW|groupname|text
-portanova|vw_rplbygrpname|VIEW|id_reportperiod|text
-portanova|vw_rplbygrpname|VIEW|id_staffgroup|text
-portanova|vw_rplbygrpname|VIEW|startdate|date
-portanova|vw_staffcontractdata|VIEW|defaultfreedays|json
-portanova|vw_staffcontractdata|VIEW|enddate|date
-portanova|vw_staffcontractdata|VIEW|id_contractworkplan|text
-portanova|vw_staffcontractdata|VIEW|id_staffcontract|text
-portanova|vw_staffcontractdata|VIEW|id_staff|text
-portanova|vw_staffcontractdata|VIEW|id|text
-portanova|vw_staffcontractdata|VIEW|startdate|date
-portanova|vw_staffcontractdata|VIEW|weekdays|integer
-portanova|vw_staffcontractdata|VIEW|weekhours|interval
-portanova|vw_staffcontractlist|VIEW|defaultfreedays|text
-portanova|vw_staffcontractlist|VIEW|enddate|date
-portanova|vw_staffcontractlist|VIEW|id_contractworkplan|text
-portanova|vw_staffcontractlist|VIEW|id_staff|text
-portanova|vw_staffcontractlist|VIEW|id|text
-portanova|vw_staffcontractlist|VIEW|startdate|date
-portanova|vw_staffcontractlist|VIEW|weekdays|integer
-portanova|vw_staffcontractlist|VIEW|weekhours|interval
-portanova|vw_staffcontractlist|VIEW|workplan|text
-portanova|vw_staffdata|VIEW|address|text
-portanova|vw_staffdata|VIEW|birthdate|date
-portanova|vw_staffdata|VIEW|city|text
-portanova|vw_staffdata|VIEW|country|text
-portanova|vw_staffdata|VIEW|email|text
-portanova|vw_staffdata|VIEW|id_staffgroup|text
-portanova|vw_staffdata|VIEW|id|text
-portanova|vw_staffdata|VIEW|job|text
-portanova|vw_staffdata|VIEW|matricule|text
-portanova|vw_staffdata|VIEW|phone|text
-portanova|vw_staffdata|VIEW|prename|text
-portanova|vw_staffdata|VIEW|staffnumber|text
-portanova|vw_staffdata|VIEW|surname|text
-portanova|vw_staffdata|VIEW|zip|text
-portanova|vw_staffgroupsdata|VIEW|groupcolor|text
-portanova|vw_staffgroupsdata|VIEW|groupname|text
-portanova|vw_staffgroupsdata|VIEW|id|text
-portanova|vw_staffgroupsdata|VIEW|isdefault|boolean
-portanova|vw_staffgroupsdata|VIEW|staffmembers|bigint
-portanova|vw_staffgroupslist|VIEW|groupname|text
-portanova|vw_staffgroupslist|VIEW|id|text
-portanova|vw_staffgroupslist|VIEW|isdefault|boolean
-portanova|vw_staffgroupslist|VIEW|staffmembers|bigint
-portanova|vw_stafflist|VIEW|birthdate|date
-portanova|vw_stafflist|VIEW|dspname|text
-portanova|vw_stafflist|VIEW|entrydate|date
-portanova|vw_stafflist|VIEW|groupname|text
-portanova|vw_stafflist|VIEW|id|text
-portanova|vw_stafflist|VIEW|job|text
-portanova|vw_stafflist|VIEW|prename|text
-portanova|vw_stafflist|VIEW|staffnumber|text
-portanova|vw_stafflist|VIEW|surname|text
-portanova|vw_staffreportperioddays|VIEW|contracthours|text
-portanova|vw_staffreportperioddays|VIEW|daydate|date
-portanova|vw_staffreportperioddays|VIEW|dayhours|text
-portanova|vw_staffreportperioddays|VIEW|daytype|text
-portanova|vw_staffreportperioddays|VIEW|dspweekdates|text
-portanova|vw_staffreportperioddays|VIEW|dspweekshort|text
-portanova|vw_staffreportperioddays|VIEW|dspweek|text
-portanova|vw_staffreportperioddays|VIEW|id_recuperationtype|text
-portanova|vw_staffreportperioddays|VIEW|id_reportperiod|text
-portanova|vw_staffreportperioddays|VIEW|id_staff|text
-portanova|vw_staffreportperioddays|VIEW|id|text
-portanova|vw_staffreportperioddays|VIEW|id_vacancytype|text
-portanova|vw_staffreportperioddays|VIEW|id_week|text
-portanova|vw_staffreportperioddays|VIEW|interruptionhours|text
-portanova|vw_staffreportperioddays|VIEW|periodend|date
-portanova|vw_staffreportperioddays|VIEW|periodstart|date
-portanova|vw_staffreportperioddays|VIEW|recuperationhours|text
-portanova|vw_staffreportperioddays|VIEW|timeend1|text
-portanova|vw_staffreportperioddays|VIEW|timeend2|text
-portanova|vw_staffreportperioddays|VIEW|timepause|text
-portanova|vw_staffreportperioddays|VIEW|timestart1|text
-portanova|vw_staffreportperioddays|VIEW|timestart2|text
-portanova|vw_staffreportperioddays|VIEW|vacancyhours|text
-portanova|vw_staffreportperioddays|VIEW|week_contracthours|text
-portanova|vw_staffreportperioddays|VIEW|weekdates|text
-portanova|vw_staffreportperioddays|VIEW|week_diffhours|text
-portanova|vw_staffreportperioddays|VIEW|weekident|text
-portanova|vw_staffreportperioddays|VIEW|week_recuperationhours|text
-portanova|vw_staffreportperioddays|VIEW|week_totalhours|text
-portanova|vw_staffreportperioddays|VIEW|week_vacancyhours|text
-portanova|vw_staffreportperioddays|VIEW|week_workhours|text
-portanova|vw_staffreportperioddays|VIEW|workhours|text
-portanova|vw_staffreportperiodlist|VIEW|contracthours|text
-portanova|vw_staffreportperiodlist|VIEW|enddate|date
-portanova|vw_staffreportperiodlist|VIEW|groupname|text
-portanova|vw_staffreportperiodlist|VIEW|hoursdiff|text
-portanova|vw_staffreportperiodlist|VIEW|id_reportperiod|text
-portanova|vw_staffreportperiodlist|VIEW|id_staffgroup|text
-portanova|vw_staffreportperiodlist|VIEW|id_staff|text
-portanova|vw_staffreportperiodlist|VIEW|id|text
-portanova|vw_staffreportperiodlist|VIEW|payedhours|text
-portanova|vw_staffreportperiodlist|VIEW|prename|text
-portanova|vw_staffreportperiodlist|VIEW|recuperationhours|text
-portanova|vw_staffreportperiodlist|VIEW|staffname|text
-portanova|vw_staffreportperiodlist|VIEW|startdate|date
-portanova|vw_staffreportperiodlist|VIEW|surname|text
-portanova|vw_staffreportperiodlist|VIEW|totalhours|text
-portanova|vw_staffreportperiodlist|VIEW|vacancyhours|text
-portanova|vw_staffreportperiodlist|VIEW|workhours|text
-portanova|vw_vacancylist|VIEW|id|text
-portanova|vw_vacancylist|VIEW|isworktime|boolean
-portanova|vw_vacancylist|VIEW|vacancyname|text
-portanova|vw_workplandaysdata|VIEW|end1|timewithouttimezone
-portanova|vw_workplandaysdata|VIEW|end2|timewithouttimezone
-portanova|vw_workplandaysdata|VIEW|id|text
-portanova|vw_workplandaysdata|VIEW|id_workplan|text
-portanova|vw_workplandaysdata|VIEW|pause|timewithouttimezone
-portanova|vw_workplandaysdata|VIEW|start1|timewithouttimezone
-portanova|vw_workplandaysdata|VIEW|start2|timewithouttimezone
-portanova|vw_workplandaysdata|VIEW|weekday|integer
-portanova|vw_workplandayslist|VIEW|dayhours|text
-portanova|vw_workplandayslist|VIEW|end1|text
-portanova|vw_workplandayslist|VIEW|end2|text
-portanova|vw_workplandayslist|VIEW|id|text
-portanova|vw_workplandayslist|VIEW|id_workplan|text
-portanova|vw_workplandayslist|VIEW|interruption|text
-portanova|vw_workplandayslist|VIEW|pause|text
-portanova|vw_workplandayslist|VIEW|staffcount|bigint
-portanova|vw_workplandayslist|VIEW|start1|text
-portanova|vw_workplandayslist|VIEW|start2|text
-portanova|vw_workplandayslist|VIEW|weekday|integer
-portanova|vw_workplandayslist|VIEW|weekhours|text
-portanova|vw_workplandayslist|VIEW|weeknum|integer
-portanova|vw_workplandayslist|VIEW|workplan|text
-portanova|vw_workplanlist|VIEW|dspworkplandetail|text
-portanova|vw_workplanlist|VIEW|id|text
-portanova|vw_workplanlist|VIEW|isdefault|boolean
-portanova|vw_workplanlist|VIEW|staffcount|bigint
-portanova|vw_workplanlist|VIEW|workplan|text
-portanova|vw_worktimeslist|VIEW|defaultdayhours|text
-portanova|vw_worktimeslist|VIEW|defaultweekhours|text
-portanova|vw_worktimeslist|VIEW|enddate|date
-portanova|vw_worktimeslist|VIEW|id|text
-portanova|vw_worktimeslist|VIEW|isdefault|boolean
-portanova|vw_worktimeslist|VIEW|maxdayhours|text
-portanova|vw_worktimeslist|VIEW|maxinterruptionhours|text
-portanova|vw_worktimeslist|VIEW|maxweekhours|text
-portanova|vw_worktimeslist|VIEW|startdate|date
 portanova|workplandays|BASETABLE|created|timestampwithouttimezone
 portanova|workplandays|BASETABLE|end1|timewithouttimezone
 portanova|workplandays|BASETABLE|end2|timewithouttimezone
 portanova|workplandays|BASETABLE|id|text
 portanova|workplandays|BASETABLE|id_workplan|text
 portanova|workplandays|BASETABLE|modified|timestampwithouttimezone
+portanova|workplandays|BASETABLE|pauseend1|timewithouttimezone
+portanova|workplandays|BASETABLE|pauseend2|timewithouttimezone
+portanova|workplandays|BASETABLE|pausestart1|timewithouttimezone
+portanova|workplandays|BASETABLE|pausestart2|timewithouttimezone
 portanova|workplandays|BASETABLE|pause|timewithouttimezone
 portanova|workplandays|BASETABLE|start1|timewithouttimezone
 portanova|workplandays|BASETABLE|start2|timewithouttimezone
@@ -311,7 +149,9 @@ portanova|worktimes|BASETABLE|enddate|date
 portanova|worktimes|BASETABLE|id|text
 portanova|worktimes|BASETABLE|isdefault|boolean
 portanova|worktimes|BASETABLE|maxdayhours|interval
+portanova|worktimes|BASETABLE|maxhourspercents|numeric
 portanova|worktimes|BASETABLE|maxinterruptionhours|interval
 portanova|worktimes|BASETABLE|maxweekhours|interval
+portanova|worktimes|BASETABLE|mindailyrecuperation|timewithouttimezone
 portanova|worktimes|BASETABLE|modified|timestampwithouttimezone
 portanova|worktimes|BASETABLE|startdate|date

diff --git a/dev/db/potlu2_db.portanova.tables.local.txt b/dev/db/potlu2_db.portanova.tables.local.txt
index 482dcc8..3023fd1 100644 (file)
--- a/dev/db/potlu2_db.portanova.tables.local.txt
+++ b/dev/db/potlu2_db.portanova.tables.local.txt
@@ -6,26 +6,8 @@ portanova|staffcontract|BASETABLE
 portanova|staffgroups|BASETABLE
 portanova|staffreportperiod|BASETABLE
 portanova|staffreportperioddays|BASETABLE
-portanova|staffreportperiodweeks|BASETABLE
-portanova|staffvacancy|BASETABLE
 portanova|vacancydays|BASETABLE
 portanova|vacancytypes|BASETABLE
-portanova|vw_reportperioddata|VIEW
-portanova|vw_reportperiodlist|VIEW
-portanova|vw_rplbygrpname|VIEW
-portanova|vw_staffcontractdata|VIEW
-portanova|vw_staffcontractlist|VIEW
-portanova|vw_staffdata|VIEW
-portanova|vw_staffgroupsdata|VIEW
-portanova|vw_staffgroupslist|VIEW
-portanova|vw_stafflist|VIEW
-portanova|vw_staffreportperioddays|VIEW
-portanova|vw_staffreportperiodlist|VIEW
-portanova|vw_vacancylist|VIEW
-portanova|vw_workplandaysdata|VIEW
-portanova|vw_workplandayslist|VIEW
-portanova|vw_workplanlist|VIEW
-portanova|vw_worktimeslist|VIEW
 portanova|workplandays|BASETABLE
 portanova|workplans|BASETABLE
 portanova|worktimes|BASETABLE

diff --git a/dev/db/potlu2_db.public.columns.live.txt b/dev/db/potlu2_db.public.columns.live.txt
index c11faa7..d0cdcd5 100644 (file)
--- a/dev/db/potlu2_db.public.columns.live.txt
+++ b/dev/db/potlu2_db.public.columns.live.txt
@@ -25,6 +25,10 @@ public|defaultworkplan|BASETABLE|end1|timewithouttimezone
 public|defaultworkplan|BASETABLE|end2|timewithouttimezone
 public|defaultworkplan|BASETABLE|id|text
 public|defaultworkplan|BASETABLE|modified|timestampwithouttimezone
+public|defaultworkplan|BASETABLE|pauseend1|timewithouttimezone
+public|defaultworkplan|BASETABLE|pauseend2|timewithouttimezone
+public|defaultworkplan|BASETABLE|pausestart1|timewithouttimezone
+public|defaultworkplan|BASETABLE|pausestart2|timewithouttimezone
 public|defaultworkplan|BASETABLE|pause|timewithouttimezone
 public|defaultworkplan|BASETABLE|start1|timewithouttimezone
 public|defaultworkplan|BASETABLE|start2|timewithouttimezone
@@ -49,9 +53,11 @@ public|sectorworktime|BASETABLE|isdefault|boolean
 public|sectorworktime|BASETABLE|maxdayhours|interval
 public|sectorworktime|BASETABLE|maxinterruptionhours|interval
 public|sectorworktime|BASETABLE|maxweekhours|interval
+public|sectorworktime|BASETABLE|mindailyrecuperation|timewithouttimezone
 public|sectorworktime|BASETABLE|sector|text
 public|sectorworktime|BASETABLE|startdate|date
 public|sessions|BASETABLE|created|timestampwithouttimezone
+public|sessions|BASETABLE|cschema|text
 public|sessions|BASETABLE|id|text
 public|sessions|BASETABLE|id_user|text
 public|sessions|BASETABLE|remote_addr|text
@@ -148,6 +154,7 @@ public|vw_userslist|VIEW|blocked|boolean
 public|vw_userslist|VIEW|company|text
 public|vw_userslist|VIEW|id_company|text
 public|vw_userslist|VIEW|id|text
+public|vw_userslist|VIEW|id_usergroup|text
 public|vw_userslist|VIEW|job|text
 public|vw_userslist|VIEW|phone|text
 public|vw_userslist|VIEW|prename|text

diff --git a/dev/db/potlu2_db.public.columns.local.txt b/dev/db/potlu2_db.public.columns.local.txt
index 5ddc707..2dbdebe 100644 (file)
--- a/dev/db/potlu2_db.public.columns.local.txt
+++ b/dev/db/potlu2_db.public.columns.local.txt
@@ -8,6 +8,7 @@ public|companies|BASETABLE|datasetname|text
 public|companies|BASETABLE|email|text
 public|companies|BASETABLE|id|text
 public|companies|BASETABLE|isdeleted|boolean
+public|companies|BASETABLE|payedpauses|boolean
 public|companies|BASETABLE|phone|text
 public|companies|BASETABLE|reportperiodlength|integer
 public|companies|BASETABLE|reportperiodstart|date
@@ -25,22 +26,18 @@ public|defaultworkplan|BASETABLE|end1|timewithouttimezone
 public|defaultworkplan|BASETABLE|end2|timewithouttimezone
 public|defaultworkplan|BASETABLE|id|text
 public|defaultworkplan|BASETABLE|modified|timestampwithouttimezone
+public|defaultworkplan|BASETABLE|pauseend1|timewithouttimezone
+public|defaultworkplan|BASETABLE|pauseend2|timewithouttimezone
+public|defaultworkplan|BASETABLE|pausestart1|timewithouttimezone
+public|defaultworkplan|BASETABLE|pausestart2|timewithouttimezone
 public|defaultworkplan|BASETABLE|pause|timewithouttimezone
 public|defaultworkplan|BASETABLE|start1|timewithouttimezone
 public|defaultworkplan|BASETABLE|start2|timewithouttimezone
 public|defaultworkplan|BASETABLE|weekday|integer
 public|defaultworkplan|BASETABLE|workplan|text
-public|labels|BASETABLE|de|text
-public|labels|BASETABLE|en|text
-public|labels|BASETABLE|fr|text
-public|labels|BASETABLE|id|text
 public|mailtemplates|BASETABLE|body|text
 public|mailtemplates|BASETABLE|id|text
 public|mailtemplates|BASETABLE|subject|text
-public|preferences|BASETABLE|ident|text
-public|preferences|BASETABLE|id|text
-public|preferences|BASETABLE|id_user|text
-public|preferences|BASETABLE|prefdata|json
 public|sectorworktime|BASETABLE|defaultdayhours|interval
 public|sectorworktime|BASETABLE|defaultweekhours|interval
 public|sectorworktime|BASETABLE|enddate|date
@@ -49,9 +46,11 @@ public|sectorworktime|BASETABLE|isdefault|boolean
 public|sectorworktime|BASETABLE|maxdayhours|interval
 public|sectorworktime|BASETABLE|maxinterruptionhours|interval
 public|sectorworktime|BASETABLE|maxweekhours|interval
+public|sectorworktime|BASETABLE|mindailyrecuperation|timewithouttimezone
 public|sectorworktime|BASETABLE|sector|text
 public|sectorworktime|BASETABLE|startdate|date
 public|sessions|BASETABLE|created|timestampwithouttimezone
+public|sessions|BASETABLE|cschema|text
 public|sessions|BASETABLE|id|text
 public|sessions|BASETABLE|id_user|text
 public|sessions|BASETABLE|remote_addr|text
@@ -60,12 +59,12 @@ public|sessions|BASETABLE|user_agent|text
 public|usergroups|BASETABLE|groupname|text
 public|usergroups|BASETABLE|id|text
 public|usergroups|BASETABLE|isdefault|boolean
-public|users|BASETABLE|blocked|boolean
 public|users|BASETABLE|created|timestampwithouttimezone
 public|users|BASETABLE|id_company|text
 public|users|BASETABLE|id|text
 public|users|BASETABLE|id_usergroups|json
 public|users|BASETABLE|id_usergroup|text
+public|users|BASETABLE|isblocked|boolean
 public|users|BASETABLE|isdeleted|boolean
 public|users|BASETABLE|job|text
 public|users|BASETABLE|phone|text
@@ -73,6 +72,7 @@ public|users|BASETABLE|prename|text
 public|users|BASETABLE|regcode|text
 public|users|BASETABLE|schemaaccess|json
 public|users|BASETABLE|surname|text
+public|users|BASETABLE|terms|boolean
 public|users|BASETABLE|username|text
 public|users|BASETABLE|userpassword|text
 public|users|BASETABLE|vcode|text
@@ -118,7 +118,6 @@ public|vw_companieslist|VIEW|vatvalidated|boolean
 public|vw_companieslist|VIEW|zip|text
 public|vw_schemata|VIEW|company|text
 public|vw_schemata|VIEW|schemaname|charactervarying
-public|vw_sectorlist|VIEW|sector|text
 public|vw_usergroupslist|VIEW|groupname|text
 public|vw_usergroupslist|VIEW|id|text
 public|vw_usergroupslist|VIEW|isdefault|boolean
@@ -128,13 +127,13 @@ public|vw_userschemaaccess|VIEW|datasetname|text
 public|vw_userschemaaccess|VIEW|id|text
 public|vw_userschemaaccess|VIEW|id_user|text
 public|vw_userschemaaccess|VIEW|schemaname|text
-public|vw_usersdata|VIEW|blocked|boolean
 public|vw_usersdata|VIEW|created|timestampwithouttimezone
 public|vw_usersdata|VIEW|id_company|text
 public|vw_usersdata|VIEW|id|text
 public|vw_usersdata|VIEW|id_usergroups|json
 public|vw_usersdata|VIEW|id_usergroup|text
 public|vw_usersdata|VIEW|id_users|text
+public|vw_usersdata|VIEW|isblocked|boolean
 public|vw_usersdata|VIEW|job|text
 public|vw_usersdata|VIEW|phone|text
 public|vw_usersdata|VIEW|prename|text
@@ -144,11 +143,11 @@ public|vw_usersdata|VIEW|surname|text
 public|vw_usersdata|VIEW|username|text
 public|vw_usersdata|VIEW|userpassword|text
 public|vw_usersdata|VIEW|vcode|text
-public|vw_userslist|VIEW|blocked|boolean
 public|vw_userslist|VIEW|company|text
 public|vw_userslist|VIEW|id_company|text
 public|vw_userslist|VIEW|id|text
 public|vw_userslist|VIEW|id_usergroup|text
+public|vw_userslist|VIEW|isblocked|boolean
 public|vw_userslist|VIEW|job|text
 public|vw_userslist|VIEW|phone|text
 public|vw_userslist|VIEW|prename|text
@@ -156,3 +155,4 @@ public|vw_userslist|VIEW|schemaaccess|text
 public|vw_userslist|VIEW|surname|text
 public|vw_userslist|VIEW|usergroups|text
 public|vw_userslist|VIEW|username|text
+public|zzold_vw_sectorlist|VIEW|sector|text

diff --git a/dev/db/potlu2_db.public.tables.local.txt b/dev/db/potlu2_db.public.tables.local.txt
index ae5b7e0..f04224b 100644 (file)
--- a/dev/db/potlu2_db.public.tables.local.txt
+++ b/dev/db/potlu2_db.public.tables.local.txt
@@ -1,9 +1,7 @@
 
 public|companies|BASETABLE
 public|defaultworkplan|BASETABLE
-public|labels|BASETABLE
 public|mailtemplates|BASETABLE
-public|preferences|BASETABLE
 public|sectorworktime|BASETABLE
 public|sessions|BASETABLE
 public|usergroups|BASETABLE
@@ -11,8 +9,8 @@ public|users|BASETABLE
 public|vw_companiesdata|VIEW
 public|vw_companieslist|VIEW
 public|vw_schemata|VIEW
-public|vw_sectorlist|VIEW
 public|vw_usergroupslist|VIEW
 public|vw_userschemaaccess|VIEW
 public|vw_usersdata|VIEW
 public|vw_userslist|VIEW
+public|zzold_vw_sectorlist|VIEW

diff --git a/dev/db/public.livedbupdate.sql b/dev/db/public.livedbupdate.sql
index e69de29..8d5c29a 100644 (file)
--- a/dev/db/public.livedbupdate.sql
+++ b/dev/db/public.livedbupdate.sql
@@ -0,0 +1,3 @@
+ALTER TABLE public.companies ADD COLUMN payedpauses boolean;
+ALTER TABLE public.users ADD COLUMN isblocked boolean;
+ALTER TABLE public.users ADD COLUMN terms boolean;

diff --git a/dev/db/update.demo.columns.txt b/dev/db/update.demo.columns.txt
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/dev/db/update.demo.tables.txt b/dev/db/update.demo.tables.txt
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/dev/db/update.demo.views.txt b/dev/db/update.demo.views.txt
new file mode 100644 (file)
index 0000000..4cc9223
--- /dev/null
+++ b/dev/db/update.demo.views.txt
@@ -0,0 +1 @@
+demo|vw_staffcontractlist|VIEW|weekhours|interval

diff --git a/dev/db/update.portanova.columns.txt b/dev/db/update.portanova.columns.txt
index e69de29..d3f07ac 100644 (file)
--- a/dev/db/update.portanova.columns.txt
+++ b/dev/db/update.portanova.columns.txt
@@ -0,0 +1,10 @@
+portanova|staffcontract|BASETABLE|freeweekdaysonend|json
+portanova|staffcontract|BASETABLE|freeweekdaysonstart|json
+portanova|staffreportperiod|BASETABLE|status44hcount|integer
+portanova|staffreportperiod|BASETABLE|statussuncount|integer
+portanova|staffreportperiod|BASETABLE|suppvacancy44hours|integer
+portanova|staffreportperiod|BASETABLE|suppvacancysunwork|integer
+portanova|staffreportperiod|BASETABLE|transferedhourscalc|interval
+portanova|staffreportperiod|BASETABLE|transferedhours|interval
+portanova|staffreportperioddays|BASETABLE|payedpause|boolean
+portanova|worktimes|BASETABLE|maxhourspercents|numeric

diff --git a/dev/db/update.public.columns.txt b/dev/db/update.public.columns.txt
index e69de29..840520d 100644 (file)
--- a/dev/db/update.public.columns.txt
+++ b/dev/db/update.public.columns.txt
@@ -0,0 +1,3 @@
+public|companies|BASETABLE|payedpauses|boolean
+public|users|BASETABLE|isblocked|boolean
+public|users|BASETABLE|terms|boolean

diff --git a/dev/db/update.public.views.txt b/dev/db/update.public.views.txt
index b421c71..14486cb 100644 (file)
--- a/dev/db/update.public.views.txt
+++ b/dev/db/update.public.views.txt
@@ -1 +1,3 @@
-public|vw_userslist|VIEW|id_usergroup|text
+public|vw_usersdata|VIEW|isblocked|boolean
+public|vw_userslist|VIEW|isblocked|boolean
+public|zzold_vw_sectorlist|VIEW|sector|text

diff --git a/dev/sourcefiles.local.txt b/dev/sourcefiles.local.txt
index 53e9096..53df287 100644 (file)
--- a/dev/sourcefiles.local.txt
+++ b/dev/sourcefiles.local.txt
@@ -2,27 +2,14 @@
 ./app/data/mail/body/user_forgotpasswd.tt|422
 ./app/data/mail/body/user_registration.tt|730
 ./app/data/mail/mail.tt|709
-./app/data/reports/pot/pot_period.conf|251
-./app/data/reports/pot/pot_period.footer.tt|1411
-./app/data/reports/pot/pot_period.header.tt|1085
-./app/data/reports/pot/pot_period/pot.ttf|1372
-./app/data/reports/pot/pot_period/pot.ttf.b64.txt|1869
-./app/data/reports/pot/pot_period.tt|9727
-./app/data/reports/pot/pot_staffmember_period.conf|255
-./app/data/reports/pot/pot_staffmember_period.footer.tt|1411
-./app/data/reports/pot/pot_staffmember_period.header.tt|1085
-./app/data/reports/pot/pot_staffmember_period/pot.ttf|1372
-./app/data/reports/pot/pot_staffmember_period/pot.ttf.b64.txt|1869
-./app/data/reports/pot/pot_staffmember_period.tt|10495
-./app/data/schemata/defaultcompany.schema.sql|64976
+./app/data/schemata/defaultcompany.schema.sql|10393
 ./app/data/schemata/.htaccess|167
-./app/db.cgi|9600
+./app/db.cgi|14102
 ./app/.htaccess|300
-./app/index.cgi|3673
+./app/index.cgi|3832
 ./app/lib/dksconfig.pm|853
-./app/lib/dksdb.pm|10354
+./app/lib/dksdb.pm|12058
 ./app/lib/.htaccess|169
-./app/lib/pdfreport.pm|4515
 ./app/lib/perl5/Business/Tax/VAT/Validation.pm|14797
 ./app/lib/perl5/CGI/Cookie.pm|6599
 ./app/lib/perl5/CGI/File/Temp.pm|969
@@ -664,14 +651,21 @@
 ./app/lib/perl5/x86_64-linux-gnu-thread-multi/Test/LeakTrace.pm|7262
 ./app/lib/perl5/x86_64-linux-gnu-thread-multi/Test/LeakTrace/Script.pm|986
 ./app/lib/perl5/x86_64-linux-gnu-thread-multi/Text/Soundex.pm|8345
+./app/lib/POT/Company.pm|3734
+./app/lib/POT/Period.pm|34399
+./app/lib/POT/Report.pm|25776
+./app/lib/POT/Staff.pm|4128
+./app/lib/POT/User.pm|336
+./app/lib/POT/Workplan.pm|6276
+./app/lib/POT/Worktime.pm|2305
 ./app/lib/sendemail.pm|2484
-./app/lib/session.pm|10226
-./app/report.cgi|4765
+./app/lib/session.pm|11547
+./app/report.cgi|3077
 ./app/static/css/fonts/pot.svg|67407
 ./app/static/css/fonts/pot.ttf|18180
 ./app/static/css/fonts/pot.woff|18256
 ./app/static/css/icons.css|5157
-./app/static/css/theme.css|42222
+./app/static/css/theme.css|42771
 ./app/static/img/bg1.jpg|135161
 ./app/static/img/chrome.svg|4521
 ./app/static/img/edge.svg|4639
@@ -712,11 +706,11 @@
 ./app/static/img/potlogowhite.svg|11940
 ./app/static/img/pottop.png|2689
 ./app/static/img/toplogo.png|31456
-./app/static/js/app.js|3206
-./app/static/js/dataform.js|7930
-./app/static/js/report.js|475
+./app/static/js/app.js|3208
+./app/static/js/dataform.js|8032
+./app/static/js/report.js|496
 ./app/static/js/request.js|3738
-./app/static/js/timecalc.js|3470
+./app/static/js/timecalc.js|4052
 ./app/static/vendors/bowser/bundled.js|113579
 ./app/static/vendors/bowser/es5.js|25812
 ./app/static/vendors/flatpickr/flatpickr.css|18831
@@ -930,8 +924,8 @@
 ./app/tmpl/block/dlginfo.tt|2109
 ./app/tmpl/block/dlgmessage.tt|914
 ./app/tmpl/block/dlg_replacestaffdayworkplan.tt|2724
-./app/tmpl/block/dlgstaffpayedhours.tt|2081
-./app/tmpl/block/dlgstaffperioddays.tt|16053
+./app/tmpl/block/dlgstaffpayedhours.tt|3177
+./app/tmpl/block/dlgstaffperioddays.tt|16282
 ./app/tmpl/block/head.tt|1815
 ./app/tmpl/block/pnl_nodata.tt|317
 ./app/tmpl/block/snackbar.tt|25
@@ -939,50 +933,51 @@
 ./app/tmpl/.htaccess|169
 ./app/tmpl/index.tt|4394
 ./app/tmpl/login.tt|5086
-./app/tmpl/module/admin/companies.js|5862
+./app/tmpl/module/admin/companies.js|5855
 ./app/tmpl/module/admin/dlg_dataset.tt|2004
 ./app/tmpl/module/admin/dlg_staffgroups.tt|1273
-./app/tmpl/module/admin/dlg_users.tt|3739
-./app/tmpl/module/admin/dlg_worktimes.tt|3790
+./app/tmpl/module/admin/dlg_users.tt|3745
+./app/tmpl/module/admin/dlg_worktimes.tt|4224
 ./app/tmpl/module/admin/pnl_basedata.tt|7421
-./app/tmpl/module/admin/schemadataset.js|1761
-./app/tmpl/module/admin/staffgroups.js|3221
-./app/tmpl/module/admin.tt|3772
-./app/tmpl/module/admin/users.js|7317
-./app/tmpl/module/admin/worktimes.js|3997
-./app/tmpl/module/company/company.js|1792
+./app/tmpl/module/admin/schemadataset.js|1752
+./app/tmpl/module/admin/staffgroups.js|3252
+./app/tmpl/module/admin.tt|3864
+./app/tmpl/module/admin/users.js|7328
+./app/tmpl/module/admin/worktimes.js|4114
+./app/tmpl/module/company/company.js|1591
 ./app/tmpl/module/company/dlg_staffgroups.tt|1311
 ./app/tmpl/module/company/dlg_users.tt|2499
-./app/tmpl/module/company/pnl_basedata.tt|6916
-./app/tmpl/module/company/staffgroups.js|2750
-./app/tmpl/module/company.tt|1900
-./app/tmpl/module/company/users.js|6949
-./app/tmpl/module/index/index.js|996
-./app/tmpl/module/index.tt|2786
+./app/tmpl/module/company/pnl_basedata.tt|6582
+./app/tmpl/module/company/staffgroups.js|2718
+./app/tmpl/module/company.tt|1953
+./app/tmpl/module/company/users.js|6226
+./app/tmpl/module/index/index.js|994
+./app/tmpl/module/index.tt|2798
 ./app/tmpl/module/login/forgotpassword.tt|820
 ./app/tmpl/module/login/login.tt|920
 ./app/tmpl/module/login/message.tt|267
-./app/tmpl/module/periods/reportperiod.js|6758
-./app/tmpl/module/periods/staffperiodweeks.js|20681
+./app/tmpl/module/periods/reportperiod.js|7630
+./app/tmpl/module/periods/staffperiodweeks.js|23627
 ./app/tmpl/module/periods/tlb_staffperiodweeks.tt|878
-./app/tmpl/module/periods.tt|2785
+./app/tmpl/module/periods.tt|2891
 ./app/tmpl/module/profile/dlgpassword.tt|2871
-./app/tmpl/module/profile/dlgusername.tt|4229
-./app/tmpl/module/profile/profile.js|405
-./app/tmpl/module/profile.tt|1892
-./app/tmpl/module/staff/dlg_staffcontract.tt|2332
-./app/tmpl/module/staff/dlgstaffpayedhours.tt|2081
+./app/tmpl/module/profile/dlgusername.tt|4228
+./app/tmpl/module/profile/profile.js|404
+./app/tmpl/module/profile.tt|1915
+./app/tmpl/module/staff/dlg_addstaff.tt|4045
+./app/tmpl/module/staff/dlg_staffcontract.tt|3050
+./app/tmpl/module/staff/dlgstaffpayedhours.tt|3186
 ./app/tmpl/module/staff/pnl_basedata.tt|6512
-./app/tmpl/module/staff/staffcontract.js|5708
-./app/tmpl/module/staff/staff.js|4990
-./app/tmpl/module/staff/staffperiods.js|4299
-./app/tmpl/module/staff.tt|3272
+./app/tmpl/module/staff/staffcontract.js|6142
+./app/tmpl/module/staff/staff.js|7003
+./app/tmpl/module/staff/staffperiods.js|5156
+./app/tmpl/module/staff.tt|3410
 ./app/tmpl/module/timetrackers/index.js|401
 ./app/tmpl/module/timetrackers/index.tt|1208
-./app/tmpl/module/workplans/dlg_workplanday.tt|10960
+./app/tmpl/module/workplans/dlg_workplanday.tt|10016
 ./app/tmpl/module/workplans/dlg_workplan.tt|1656
 ./app/tmpl/module/workplans.tt|2224
-./app/tmpl/module/workplans/workplans.js|13001
+./app/tmpl/module/workplans/workplans.js|12972
 ./css/site.css|24964
 ./.htaccess|0
 ./img/favicon/android-icon-144x144.png|12179

diff --git a/dev/sourcefiles.remote.txt b/dev/sourcefiles.remote.txt
index 43d403f..dcfb603 100644 (file)
--- a/dev/sourcefiles.remote.txt
+++ b/dev/sourcefiles.remote.txt
@@ -3,7 +3,7 @@
 ./app/data/mail/body/user_forgotpasswd.tt|422
 ./app/data/mail/body/user_registration.tt|730
 ./app/data/mail/mail.tt|709
-./app/data/output/portanova/pot/periode_20200810-20201004.pdf|187752
+./app/data/output/portanova/pot/periode_20200810-20201004.pdf|207212
 ./app/data/reports/pot/pot_period.conf|251
 ./app/data/reports/pot/pot_period.footer.tt|1411
 ./app/data/reports/pot/pot_period.header.tt|1085
@@ -16,7 +16,7 @@
 ./app/data/reports/pot/pot_staffmember_period/pot.ttf|1372
 ./app/data/reports/pot/pot_staffmember_period/pot.ttf.b64.txt|1869
 ./app/data/reports/pot/pot_staffmember_period.tt|10495
-./app/data/schemata/defaultcompany.schema.sql|64860
+./app/data/schemata/defaultcompany.schema.sql|64976
 ./app/data/schemata/.htaccess|167
 ./app/data/tmp/mail/user_forgotpasswd28773.mail|12415
 ./app/data/tmp/pot_staffmember_period/pot.ttf|1372

diff --git a/website/app/db.cgi b/website/app/db.cgi
index f5777f1..8a126f6 100644 (file)
--- a/website/app/db.cgi
+++ b/website/app/db.cgi
@@ -213,9 +213,10 @@ if (($cgi->request_method() eq "GET") || ($cgi->request_method() eq "POST")){
     }
     if ($p->{fn} eq "setsessiondata"){
       my $sid = $sess->{idsession};
-      my $pfn = JSON::PP::decode_json($p->{params});
-      unshift(@{$pfn},$sid);
-      my $res = $sess->setsessiondata($sid,$pfn);
+      #my $pfn = JSON::PP::decode_json($p->{params});
+      #print STDERR "SESSION PARAMS:".Dumper($p->{params});
+      # unshift(@{$pfn},$sid);
+      my $res = $se->setsessiondata($sid,$p->{params});
       $html->{result}->{sessiondata} = $res;
     }
     

diff --git a/website/app/index.cgi b/website/app/index.cgi
index fa248a0..efcff8e 100644 (file)
--- a/website/app/index.cgi
+++ b/website/app/index.cgi
@@ -7,7 +7,7 @@ use File::Basename qw/dirname basename/;
 use Template;
 # use Template::Constants qw( :debug );
 use CGI;
-#use CGI::Carp qw(fatalsToBrowser);
+use CGI::Carp qw(fatalsToBrowser);
 use CGI::Cookie;
 use Data::Dumper;
 use JSON::PP;

diff --git a/website/app/lib/POT/Period.pm b/website/app/lib/POT/Period.pm
index 30c6b07..9abb9fd 100644 (file)
--- a/website/app/lib/POT/Period.pm
+++ b/website/app/lib/POT/Period.pm
@@ -282,14 +282,15 @@ sub updatePeriodDaySums(){
   from (
     select preds.id,case when preds.recuperationhours is null then '00:00:00'::time else preds.recuperationhours end as recup,
     case when preds.vacancyhours is null then '00:00:00'::time else preds.vacancyhours end as vachours,
-    case when preds.dt2 > preds.dt1 then preds.dt2-preds.dt1 else null end as interruption,
+    preds.interruption,
     (preds.dt1+preds.dt2)-(preds.pdt1+preds.pdt2)  as worktime,
   (preds.pdt1+preds.pdt2) as timepause
        from ( select id, recuperationhours,vacancyhours,payedpause,
                case when timestart1 is not null and timeend1 is not null then case when timeend1 > timestart1 then  '24:00:00'::interval + timeend1 - timestart1 else  timeend1 - timestart1 end else  '00:00:00'::interval end as dt1,
                case when timestart2 is not null and timeend2 is not null then case when timeend2 > timestart2 then  '24:00:00'::interval + timeend2 - timestart2 else  timeend2 - timestart2 end  else  '00:00:00'::interval end as dt2,
                case when pausestart1 is not null and pauseend1 is not null then case when pauseend1 > pausestart1 then  '24:00:00'::interval + pauseend1 - pausestart1 else  pauseend1 - pausestart1 end else '00:00:00'::interval end as pdt1,
-               case when pausestart2 is not null and pauseend2 is not null then  case when pauseend2 > pausestart2 then  '24:00:00'::interval + pauseend2 - pausestart2 else  pauseend2 - pausestart2 end else '00:00:00'::interval end as pdt2
+               case when pausestart2 is not null and pauseend2 is not null then  case when pauseend2 > pausestart2 then  '24:00:00'::interval + pauseend2 - pausestart2 else  pauseend2 - pausestart2 end else '00:00:00'::interval end as pdt2,
+    case when timestart2 is not null and timeend1 is not null and timestart1 is not null and timeend2 is not null then timestart2 - timeend1 else null end as interruption
                from ".$schema.".staffreportperioddays where id in (".$dayselect.")
   ) preds) ds where spds.id=ds.id;";
   
@@ -359,7 +360,7 @@ select *,sum(case when maxweek < '44:00:00'::interval then 1 else 0 end) over (o
   
   $sql .= "hoursdiff=csp.diffhours
   FROM(
-  select contracthours,workhours,vacancyhours,totalhours,recuperationhours, workhours-contracthours-recuperationhours-payedhours+transferedhourscalc as diffhours,id from (
+  select contracthours,workhours,vacancyhours,totalhours,recuperationhours, totalhours-contracthours-recuperationhours-payedhours+transferedhourscalc as diffhours,id from (
   select dp.id,
   sum(pd.workhours) as workhours,
   sum(pd.dayhours) as totalhours,

diff --git a/website/app/lib/POT/Worktime.pm b/website/app/lib/POT/Worktime.pm
index efae691..fd0c49e 100644 (file)
--- a/website/app/lib/POT/Worktime.pm
+++ b/website/app/lib/POT/Worktime.pm
@@ -63,6 +63,6 @@ sub getRecuperationTypes(){
   my $self = shift;
   my $schema = shift;
   return $self->{db}->querysorted("SELECT id,vacancyname,color
-   FROM ".$schema.".vacancytypes where isworktime='true' order by vacancyname;");
+   FROM ".$schema.".vacancytypes where isworktime is null or isworktime=false order by vacancyname;");
 }
 1;
\ No newline at end of file

diff --git a/website/app/lib/session.pm b/website/app/lib/session.pm
index 2d5fcf4..15cdca9 100644 (file)
--- a/website/app/lib/session.pm
+++ b/website/app/lib/session.pm
@@ -228,9 +228,12 @@ sub setsessiondata(){
   my $self = shift;
   my $idsession = shift;
   my $params = shift;
+  #print STDERR Dumper($params);
   my $sdata = $self->{db}->query("select sessiondata from public.sessions where id='".$idsession."'");
+  $sdata->{sessiondata}= JSON::PP::decode_json($sdata->{sessiondata});
+  # print STDERR Dumper($sdata);
   foreach my $ss (keys(%{$params})){
-    $sdata->{sessiondata}->{$ss} = $params->{$ss};
+     $sdata->{sessiondata}->{$ss} = $params->{$ss};
   }
   $self->{db}->exec("update public.sessions set sessiondata='".JSON::PP::encode_json($sdata->{sessiondata})."' where id='".$idsession."'");
   return $sdata->{sessiondata};

diff --git a/website/app/static/js/app.js b/website/app/static/js/app.js
index 8388c9b..fa67200 100644 (file)
--- a/website/app/static/js/app.js
+++ b/website/app/static/js/app.js
@@ -24,7 +24,7 @@ let app = {
       let csel = document.getElementById("current_schemata").value;
       //console.log(csel);
       schemata =  csel;
-      postData("db.cgi",{"fn":"setsessiondata","params":"[\"schemata\",\"" + csel +"\"]"}).then(data => {
+      postData("db.cgi",{"fn":"setsessiondata","params":{"schemata":csel}}).then(data => {
         document.getElementById("current_schemata").dataset.selected = csel;
       });
     },

diff --git a/website/app/tmpl/index.tt b/website/app/tmpl/index.tt
index 47e57b0..9d8c9e9 100644 (file)
--- a/website/app/tmpl/index.tt
+++ b/website/app/tmpl/index.tt
@@ -1,4 +1,4 @@
-[% appversion = '0.8.4' %]
+[% appversion = '0.9.1' %]
 
 <!DOCTYPE html>
 <html lang="fr">

diff --git a/website/app/tmpl/module/periods/reportperiod.js b/website/app/tmpl/module/periods/reportperiod.js
index b5f7420..6bd37e5 100644 (file)
--- a/website/app/tmpl/module/periods/reportperiod.js
+++ b/website/app/tmpl/module/periods/reportperiod.js
@@ -135,7 +135,7 @@ let reportperiod ={
   },
   showdlgpayedhours: function(){
     dataform.cleanform2("rppayedhours",{});
-    let prd = staffperiods.tbl.getSelectedData();
+    let prd = reportperiod.tbl.getSelectedData();
     document.getElementById("rppayedhours_infomsg").innerHTML = '';
     //console.log(prd[0]);
     //if (prd[0] && prd[0].hoursdiff != '00:00' && prd[0].hoursdiff.indexOf("-") == -1){