ASTE#37915 KRE timezone conversies

svn path=/Database/trunk/; revision=33105
This commit is contained in:
Jos Groot Lipman
2017-03-09 16:22:18 +00:00
parent 779ad7de51
commit 9354705c92
4 changed files with 145 additions and 16 deletions

View File

@@ -100,6 +100,8 @@ CREATE_TABLE(alg_locatie,0)
NUMBER(16,6),
alg_locatie_y
NUMBER(16,6),
alg_locatie_timezone
VARCHAR2(40),
-- in MLD_TAB.SRC:
-- mld_dienstniveau_key
-- NUMBER(10)

View File

@@ -336,13 +336,16 @@ AS
v_return VARCHAR2 (1000);
l_timezone VARCHAR2 (20);
v_utc TIMESTAMP;
user_ts TIMESTAMP;
BEGIN
IF p_date IS NOT NULL
THEN
createopentag (p_tag);
createxmltagvalue ('datum', TO_CHAR (p_date, 'dd-mm-yyyy'));
createxmltagvalue ('tijd', TO_CHAR (p_date, 'hh24:mi'));
-- veronderstel origineel CentralEuropeTime. Die heeft de goede zomer/wintertijd
user_ts := FROM_TZ (CAST (p_date AS TIMESTAMP), TO_CHAR (SYSTIMESTAMP, 'tzr')) AT TIME ZONE SESSIONTIMEZONE;
createxmltagvalue ('localdatum', TO_CHAR (user_ts, 'dd-mm-yyyy'));
createxmltagvalue ('localtijd', TO_CHAR (user_ts, 'hh24:mi'));
v_utc :=
SYS_EXTRACT_UTC (FROM_TZ (CAST (p_date AS TIMESTAMP), 'CET'));
createxmltagvalue ('utcdatum', TO_CHAR (v_utc, 'YYYYMMDD'));

View File

@@ -608,12 +608,7 @@ CREATE_TABLE(prs_perslid,0)
prs_perslid_terms_version /* filename of accepted terms of condition */
VARCHAR2(200),
prs_perslid_timezone
VARCHAR2(40)
DEFAULT 'Europe/Amsterdam',
prs_perslid_timezone_offset
NUMBER(4,2)
DEFAULT 1
CONSTRAINT prs_c_prs_perslid_timezone_offset CHECK(prs_perslid_timezone_offset BETWEEN -12 AND 14),
VARCHAR2(40),
CONSTRAINT prs_c_prs_perslid_datums CHECK(prs_perslid_einddatum >= prs_perslid_ingangsdatum)
);

View File

