AAXX#81521 savepoint DB

svn path=/Database/branches/DB49/; revision=66619
This commit is contained in:
2024-10-15 15:57:52 +00:00
parent b20a995a70
commit bd89c91775
4 changed files with 47 additions and 6 deletions

View File

@@ -348,6 +348,7 @@ AS
v_organizer VARCHAR2 (200);
v_att_mail VARCHAR2 (200);
v_att_name VARCHAR2 (200);
v_private VARCHAR2 (100);
v_modifier VARCHAR2 (100);
v_appt_id VARCHAR2 (500);
v_recur_id VARCHAR2 (500);
@@ -418,10 +419,20 @@ AS
fac.imp_getfield_nr (v_newline, c_fielddelimitor, 4, v_organizer);
fac.imp_getfield_nr (v_newline, c_fielddelimitor, 5, v_att_mail);
fac.imp_getfield_nr (v_newline, c_fielddelimitor, 6, v_att_name);
fac.imp_getfield_nr (v_newline, c_fielddelimitor, 7, v_modifier);
fac.imp_getfield_nr (v_newline, c_fielddelimitor, 8, v_appt_id);
fac.imp_getfield_nr (v_newline, c_fielddelimitor, 9, v_recur_id);
fac.imp_getfield_nr (v_newline, c_fielddelimitor, 10, v_seq_nr);
fac.imp_getfield_nr (v_newline, c_fielddelimitor, 7, v_private);
IF (v_private IN ('C', 'U', 'D')) -- De modifier is in v_private opgeslagen; nog even in backwards-compatibility-mode blijven
THEN
v_private := '0';
fac.imp_getfield_nr (v_newline, c_fielddelimitor, 7, v_modifier);
fac.imp_getfield_nr (v_newline, c_fielddelimitor, 8, v_appt_id);
fac.imp_getfield_nr (v_newline, c_fielddelimitor, 9, v_recur_id);
fac.imp_getfield_nr (v_newline, c_fielddelimitor, 10, v_seq_nr);
ELSE
fac.imp_getfield_nr (v_newline, c_fielddelimitor, 8, v_modifier);
fac.imp_getfield_nr (v_newline, c_fielddelimitor, 9, v_appt_id);
fac.imp_getfield_nr (v_newline, c_fielddelimitor, 10, v_recur_id);
fac.imp_getfield_nr (v_newline, c_fielddelimitor, 11, v_seq_nr);
END IF;
v_aanduiding := '[' || v_room_id || '|' || v_starttime || '|' || v_att_mail || '] ';
@@ -539,6 +550,7 @@ AS
organizer,
att_mail,
att_name,
visibility,
modifier,
appt_id,
recur_id,
@@ -551,6 +563,7 @@ AS
v_organizer,
v_att_mail,
v_att_name,
v_private,
v_modifier,
v_appt_id,
v_recur_id,
@@ -860,6 +873,7 @@ AS
starttime,
endtime,
organizer,
visibility,
modifier,
appt_id,
recur_id
@@ -880,6 +894,7 @@ AS
starttime,
endtime,
organizer,
visibility,
modifier) i,
res_rsv_ruimte rr,
res_ruimte rnew
@@ -905,6 +920,7 @@ AS
starttime,
endtime,
organizer,
visibility,
modifier,
appt_id,
recur_id,
@@ -928,6 +944,7 @@ AS
starttime,
endtime,
organizer,
visibility,
modifier) i,
res_v_aanwezigruimte r
WHERE i.room_id = r.res_ruimte_extern_id
@@ -938,6 +955,7 @@ AS
starttime,
endtime,
organizer,
visibility,
modifier,
appt_id,
recur_id,
@@ -961,6 +979,7 @@ AS
starttime,
endtime,
organizer,
visibility,
modifier) i,
res_v_aanwezigruimte r
WHERE i.room_id = r.res_ruimte_extern_id
@@ -1370,6 +1389,7 @@ AS
IF ( v_ruimte_extern_id != rec.res_ruimte_extern_id
OR rec.res_rsv_ruimte_omschrijving !=
SUBSTR (rec.subject, 1, 60)
OR rec.res_rsv_ruimte_visibility != rec.visibility
OR rec.res_rsv_ruimte_van != rec.starttime
OR rec.res_rsv_ruimte_tot != rec.endtime)
THEN
@@ -1393,7 +1413,8 @@ AS
res_rsv_ruimte_omschrijving =
SUBSTR (rec.subject, 1, 60),
res_rsv_ruimte_van = rec.starttime,
res_rsv_ruimte_tot = rec.endtime
res_rsv_ruimte_tot = rec.endtime,
res_rsv_ruimte_visibility = rec.visibility
WHERE res_rsv_ruimte_key = rec.res_rsv_ruimte_key;
-- Opruimen en voorzieningen en bezoekers laten volgen
@@ -1643,6 +1664,7 @@ AS
res_rsv_ruimte_kosten_klant,
res_rsv_ruimte_contact_key,
res_rsv_ruimte_bezoekers,
res_rsv_ruimte_visibility,
res_reservering_key,
res_rsv_ruimte_volgnr,
res_status_bo_key)
@@ -1663,6 +1685,7 @@ AS
1,
v_perslid_key,
rec.num_bez,
rec.visibility,
v_reservering_key,
v_rsv_ruimte_volgnr,
2)

View File

@@ -22,6 +22,9 @@ CREATE_TABLE(exc_import, 0)
VARCHAR2(200),
att_name
VARCHAR2(200),
visibility -- 0=no restrictions, 1=private
NUMBER(1)
DEFAULT 0,
modifier
VARCHAR2(1),
appt_id
@@ -34,7 +37,8 @@ CREATE_TABLE(exc_import, 0)
NUMBER(10)
CONSTRAINT exc_r_fac_import_key1 REFERENCES fac_import(fac_import_key) ON DELETE CASCADE,
gelukt
NUMBER(1)
NUMBER(1),
CONSTRAINT exc_c_visibility CHECK (modifier = 'D' OR visibility IS NOT NULL)
);
REGISTERONCE('$Id$')

View File

@@ -263,6 +263,13 @@ ALTER TABLE fac_imp_taak_mjob
ALTER TABLE res_rsv_ruimte
ADD res_rsv_ruimte_visibility NUMBER (4) DEFAULT 0 NOT NULL;
ALTER TABLE exc_import
ADD visibility NUMBER (4) DEFAULT 0;
ALTER TABLE exc_import
ADD CONSTRAINT exc_c_visibility CHECK
(modifier = 'D' OR visibility IS NOT NULL);
/////////////////////////////////////////////////////////////////////////////////////////// FCLT#00000
REGISTERONCE('$Id$')

View File

@@ -27,6 +27,13 @@ SET DEFINE OFF
ALTER TABLE res_rsv_ruimte
ADD res_rsv_ruimte_visibility NUMBER (4) DEFAULT 0 NOT NULL;
ALTER TABLE exc_import
ADD visibility NUMBER (4) DEFAULT 0;
ALTER TABLE exc_import
ADD CONSTRAINT exc_c_visibility CHECK
(modifier = 'D' OR visibility IS NOT NULL);
------ payload end ------
SET DEFINE OFF