database changes

diff --git a/app_v3/defaults/profile/creorga.sqlite b/app_v3/defaults/profile/creorga.sqlite
index 1b05bab..1e4329b 100644 (file)
Binary files a/app_v3/defaults/profile/creorga.sqlite and b/app_v3/defaults/profile/creorga.sqlite differ

diff --git a/db/schema.pg.sql b/db/schema.pg.sql
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/db/schema.sql b/db/sqlite.schema.sql
similarity index 92%
rename from db/schema.sql
rename to db/sqlite.schema.sql
index 072a78c..ad68237 100644 (file)
--- a/db/schema.sql
+++ b/db/sqlite.schema.sql
@@ -1,41 +1,3 @@
-CREATE TABLE "eventcalendar" (
-  uuid TEXT NOT NULL,
-  datefrom DATE,
-  dateto DATE,
-  timefrom TEXT,
-  timeto TEXT,
-  description TEXT,
-  activityuuid TEXT,
-  staffuuid TEXT,
-  location TEXT,
-  color TEXT,
-  freq TEXT,
-  lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (uuid)
-);
-CREATE TABLE "staffplanning" (
-  eventcalendaruuid TEXT,
-  staffuuid TEXT,
-  lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (eventcalendaruuid,staffuuid)
-);
-CREATE TABLE "expenses" (
-  uuid TEXT,
-  expensedate DATE,
-  remitter TEXT,
-  expenseamount REAL
-  expensefile TEXT,
-  statementfile TEXT,
-  lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (uuid)    
-);
-CREATE TABLE "vacancy" (
-  vacancydate DATE,
-  vacancydateto DATE,
-  vacancydescription TEXT,
-  lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (vacancydate,vacancydateto)
-);
 CREATE TABLE "accounting" (
   accmonth DATE,
   childuuid TEXT,
@@ -51,9 +13,14 @@ CREATE TABLE "accounting" (
   invoicefile TEXT,
   benefitfile TEXT,
   benefitamount REAL,
-  extraamount REAL,
-  PRIMARY KEY (accmonth,childuuid)
+  extraamount REAL, 
+  uuid TEXT,
+  PRIMARY KEY (uuid)
 );
+CREATE TRIGGER trg_accounting_upd UPDATE ON accounting
+ BEGIN
+  UPDATE accounting SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
 CREATE TABLE "activitylog" (
   uuid TEXT NOT NULL,
   logdatefrom DATETIME,
@@ -65,6 +32,10 @@ CREATE TABLE "activitylog" (
   editor TEXT,
   PRIMARY KEY (uuid)
 );
+CREATE TRIGGER trg_activitylog_upd UPDATE ON activitylog
+ BEGIN
+  UPDATE activitylog SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
 CREATE TABLE "cautionstatus" (
   uuid TEXT NOT NULL,
   childuuid TEXT,
@@ -74,6 +45,10 @@ CREATE TABLE "cautionstatus" (
   statementnumber TEXT,
   PRIMARY KEY (uuid)
 );
+CREATE TRIGGER trg_cautionstatus_upd UPDATE ON cautionstatus
+ BEGIN
+  UPDATE cautionstatus SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
 CREATE TABLE "childs" (
   clientnumber TEXT,
   prename TEXT,
@@ -103,18 +78,28 @@ CREATE TABLE "childs" (
   bankaccountowner TEXT, 
   infoimportant TEXT, 
   infolunch TEXT, 
-  editor TEXT,
+  editor TEXT, 
+  currentweekhours REAL,
   PRIMARY KEY (uuid)
 );
+CREATE TRIGGER trg_childs_upd UPDATE ON childs
+ BEGIN
+  UPDATE childs SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
 CREATE TABLE "childslog" (
   uuid TEXT NOT NULL, 
   logdate DATE,
   logmessage TEXT,
   childuuid TEXT,
   editorstaffuuid TEXT,
-  lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP, editor TEXT,
+  lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP, 
+  editor TEXT,
   PRIMARY KEY (uuid)
 );
+CREATE TRIGGER trg_childslog_upd UPDATE ON childslog
+ BEGIN
+  UPDATE childslog SET lastmodified=CURRENT_TIMESTAMP WHERE uuid=NEW.uuid;
+ END;
 CREATE TABLE "costs" (
   startdate DATE,
   costsperhour REAL,
@@ -125,6 +110,10 @@ CREATE TABLE "costs" (
   costperhourfallback REAL,
   PRIMARY KEY (uuid)
 );
+CREATE TRIGGER trg_costs_upd UPDATE ON costs
+ BEGIN
+  UPDATE costs SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
 CREATE TABLE "creche" (
   crechename TEXT,
   adress TEXT,
@@ -138,9 +127,47 @@ CREATE TABLE "creche" (
   lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP,
   editor TEXT,
   stafflist BOOLEAN,
-  dbversion TEXT,
+  dbversion TEXT, 
+  idcheckservice TEXT,
+  PRIMARY KEY (uuid)
+);
+CREATE TRIGGER trg_creche_upd UPDATE ON costs
+ BEGIN
+  UPDATE creche SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
+CREATE TABLE "eventcalendar" (
+  uuid TEXT NOT NULL,
+  datefrom DATE,
+  dateto DATE,
+  timefrom TEXT,
+  timeto TEXT,
+  description TEXT,
+  activityuuid TEXT,
+  staffuuid TEXT,
+  location TEXT,
+  color TEXT,
+  freq TEXT,
+  lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (uuid)
 );
+CREATE TRIGGER trg_eventcalendar_upd UPDATE ON eventcalendar
+ BEGIN
+  UPDATE eventcalendar SET lastmodified=CURRENT_TIMESTAMP WHERE uuid=NEW.uuid;
+ END;
+CREATE TABLE "expenses" (
+  uuid TEXT,
+  expensedate DATE,
+  remitter TEXT,
+  expenseamount REAL
+  expensefile TEXT,
+  statementfile TEXT,
+  lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (uuid)    
+);
+CREATE TRIGGER trg_expenses_upd UPDATE ON expenses
+ BEGIN
+  UPDATE expenses SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
 CREATE TABLE "groups" (
   grpname TEXT,
   maxchilds INTEGER,
@@ -152,6 +179,10 @@ CREATE TABLE "groups" (
   color TEXT,
   PRIMARY KEY (uuid)
 );
+CREATE TRIGGER trg_groups_upd UPDATE ON groups
+ BEGIN
+  UPDATE groups SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
 CREATE TABLE "health" (
   uuid TEXT NOT NULL,
   docname TEXT,
@@ -165,6 +196,10 @@ CREATE TABLE "health" (
   lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (uuid) 
 );
+CREATE TRIGGER trg_health_upd UPDATE ON health
+ BEGIN
+  UPDATE health SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
 CREATE TABLE "messagelog" (
   uuid TEXT NOT NULL,
   logdate DATETIME,
@@ -175,6 +210,10 @@ CREATE TABLE "messagelog" (
   editor TEXT,
   PRIMARY KEY (uuid)
 );
+CREATE TRIGGER trg_message_upd UPDATE ON messagelog
+ BEGIN
+  UPDATE messagelog SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
 CREATE TABLE "planning" (
   datebegin DATE,
   dateend DATE,
@@ -216,9 +255,13 @@ CREATE TABLE "planning" (
   sattimeend2 TEXT,
   suntimebegin2 TEXT,
   suntimeend2 TEXT,
-  lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP,
+  lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP, weekhours REAL, weeklunch TEXT,
   PRIMARY KEY (uuid) 
 );
+CREATE TRIGGER trg_planning_upd UPDATE ON planning
+ BEGIN
+  UPDATE planning SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
 CREATE TABLE "planningstaff" (
   uuid TEXT NOT NULL,
   staffuuid TEXT NOT NULL,
@@ -291,6 +334,10 @@ CREATE TABLE "planningstaff" (
   lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (uuid)
 );
+CREATE TRIGGER trg_planningstaff_upd UPDATE ON planningstaff
+ BEGIN
+  UPDATE planningstaff SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
 CREATE TABLE "planningtemplate" (
   uuid TEXT NOT NULL,
   montimebegin TEXT,
@@ -332,7 +379,12 @@ CREATE TABLE "planningtemplate" (
   templatename TEXT,
   PRIMARY KEY (uuid)
 );
+CREATE TRIGGER trg_planningtemplate_upd UPDATE ON planningtemplate
+ BEGIN
+  UPDATE planningtemplate SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
 CREATE TABLE "presence" (
+  uuid TEXT,
   daydate DATE,
   lunch BOOLEAN,
   status INTEGER,
@@ -342,9 +394,13 @@ CREATE TABLE "presence" (
   endtime1 TEXT, 
   begintime2 TEXT, 
   endtime2 TEXT,
-  editor TEXT,
-  PRIMARY KEY (daydate,childuuid)
+  editor TEXT, 
+  PRIMARY KEY (childuuid,daydate)
 );
+CREATE TRIGGER trg_presence_upd UPDATE ON presence
+ BEGIN
+  UPDATE presence SET lastmodified=CURRENT_TIMESTAMP WHERE daydate = NEW.daydate and childuuid = new.childuuid;
+ END;
 CREATE TABLE "refpersons" (
   reftype TEXT,
   surname TEXT,
@@ -366,6 +422,10 @@ CREATE TABLE "refpersons" (
   priority INTEGER,
   PRIMARY KEY (uuid)
 );
+CREATE TRIGGER trg_refpersons_upd UPDATE ON refpersons
+ BEGIN
+  UPDATE refpersons SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
 CREATE TABLE "staff" (
   jobtitle TEXT,
   prename TEXT,
@@ -389,14 +449,33 @@ CREATE TABLE "staff" (
   editor TEXT,
   PRIMARY KEY (uuid) 
 );
+CREATE TRIGGER trg_staff_upd UPDATE ON staff
+ BEGIN
+  UPDATE staff SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
 CREATE TABLE "stafflog" (
   uuid TEXT NOT NULL,
   logdate DATE,
   logmessage TEXT,
   staffuuid TEXT,
-  lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP, editor TEXT,
+  lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP, 
+  editor TEXT,
   PRIMARY KEY (uuid)
 );
+CREATE TRIGGER trg_stafflog_upd UPDATE ON stafflog
+ BEGIN
+  UPDATE stafflog SET lastmodified=CURRENT_TIMESTAMP WHERE  uuid=NEW.uuid;
+ END;
+CREATE TABLE "staffplanning" (
+  eventcalendaruuid TEXT,
+  staffuuid TEXT,
+  lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (eventcalendaruuid,staffuuid)
+);
+CREATE TRIGGER trg_staffplanning_upd UPDATE ON staffplanning
+ BEGIN
+  UPDATE staffplanning SET lastmodified=CURRENT_TIMESTAMP WHERE eventcalendaruuid=NEW.eventcalendaruuid and staffuuid=NEW.staffuuid;
+ END;
 CREATE TABLE "staffvacancydays" (
   staffuuid TEXT,
   vacancyyear INTEGER,
@@ -405,6 +484,22 @@ CREATE TABLE "staffvacancydays" (
   hours REAL,
   PRIMARY KEY (staffuuid,vacancyyear) 
 );
+CREATE TRIGGER trg_staffvacancydays_upd UPDATE ON staffvacancydays
+ BEGIN
+  UPDATE staffvacancydays SET lastmodified=CURRENT_TIMESTAMP WHERE staffuuid = NEW.staffuuid and vacancyyear = NEW.vacancyyear;
+ END;
+CREATE TABLE "vacancy" (
+  vacancydate DATE,
+  vacancydateto DATE,
+  vacancydescription TEXT,
+  lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (vacancydate,vacancydateto)
+);
+CREATE TRIGGER trg_vacancy_upd UPDATE ON vacancy
+ BEGIN
+  UPDATE vacancy SET lastmodified=CURRENT_TIMESTAMP WHERE vacancydate = NEW.vacancydate and vacancydateto = NEW.vacancydateto;
+ END;
+
 CREATE TABLE "vacancycalendar" (
   uuid TEXT NOT NULL,
   datefrom DATE,
@@ -416,8 +511,13 @@ CREATE TABLE "vacancycalendar" (
   lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP,
   type INTEGER, 
   accepted BOOLEAN DEFAULT '0',
+  vacyear integer,
   PRIMARY KEY (uuid)
 );
+CREATE TRIGGER trg_vacancycalendar_upd UPDATE ON vacancycalendar
+ BEGIN
+  UPDATE vacancycalendar SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
 CREATE TABLE "waitlist" (
   uuid TEXT NOT NULL,
   waitdate DATE NOT NULL,
@@ -430,6 +530,10 @@ CREATE TABLE "waitlist" (
   editor TEXT,
   PRIMARY KEY (uuid)
 );
+CREATE TRIGGER trg_waitlist_upd UPDATE ON waitlist
+ BEGIN
+  UPDATE waitlist SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
 CREATE TABLE "workinghours" (
   uuid TEXT NOT NULL,
   datestart DATE NOT NULL,
@@ -451,87 +555,7 @@ CREATE TABLE "workinghours" (
   lastmodified DATETIME DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (uuid) 
 );
-CREATE TRIGGER trg_accounting_upd UPDATE ON accounting
- BEGIN
-  UPDATE accounting SET lastmodified=CURRENT_TIMESTAMP WHERE accmonth=NEW.accmonth and childuuid=NEW.childuuid;
- END;
-CREATE TRIGGER trg_activitylog_upd UPDATE ON activitylog
- BEGIN
-  UPDATE activitylog SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
- END;
-CREATE TRIGGER trg_cautionstatus_upd UPDATE ON cautionstatus
- BEGIN
-  UPDATE cautionstatus SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
- END;
-CREATE TRIGGER trg_childs_upd UPDATE ON childs
- BEGIN
-  UPDATE childs SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
- END;
-CREATE TRIGGER trg_childslog_upd UPDATE ON childslog
- BEGIN
-  UPDATE childslog SET lastmodified=CURRENT_TIMESTAMP WHERE uuid=NEW.uuid;
- END;
-CREATE TRIGGER trg_eventcalendar_upd UPDATE ON eventcalendar
- BEGIN
-  UPDATE eventcalendar SET lastmodified=CURRENT_TIMESTAMP WHERE uuid=NEW.uuid;
- END;
-CREATE TRIGGER trg_expenses_upd UPDATE ON expenses
- BEGIN
-  UPDATE expenses SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
- END;
-CREATE TRIGGER trg_groups_upd UPDATE ON groups
- BEGIN
-  UPDATE groups SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
- END;
-CREATE TRIGGER trg_health_upd UPDATE ON health
- BEGIN
-  UPDATE health SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
- END;
-CREATE TRIGGER trg_message_upd UPDATE ON messagelog
- BEGIN
-  UPDATE messagelog SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
- END;
-CREATE TRIGGER trg_planning_upd UPDATE ON planning
- BEGIN
-  UPDATE planning SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
- END;
-CREATE TRIGGER trg_planningstaff_upd UPDATE ON planningstaff
- BEGIN
-  UPDATE planningstaff SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
- END;
-CREATE TRIGGER trg_planningtemplate_upd UPDATE ON planningtemplate
- BEGIN
-  UPDATE planningtemplate SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
- END;
-CREATE TRIGGER trg_presence_upd UPDATE ON presence
- BEGIN
-  UPDATE presence SET lastmodified=CURRENT_TIMESTAMP WHERE daydate = NEW.daydate and childuuid = new.childuuid;
- END;
-CREATE TRIGGER trg_refpersons_upd UPDATE ON refpersons
- BEGIN
-  UPDATE refpersons SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
- END;
-CREATE TRIGGER trg_staff_upd UPDATE ON staff
- BEGIN
-  UPDATE staff SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
- END;
-CREATE TRIGGER trg_staffplanning_upd UPDATE ON staffplanning
- BEGIN
-  UPDATE staffplanning SET lastmodified=CURRENT_TIMESTAMP WHERE eventcalendaruuid=NEW.eventcalendaruuid and staffuuid=NEW.staffuuid;
- END;
-CREATE TRIGGER trg_staffvacancydays_upd UPDATE ON staffvacancydays
- BEGIN
-  UPDATE staffvacancydays SET lastmodified=CURRENT_TIMESTAMP WHERE staffuuid = NEW.staffuuid and vacancyyear = NEW.vacancyyear;
- END;
-CREATE TRIGGER trg_vacancy_upd UPDATE ON vacancy
- BEGIN
-  UPDATE vacancy SET lastmodified=CURRENT_TIMESTAMP WHERE vacancydate = NEW.vacancydate and vacancydateto = NEW.vacancydateto;
- END;
-CREATE TRIGGER trg_costs_upd UPDATE ON costs
- BEGIN
-  UPDATE costs SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
- END;
-CREATE TRIGGER trg_creche_upd UPDATE ON costs
+CREATE TRIGGER trg_workinghours_upd UPDATE ON waitlist
  BEGIN
-  UPDATE creche SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
- END;
+  UPDATE workinghours SET lastmodified=CURRENT_TIMESTAMP WHERE uuid = NEW.uuid;
+ END;
\ No newline at end of file