admin/Database
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BLCC#75155 Behandelteams ook meenemen in vakgroepscope van opdracht-autorisaties

Browse Source 
svn path=/Database/trunk/; revision=58254
This commit is contained in:
Jos Groot Lipman
2022-12-06 16:12:42 +00:00
parent 29e955df22
commit 648dd0ead9
6 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FAC/FAC_PACX.SRC
View File

@@ -5888,6 +5888,7 @@ AS
v_ordernr mld_opdr.mld_opdr_ordernr%TYPE;
v_mld_opdr_opmerking_fiat mld_opdr.mld_opdr_opmerking_fiat%TYPE;
v_datumgereed DATE;
v_discipline_key mld_opdr.mld_opdr_discipline_key%TYPE;
v_activiteit_key mld_opdr.fac_activiteit_key%TYPE;
v_opmerking mld_opdr.mld_opdr_opmerking%TYPE;
v_flag mld_opdr.mld_opdr_flag%TYPE;
@@ -5940,6 +5941,7 @@ AS
mld_opdr_einddatum,
mld_opdr_plandatum,
mld_opdr_plandatum2,
mld_opdr_discipline_key,
mld_opdr_werkzaamheden,
mld_opdr_uren,
mld_opdr_materiaal,
@@ -5984,6 +5986,7 @@ AS
v_einddatum,
v_plandatum,
v_plandatum2,
v_discipline_key,
v_werkzaamheden,
v_uren,
v_materiaal,
@@ -6034,6 +6037,7 @@ AS
mydatetochar ('datumgereed', v_einddatum);
mydatetochar ('plandatum', v_plandatum);
mydatetochar ('plandatum2', v_plandatum2);
create_ins_discipline_node (v_discipline_key);
createxmltagvalue ('werkzaamheden', v_werkzaamheden);
createxmltagvalue ('opmerking', v_opmerking);
createxmltagvalue ('uren', mynumbertochar (v_uren));

1
FAC/FAC_SET.SRC
View File

@@ -257,6 +257,7 @@ DEFINE_SETTING('MLD', 0001, 'WEB_FACTAB', 'defaultstdmelding'
DEFINE_SETTING('MLD', 0001, 'WEB_FACTAB', 'mld_contract_startdate_key' , 'number' , '-1' , 'key of flex prop in rental contract mutation call')
DEFINE_SETTING('MLD', 0001, 'WEB_FACTAB', 'mld_meldbron_extern' , 'array' , '' , 'Een array van meldbron_keys waarvoor geldt dat Extern nr. editable is')
DEFINE_SETTING('MLD', 0001, 'WEB_FACTAB', 'mld_meldbron_key' , 'number' , '5' , 'MLD_MELDBRON_KEY of meldbron ''intranet''')
DEFINE_SETTING('MLD', 0001, 'WEB_FACTAB', 'mld_opdr_discipline_mode' , 'number' , '1' , 'Autorisation discipline for orders. { 1=(default) use issue discipline 2=follow treatment team }')
DEFINE_SETTING('MLD', 0001, 'WEB_FACTAB', 'mld_opdr_minuren' , 'boolean' , 'false' , 'registreren min uren toegestaan')
DEFINE_SETTING('MLD', 0001, 'WEB_FACTAB', 'mld_ordermaterial_fac_usrtab_key' , 'number' , '-1' , 'fac_usrtab_key of ordermaterials')
DEFINE_SETTING('MLD', 0001, 'WEB_FACTAB', 'mld_ordermaterial_frame' , 'number' , '0' , 'Show order materiallist in a separate frame {0=no (default} | 1=yes}')

2
MLD/MLD_IND.SRC
View File

@@ -41,6 +41,8 @@ create index mld_i_mld_opdr15 on mld_opdr(fac_activiteit_key);
create index mld_i_mld_opdr16 on mld_opdr(cnt_contract_key);
create index mld_i_mld_opdr17 on mld_opdr(mld_opdr_teverzenden);
CREATE INDEX mld_i_mld_opdr18 on mld_opdr(mld_opdr_parent_key);
CREATE INDEX mld_i_mld_opdr19 on mld_opdr(mld_opdr_discipline_key);
create index mld_i_mld_typeopdr1 on mld_typeopdr(mld_typeopdr_module);

4
MLD/MLD_TAB.SRC
View File

@@ -1068,6 +1068,10 @@ CREATE_TABLE(mld_opdr,0)
DATE,
mld_opdr_plandatum2 /* (beoogd) tijdstip van einddatum uitvoering */
DATE,
mld_opdr_discipline_key
NUMBER(10)
NOT_NULL(mld_opdr_discipline_key, mld_c_mld_opdr_discipline_key1)
CONSTRAINT mld_r_opdr_discipline_key1 REFERENCES ins_tab_discipline(ins_discipline_key),
mld_opdr_werkzaamheden
VARCHAR2(80),
mld_opdr_uren

15
MLD/MLD_TRI.SRC
View File

@@ -290,7 +290,20 @@ CREATE_TRIGGER(mld_t_mld_opdr_B_I)
BEFORE INSERT ON mld_opdr
FOR EACH ROW
BEGIN
UPDATE_PRIMARY_KEY(mld_opdr_key, mld_s_mld_opdr_key);
UPDATE_PRIMARY_KEY(mld_opdr_key, mld_s_mld_opdr_key);
IF fac.getSetting ('mld_allow_for_others') = 1
THEN
SELECT msm.mld_ins_discipline_key
INTO :NEW.mld_opdr_discipline_key
FROM mld_melding m, mld_stdmelding msm
WHERE m.mld_melding_key = :NEW.mld_melding_key AND msm.mld_stdmelding_key = m.mld_stdmelding_key;
ELSE
SELECT m.mld_ins_discipline_key
INTO :NEW.mld_opdr_discipline_key
FROM mld_melding m
WHERE m.mld_melding_key = :NEW.mld_melding_key;
END IF;
END;
/

18
_UP/DB43to44.src
View File

@@ -197,6 +197,24 @@ DEF_IMPORT('WEB_PRSSYS', 'CONTACTPERSOON', 'FIP: Aanvullen contactpe
ALTER TABLE prs_bedrijf ADD prs_bedrijf_x NUMBER(16,6);
ALTER TABLE prs_bedrijf ADD prs_bedrijf_y NUMBER(16,6);
/////////////////////////////////////////////////////////////////////////////////////////// BLCC#75155
ALTER TABLE mld_opdr
ADD mld_opdr_discipline_key NUMBER (10)
CONSTRAINT mld_r_opdr_discipline_key1 REFERENCES ins_tab_discipline (ins_discipline_key);
ALTER TRIGGER mld_t_mld_opdr_b_iu disable;
UPDATE mld_opdr o
SET mld_opdr_discipline_key =
(SELECT msm.mld_ins_discipline_key
FROM mld_melding m, mld_stdmelding msm
WHERE m.mld_melding_key = o.mld_melding_key
AND msm.mld_stdmelding_key = m.mld_stdmelding_key);
ALTER TRIGGER mld_t_mld_opdr_b_iu enable;
ALTER TABLE mld_opdr
ADD CONSTRAINT mld_c_mld_opdr_discipline_key1 CHECK (mld_opdr_discipline_key IS NOT NULL);
CREATE INDEX mld_i_mld_opdr19 on mld_opdr(mld_opdr_discipline_key);
/////////////////////////////////////////////////////////////////////////////////////////// FCLT#00000
REGISTERONCE('$Id$')