From e530da74dbb6466dba23ecbe4f0250fd2cc770bb Mon Sep 17 00:00:00 2001 From: Peter Feij Date: Thu, 7 Dec 2023 16:39:43 +0000 Subject: [PATCH] BAMG#81378 Kostenplaats koppelen aan persoon svn path=/Database/trunk/; revision=62895 --- FAC/FAC_PACX.SRC | 66 +++++++++++++++++++++++++----------------------- PRS/PRS_TAB.SRC | 3 +++ _UP/DB46to47.src | 5 ++++ 3 files changed, 42 insertions(+), 32 deletions(-) diff --git a/FAC/FAC_PACX.SRC b/FAC/FAC_PACX.SRC index f5568ca1..4e778a1b 100644 --- a/FAC/FAC_PACX.SRC +++ b/FAC/FAC_PACX.SRC @@ -2293,42 +2293,41 @@ AS END; -- * create_PRS_PERSLID_node - -- * ?? do we include srtperslid here?? -- select xml.create_PRS_PERSLID_node(1042,'Persoon') FROM DUAL PROCEDURE create_prs_perslid_node (p_key IN NUMBER, p_nodename IN VARCHAR2, p_concise IN BOOLEAN) AS - v_titel prs_perslid.prs_perslid_titel%TYPE; - v_voorletters prs_perslid.prs_perslid_voorletters%TYPE; - v_naam prs_perslid.prs_perslid_naam%TYPE; - v_tussenvoegsel prs_perslid.prs_perslid_tussenvoegsel%TYPE; - v_voornaam prs_perslid.prs_perslid_voornaam%TYPE; - v_initialen prs_perslid.prs_perslid_initialen%TYPE; - v_nr prs_perslid.prs_perslid_nr%TYPE; - v_oslogin prs_perslid.prs_perslid_oslogin%TYPE; - v_oslogin2 prs_perslid.prs_perslid_oslogin2%TYPE; - v_opp prs_perslid.prs_perslid_opp%TYPE; - v_ingangsdatum prs_perslid.prs_perslid_ingangsdatum%TYPE; - v_einddatum prs_perslid.prs_perslid_einddatum%TYPE; - v_uurloon prs_perslid.prs_perslid_uurloon%TYPE; - v_telefoonnr prs_perslid.prs_perslid_telefoonnr%TYPE; - v_email prs_perslid.prs_perslid_email%TYPE; - v_mobiel prs_perslid.prs_perslid_mobiel%TYPE; - v_afdeling_key prs_perslid.prs_afdeling_key%TYPE; - v_naam_full prs_v_perslid_fullnames_all.prs_perslid_naam_full%TYPE; - v_naam_friendly prs_v_perslid_fullnames_all.prs_perslid_naam_friendly%TYPE; - v_adres_key prs_perslid.mld_adres_key%TYPE; - v_srtperslid_key prs_perslid.prs_srtperslid_key%TYPE; - v_srtnoti_mode prs_perslid.prs_perslid_srtnoti_mode%TYPE; - v_geslacht prs_perslid.prs_perslid_geslacht%TYPE; - v_externid prs_perslid.prs_perslid_externid%TYPE; - v_externsyncdate prs_perslid.prs_perslid_externsyncdate%TYPE; - v_visibility prs_perslid.prs_perslid_visibility%TYPE; - v_firstwpdone BOOLEAN; - v_perslid_key_v prs_perslid.prs_perslid_key_verantw%TYPE; - + v_titel prs_perslid.prs_perslid_titel%TYPE; + v_voorletters prs_perslid.prs_perslid_voorletters%TYPE; + v_naam prs_perslid.prs_perslid_naam%TYPE; + v_tussenvoegsel prs_perslid.prs_perslid_tussenvoegsel%TYPE; + v_voornaam prs_perslid.prs_perslid_voornaam%TYPE; + v_initialen prs_perslid.prs_perslid_initialen%TYPE; + v_nr prs_perslid.prs_perslid_nr%TYPE; + v_oslogin prs_perslid.prs_perslid_oslogin%TYPE; + v_oslogin2 prs_perslid.prs_perslid_oslogin2%TYPE; + v_opp prs_perslid.prs_perslid_opp%TYPE; + v_ingangsdatum prs_perslid.prs_perslid_ingangsdatum%TYPE; + v_einddatum prs_perslid.prs_perslid_einddatum%TYPE; + v_uurloon prs_perslid.prs_perslid_uurloon%TYPE; + v_telefoonnr prs_perslid.prs_perslid_telefoonnr%TYPE; + v_email prs_perslid.prs_perslid_email%TYPE; + v_mobiel prs_perslid.prs_perslid_mobiel%TYPE; + v_afdeling_key prs_perslid.prs_afdeling_key%TYPE; + v_naam_full prs_v_perslid_fullnames_all.prs_perslid_naam_full%TYPE; + v_naam_friendly prs_v_perslid_fullnames_all.prs_perslid_naam_friendly%TYPE; + v_adres_key prs_perslid.mld_adres_key%TYPE; + v_srtperslid_key prs_perslid.prs_srtperslid_key%TYPE; + v_srtnoti_mode prs_perslid.prs_perslid_srtnoti_mode%TYPE; + v_geslacht prs_perslid.prs_perslid_geslacht%TYPE; + v_externid prs_perslid.prs_perslid_externid%TYPE; + v_externsyncdate prs_perslid.prs_perslid_externsyncdate%TYPE; + v_visibility prs_perslid.prs_perslid_visibility%TYPE; + v_firstwpdone BOOLEAN; + v_perslid_key_v prs_perslid.prs_perslid_key_verantw%TYPE; + v_prs_kostenplaats_key prs_perslid.prs_kostenplaats_key%TYPE; CURSOR c1 IS SELECT wp.prs_werkplek_key @@ -2371,7 +2370,8 @@ AS prs_perslid_key_verantw, prs_perslid_externid, prs_perslid_externsyncdate, - prs_perslid_visibility + prs_perslid_visibility, + prs_kostenplaats_key INTO v_titel, v_voorletters, v_naam, @@ -2396,7 +2396,8 @@ AS v_perslid_key_v, v_externid, v_externsyncdate, - v_visibility + v_visibility, + v_prs_kostenplaats_key FROM prs_perslid p WHERE prs_perslid_key = p_key; @@ -2449,6 +2450,7 @@ AS END LOOP; create_prs_afdeling_node (v_afdeling_key, 'afdeling'); + create_prs_kostenplaats_node (v_prs_kostenplaats_key, TRUE); createxmltagvalue ('srtnoti_mode', v_srtnoti_mode); -- Profiel toevoegen END IF; diff --git a/PRS/PRS_TAB.SRC b/PRS/PRS_TAB.SRC index 21079ede..94f60e02 100644 --- a/PRS/PRS_TAB.SRC +++ b/PRS/PRS_TAB.SRC @@ -727,6 +727,9 @@ CREATE_TABLE(prs_perslid,0) prs_perslid_key_verantw -- fallback als elke structuur faalt (irt o.a. meldingen-instemming) NUMBER(10) CONSTRAINT prs_r_prs_perslid_key23 REFERENCES prs_perslid(prs_perslid_key), + prs_kostenplaats_key -- optioneel een (default) persoonlijke kostenplaats + NUMBER(10) + CONSTRAINT prs_r_prs_kostenplaats_key5 REFERENCES prs_kostenplaats(prs_kostenplaats_key), CONSTRAINT prs_c_prs_perslid_datums CHECK(prs_perslid_einddatum >= prs_perslid_ingangsdatum) ); diff --git a/_UP/DB46to47.src b/_UP/DB46to47.src index aac8f15c..ae2496cb 100644 --- a/_UP/DB46to47.src +++ b/_UP/DB46to47.src @@ -127,6 +127,11 @@ ALTER TABLE mld_stdmelding ADD mld_stdmelding_priomatrix NUMBER(1) DEFAULT 0 NOT ALTER TABLE mld_melding ADD mld_melding_impact NUMBER(2); ALTER TABLE mld_melding ADD mld_melding_urgentie NUMBER(2); +/////////////////////////////////////////////////////////////////////////////////////////// BAMG#81378 +ALTER TABLE prs_perslid ADD prs_kostenplaats_key + NUMBER(10) + CONSTRAINT prs_r_prs_kostenplaats_key5 REFERENCES prs_kostenplaats(prs_kostenplaats_key); + /////////////////////////////////////////////////////////////////////////////////////////// FCLT#00000