@@ -9,10 +9,12 @@ COMMIT;
/////////////////////////////////////////////////////////////////////////////////////////// FSN#38888
CREATE UNIQUE INDEX fac_i_fac_name ON fac_api (fac_api_name);
CREATE UNIQUE INDEX fac_i_fac_api1 ON fac_api (fac_api_name);
CREATE UNIQUE INDEX fac_i_idp2 ON fac_idp(fac_idp_issuer, fac_idp_audience, fac_idp_type);
CREATE UNIQUE INDEX fac_i_fac_session2 ON fac_session(fac_session_sessionid_hash);
/////////////////////////////////////////////////////////////////////////////////////////// FSN#39394
create index fac_i_fac_result1 on fac_result(fac_result_sessionid);
@@ -270,8 +272,14 @@ CREATE_TABLE(bgt_budget,0)
prs_kostenplaats_key
NUMBER (10)
CONSTRAINT prs_r_kostenplaats_key5 REFERENCES prs_kostenplaats (prs_kostenplaats_key),
bgt_budget_limiet
NUMBER (8), -- het budgetbedrag
bgt_budget_bedrag
NUMBER (12,2),
bgt_budget_btwbedrag
NUMBER (12,2),
bgt_budget_isreserve
NUMBER(1)
DEFAULT (0)
CONSTRAINT bgt_c_bgt_budget_isreserve CHECK(bgt_budget_isreserve IN (0,1)),
bgt_budget_begin
DATE,
bgt_budget_eind
@@ -279,16 +287,101 @@ CREATE_TABLE(bgt_budget,0)
bgt_budget_aanmaak
DATE DEFAULT SYSDATE,
bgt_budget_vervaldatum
DATE -- of gewoon verwijderdatum?
DATE,
CONSTRAINT bgt_c_bgt_budget1 CHECK (bgt_kostenrubriek_key IS NOT NULL
OR (bgt_kostenrubriek_key IS NOT NULL AND prs_kostensoortgrp_key IS NOT NULL)
OR (bgt_kostenrubriek_key IS NOT NULL AND prs_kostensoortgrp_key IS NOT NULL AND prs_kostensoort_key IS NOT NULL)
OR prs_kostenplaatsgrp_key IS NOT NULL
OR (prs_kostenplaatsgrp_key IS NOT NULL AND prs_kostenplaats_key IS NOT NULL) )
);
-- under construction TODO checken
CREATE_TABLE(bgt_budgetmutatie, 1)
(
bgt_budgetmutatie_key
NUMBER (10) PRIMARY KEY,
bgt_budgetmutatie_datum
DATE NOT NULL,
bgt_budgetmutatie_omschrijving
VARCHAR2 (100) NOT NULL,
prs_perslid_key
NUMBER (10)
NOT NULL
CONSTRAINT bgt_r_prs_perslid_key2 REFERENCES prs_perslid (prs_perslid_key),
bgt_budget_key_van
NUMBER (10)
NOT NULL CONSTRAINT bgt_r_bgt_budget1 REFERENCES bgt_budget (bgt_budget_key),
bgt_budget_bedrag_van
NUMBER (12, 2),
bgt_budget_key_naar
NUMBER (10)
NOT NULL CONSTRAINT bgt_r_bgt_budget2 REFERENCES bgt_budget (bgt_budget_key),
bgt_budget_bedrag_naar
NUMBER (12, 2)
);
CREATE SEQUENCE bgt_s_bgt_disc_params_key MINVALUE 1;
CREATE SEQUENCE bgt_s_bgt_project_key MINVALUE 1;
CREATE SEQUENCE bgt_s_bgt_project_key MINVALUE 1;
CREATE SEQUENCE bgt_s_bgt_kostenrubriek_key MINVALUE 1;
CREATE SEQUENCE bgt_s_bgt_budget_key MINVALUE 1;
CREATE SEQUENCE bgt_s_bgt_budgetmutatie_key MINVALUE 1;
ALTER TABLE mld_opdr ADD prs_kostensoort_key CONSTRAINT mld_r_prs_kostensoort_key1 REFERENCES prs_kostensoort (prs_kostensoort_key);
-- deze relatie is nu verplicht. Maak voor de ontbrekende verwijzingen een default aan.
ALTER TABLE prs_kostensoort DROP CONSTRAINT prs_r_prs_kostensoortgrp_key;
ALTER TABLE prs_kostensoort MODIFY (prs_kostensoortgrp_key CONSTRAINT prs_r_prs_kostensoortgrp_key REFERENCES prs_kostensoortgrp(prs_kostensoortgrp_key));
DECLARE
gcnt NUMBER;
gkey NUMBER (10);
BEGIN
SELECT COUNT ( * )
INTO gcnt
FROM prs_kostensoort
WHERE prs_kostensoortgrp_key IS NULL;
IF gcnt > 0
THEN
INSERT INTO prs_kostensoortgrp (prs_kostensoortgrp_oms)
VALUES ('Default')
RETURNING prs_kostensoortgrp_key
INTO gkey;
UPDATE prs_kostensoort
SET prs_kostensoortgrp_key = gkey
WHERE prs_kostensoortgrp_key IS NULL;
END IF;
END;
/
ALTER TABLE prs_kostensoort MODIFY prs_kostensoortgrp_key NOT NULL;
-- en deze relatie is nu ook verplicht. Maak voor de ontbrekende verwijzingen een default aan.
ALTER TABLE prs_kostenplaats DROP CONSTRAINT prs_r_prs_kostenplaatsgrp_key;
ALTER TABLE prs_kostenplaats MODIFY (prs_kostenplaatsgrp_key CONSTRAINT prs_r_prs_kostenplaatsgrp_key REFERENCES prs_kostenplaatsgrp(prs_kostenplaatsgrp_key));
DECLARE
gcnt NUMBER;
gkey NUMBER (10);
BEGIN
SELECT COUNT ( * )
INTO gcnt
FROM prs_kostenplaats
WHERE prs_kostenplaatsgrp_key IS NULL;
IF gcnt > 0
THEN
INSERT INTO prs_kostenplaatsgrp (prs_kostenplaatsgrp_oms)
VALUES ('Default')
RETURNING prs_kostenplaatsgrp_key
INTO gkey;
UPDATE prs_kostenplaats
SET prs_kostenplaatsgrp_key = gkey
WHERE prs_kostenplaatsgrp_key IS NULL;
END IF;
END;
/
ALTER TABLE prs_kostenplaats MODIFY prs_kostenplaatsgrp_key NOT NULL;
ALTER TABLE mld_opdr DROP CONSTRAINT mld_r_mld_melding_key3;
ALTER TABLE mld_opdr ADD
(
@@ -303,9 +396,8 @@ DEF_FAC_FUNCTIE3('WEB_BGTORD', 'BGT', 3, 1, 1);
DEF_MENUKOP(1, 'lcl_bgt');
DEF_MENUITEM(1, 'lcl_menu_bgt_disciplines_1' , '', 'BGT', 'appl/mgt/bgt_discipline.asp?mode=wrap&id={0}', 0, 1, 'WEB_BGTMAN', 'R', '1', '');
DEF_MENUKOP(2, 'lcl_facmgt_bgt');
DEF_MENUITEM(2, 'lcl_menu_bgt_disciplines' , '', 'BGT', 'appl/mgt/bgt_discipline.asp', 0, 0, 'WEB_BGTMGT', 'W', '1', '');
//DEF_MENUITEM(1, 'lcl_menu_bgt_budget' , '', 'BGT', 'appl/mgt/bgt_budget.asp', 0, 0, 'WEB_BGTMAN', 'R', '1', ''); // TODO ws weg
DEF_MENUITEM(1, 'lcl_menu_bgt_disciplines' , '', 'BGT', 'appl/mgt/bgt_discipline.asp', 0, 0, 'WEB_BGTMGT', 'W', '1', '');
/////////////////////////////////////////////////////////////////////////////////////////// HCAS#38260
@@ -320,7 +412,44 @@ DEF_FAC_SRTNOT('RES2BO', 0, 'lcl_noti_RES2BO', 'res/res_reservering.asp?rsv_ruim
UPDATE fac_setting
SET fac_setting_name = 'self_register_groep_keys'
WHERE fac_setting_name = 'self_register_groep_key'
WHERE fac_setting_name = 'self_register_groep_key';
/////////////////////////////////////////////////////////////////////////////////////////// UWVA#38459
CREATE VIEW bez_v_udr_reserveringbezoeker AS SELECT '' dummy FROM DUAL;
INSERT INTO fac_usrrap (fac_usrrap_omschrijving, fac_usrrap_view_name,fac_usrrap_info, fac_functie_key, fac_usrrap_functie)
SELECT 'UDR: Bezoekers bij reserveringen','BEZ_V_UDR_RESERVERINGBEZOEKER','Basisrapport voor bezoekers met reserveringsgegevens', fac_functie_key, 32
FROM fac_functie WHERE fac_functie_code='WEB_UDRMAN'
AND NOT EXISTS (SELECT '' FROM fac_usrrap WHERE UPPER(fac_usrrap_view_name)='BEZ_V_UDR_RESERVERINGBEZOEKER');
/////////////////////////////////////////////////////////////////////////////////////////// FSN#39312
UPDATE fac_menuitems
SET fac_menuitems_url = REPLACE(fac_menuitems_url, 'alg_kenmerk_niveau', 'level')
WHERE fac_menuitems_url LIKE '%alg_kenmerk.asp%';
UPDATE fac_menuitems
SET fac_menuitems_url = REPLACE(fac_menuitems_url, 'prs_kenmerk_niveau', 'level')
WHERE fac_menuitems_url LIKE '%prs_kenmerk.asp%';
/////////////////////////////////////////////////////////////////////////////////////////// HSLE#36221
UPDATE fac_menuitems
SET fac_menuitems_url = REPLACE(fac_menuitems_url, 'fac_usergraph', 'fac_usrgraph')
WHERE fac_menuitems_url LIKE '%fac_usergraph%';
UPDATE fac_menuitems
SET fac_menuitems_url = REPLACE(fac_menuitems_url, 'fac_notificatiejob', 'fac_notificatie_job')
WHERE fac_menuitems_url LIKE '%fac_notificatiejob%';
UPDATE fac_menuitems
SET fac_menuitems_url = REPLACE(fac_menuitems_url, 'mld_stdmelding_groep', 'mld_stdmeldinggroep')
WHERE fac_menuitems_url LIKE '%mld_stdmelding_groep%';
/////////////////////////////////////////////////////////////////////////////////////////// ASTE#37915
ALTER TABLE prs_perslid ADD prs_perslid_timezone
VARCHAR2(40);
ALTER TABLE alg_locatie ADD alg_locatie_timezone
VARCHAR2(40);
/////////////////////////////////////////////////////////////////////////////////////////// MARX#39774
ALTER TABLE fin_factuurregel MODIFY (fin_factuurregel_omschrijving VARCHAR2(250));
ALTER TABLE fac_imp_factuur MODIFY (omschrijving VARCHAR2(250));
///////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////