From 64a35adb07789fb9804c4f615c888102cdd9c28b Mon Sep 17 00:00:00 2001 From: Jos Groot Lipman Date: Wed, 3 Jun 2020 14:09:44 +0000 Subject: [PATCH] Merge DB38d (coronaewerkplek) patches svn path=/Database/trunk/; revision=47036 --- CAD/CAD_INI.SRC | 12 ++++-------- CAD/CAD_SEQ.SRC | 2 +- CAD/CAD_VIE.SRC | 1 + FAC/FAC_LCL.SRC | 2 +- PRJ/PRJ_INI.SRC | 2 +- _UP/DB38ato38d.sql | 3 +-- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/CAD/CAD_INI.SRC b/CAD/CAD_INI.SRC index e9d37803..f8cbf624 100644 --- a/CAD/CAD_INI.SRC +++ b/CAD/CAD_INI.SRC @@ -7,14 +7,10 @@ _FAC_MODULE('CAD','lcl_module_CAD') -INSERT INTO cad_legenda (cad_legenda_omschrijving, cad_legenda_discreet) VALUES ('Default legenda', 1); -INSERT INTO cad_legenda (cad_legenda_omschrijving, cad_legenda_discreet) VALUES ('Aantallen', 0); -INSERT INTO cad_legenda (cad_legenda_omschrijving, cad_legenda_discreet) VALUES ('Bezetting', 0); - -UPDATE cad_legenda SET cad_legenda_key=1 WHERE cad_legenda_omschrijving='Default legenda'; -UPDATE cad_legenda SET cad_legenda_key=2 WHERE cad_legenda_omschrijving='Aantallen'; -UPDATE cad_legenda SET cad_legenda_key=4 WHERE cad_legenda_omschrijving='Bezetting'; --- Let op: bij prj_ini komt er nog meer (key 3) +INSERT INTO cad_legenda (cad_legenda_key, cad_legenda_omschrijving, cad_legenda_discreet) VALUES (1, 'Default legenda', 1); +INSERT INTO cad_legenda (cad_legenda_key, cad_legenda_omschrijving, cad_legenda_discreet) VALUES (2, 'Aantallen', 0); +// IN prj_ini: INSERT INTO cad_legenda (cad_legenda_key, cad_legenda_omschrijving, cad_legenda_discreet) VALUES (3, 'Default project legenda', 1); +INSERT INTO cad_legenda (cad_legenda_key, cad_legenda_omschrijving, cad_legenda_discreet) VALUES (4, 'Bezetting', 1); INSERT INTO cad_legendawaarde (cad_legenda_key, cad_legendawaarde_value, cad_legendawaarde_rgb, cad_legendawaarde_omschr) VALUES (2,'0','FFFFFF','0'); diff --git a/CAD/CAD_SEQ.SRC b/CAD/CAD_SEQ.SRC index 0bb397da..297111df 100644 --- a/CAD/CAD_SEQ.SRC +++ b/CAD/CAD_SEQ.SRC @@ -6,7 +6,7 @@ CREATE SEQUENCE cad_s_cad_tekening_key MINVALUE 1; -CREATE SEQUENCE cad_s_cad_legenda_key MINVALUE 1; +CREATE SEQUENCE cad_s_cad_legenda_key MINVALUE 21; CREATE SEQUENCE cad_s_cad_legendawaarde_key MINVALUE 1; CREATE SEQUENCE cad_s_cad_thema_key MINVALUE 1; CREATE SEQUENCE cad_s_cad_label_key MINVALUE 1; diff --git a/CAD/CAD_VIE.SRC b/CAD/CAD_VIE.SRC index a0dbe569..08dfadc5 100644 --- a/CAD/CAD_VIE.SRC +++ b/CAD/CAD_VIE.SRC @@ -872,6 +872,7 @@ AS AND datum < TRUNC (res_rsv_deel_tot) + 1) blokkerend -- vandaag en nog niet afgelopen WHERE r.res_deel_key = blokkerend.res_deel_key(+) AND datums.datum = blokkerend.datum(+) + AND (r.res_deel_vervaldatum IS NULL or r.res_deel_vervaldatum > SYSDATE) AND d.ins_deel_key = r.res_ins_deel_key) GROUP BY datum, ins_deel_key ORDER BY datum, ins_deel_key; diff --git a/FAC/FAC_LCL.SRC b/FAC/FAC_LCL.SRC index 3b4897e6..c16ba838 100644 --- a/FAC/FAC_LCL.SRC +++ b/FAC/FAC_LCL.SRC @@ -3586,7 +3586,7 @@ FAC_LCL('lcl_res_planmode_gereserveerd', 'Flexreservering', 'Flexreservation' FAC_LCL('lcl_res_planmode_geresopmerk', '', '') FAC_LCL('lcl_mobile_res_intervalbezet', '(gereserveerd)', '(reserved)') FAC_LCL('lcl_res_niets_beschikbaar', 'Er is hier dan niets beschikbaar, maak een andere keuze.', 'Nothing is available here at that time.') - +FAC_LCL('lcl_res_deel_replace', 'Je had al een reservering in deze periode, die zal hierdoor gaan vervallen. Wil je doorgaan?', 'You already had a reservation in this period, it will expire. Do you want to continue?') COMMIT; diff --git a/PRJ/PRJ_INI.SRC b/PRJ/PRJ_INI.SRC index e4a0a866..5b47246b 100644 --- a/PRJ/PRJ_INI.SRC +++ b/PRJ/PRJ_INI.SRC @@ -7,7 +7,7 @@ _FAC_MODULE('PRJ','lcl_module_PRJ') -INSERT INTO cad_legenda (cad_legenda_omschrijving, cad_legenda_discreet) VALUES ('Default project legenda', 1); +INSERT INTO cad_legenda (cad_legenda_key, cad_legenda_omschrijving, cad_legenda_discreet) VALUES (3, 'Default project legenda', 1); INSERT INTO cad_thema (cad_thema_omschrijving, cad_legenda_key, cad_thema_view, cad_thema_type) diff --git a/_UP/DB38ato38d.sql b/_UP/DB38ato38d.sql index f9ee7413..612b876e 100644 --- a/_UP/DB38ato38d.sql +++ b/_UP/DB38ato38d.sql @@ -21,7 +21,7 @@ SET DEFINE OFF CREATE VIEW cad_v_label_deel_res_datum (dummy) AS select '' from dual; CREATE VIEW cad_v_thema_deel_res_datum (dummy) AS select '' from dual; -INSERT INTO cad_legenda (cad_legenda_key,cad_legenda_omschrijving, cad_legenda_discreet) VALUES (4, 'Bezetting', 0); +INSERT INTO cad_legenda (cad_legenda_key,cad_legenda_omschrijving, cad_legenda_discreet) VALUES (4, 'Bezetting', 1); INSERT INTO cad_legendawaarde (cad_legenda_key, cad_legendawaarde_value, cad_legendawaarde_rgb, cad_legendawaarde_omschr) VALUES (4,'0','33CC33','hele dag beschikbaar'); @@ -57,4 +57,3 @@ SET ECHO OFF SPOOL OFF SET DEFINE ON PROMPT Logfile of this upgrade is: &fcltlogfile -