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

KFNS#33610 KFNS - Contractselectie bij opdracht onder melding niet gekoppeld aan plaats

Browse Source 
svn path=/Website/trunk/; revision=40969
This commit is contained in:
Alex Tiehuis
2019-02-14 11:56:29 +00:00
parent e4235129ef
commit dc756872f9
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
APPL/MLD/mld_edit_opdr.asp
View File

@@ -536,12 +536,19 @@ oRs.Close();
+ " FROM cnt_v_aanwezigcontract cnt, "
+ " cnt_contract_plaats cp, "
+ " mld_melding me, "
+ " cnt_disc_params cpa "
+ " mld_stdmelding sm, "
+ " cnt_disc_params cpa, "
+ " ins_tab_discipline td, "
+ " ins_srtdiscipline sd "
+ " WHERE cnt.cnt_contract_key = cp.cnt_contract_key "
+ " AND cnt.ins_discipline_key = cpa.cnt_ins_discipline_key "
+ " AND sm.mld_stdmelding_key = me.mld_stdmelding_key "
+ " AND td.ins_discipline_key = sm.mld_ins_discipline_key "
+ " AND sd.ins_srtdiscipline_key = td.ins_srtdiscipline_key "
+ " AND (cnt_contract_status = 0 OR cnt.cnt_contract_key = {0})".format(mld_opdr.contract_key||-1) // actief
+ " AND ( (cp.cnt_alg_plaats_key = me.mld_alg_locatie_key "
+ " AND cp.cnt_alg_plaats_code = 'L') "
+ " OR (me.mld_alg_locatie_key IS NULL AND sd.ins_srtdiscipline_alg = 0) "
+ " OR (cp.cnt_alg_plaats_key = "
+ " (SELECT CASE cp.cnt_alg_plaats_code "
+ " WHEN 'G' THEN alg_gebouw_key "

21
APPL/Shared/loadContract.asp
View File

@@ -55,15 +55,22 @@ if (authparamsORDBOF || authparamsMLDBOF || authparamsMLDBO3)
+ ", 2"
+ ", cnt.cnt_contract_nummer_intern"
+ ", cnt.cnt_contract_versie"
+ " FROM cnt_v_aanwezigcontract cnt"
+ ", cnt_contract_plaats cp"
+ ", mld_melding me"
+ ", cnt_disc_params cpa "
+ " WHERE cnt.cnt_contract_key = cp.cnt_contract_key"
+ " AND cnt.ins_discipline_key = cpa.cnt_ins_discipline_key"
+ " AND cnt.cnt_contract_status = 0" // actief
+ " FROM cnt_v_aanwezigcontract cnt "
+ " , cnt_contract_plaats cp "
+ " , mld_melding me "
+ " , mld_stdmelding sm "
+ " , cnt_disc_params cpa "
+ " , ins_tab_discipline td "
+ " , ins_srtdiscipline sd "
+ " WHERE cnt.cnt_contract_key = cp.cnt_contract_key "
+ " AND cnt.ins_discipline_key = cpa.cnt_ins_discipline_key "
+ " AND sm.mld_stdmelding_key = me.mld_stdmelding_key "
+ " AND td.ins_discipline_key = sm.mld_ins_discipline_key "
+ " AND sd.ins_srtdiscipline_key = td.ins_srtdiscipline_key "
+ " AND cnt.cnt_contract_status = 0" // actief
+ " AND ( (cp.cnt_alg_plaats_key = me.mld_alg_locatie_key "
+ " AND cp.cnt_alg_plaats_code = 'L') "
+ " OR (me.mld_alg_locatie_key IS NULL AND sd.ins_srtdiscipline_alg = 0) "
+ " OR (cp.cnt_alg_plaats_key = "
+ " (SELECT CASE cp.cnt_alg_plaats_code "
+ " WHEN 'G' THEN alg_gebouw_key "