From 65bc80b1e4992c4200a3d9db36291f2ad720a6f4 Mon Sep 17 00:00:00 2001 From: Ruud Lipper Date: Tue, 16 Feb 2016 15:17:43 +0000 Subject: [PATCH] FSN#35446 goedkopere controle of er contractobjecten zijn svn path=/Website/trunk/; revision=28191 --- APPL/INS/ins_deel.asp | 51 +++++++++---------------------------------- 1 file changed, 10 insertions(+), 41 deletions(-) diff --git a/APPL/INS/ins_deel.asp b/APPL/INS/ins_deel.asp index 2856961fdb..64c65c06d1 100644 --- a/APPL/INS/ins_deel.asp +++ b/APPL/INS/ins_deel.asp @@ -84,7 +84,7 @@ if (ins_key > 0) isSLE = (oRs(0).Value > 0); oRs.Close(); - var insContracts = 0; + var insContracts = false; var authparamsCNTUSE = user.checkAutorisation("WEB_CNTUSE", true); var authparamsCNTMAN = user.checkAutorisation("WEB_CNTMAN", true); var curole = "bo"; @@ -94,46 +94,15 @@ if (ins_key > 0) if (authparamsCNTMAN || authparamsCNTUSE) { - var sql = "SELECT COUNT ( * )" - + " FROM (SELECT cnt_contract_key" - + " FROM cnt_v_aanwezigcontract_object" - + " WHERE cnt_ins_deel_key =" + ins_key + "" - + " UNION" - + " SELECT co.cnt_contract_key" - + " FROM CNT_V_AANWEZIGCONTRACT_OBJECT co," - + " ins_deel d," - + " cnt_v_aanwezigcontract_plaats ccp," - + " alg_v_allonroerendgoed aao" - + " WHERE cnt_ins_deel_key IS NULL" - + " AND co.cnt_ins_srtdeel_key = d.ins_srtdeel_key" - + " AND d.ins_deel_key =" + ins_key + "" - + " AND ccp.cnt_contract_key = co.cnt_contract_key" - + " AND COALESCE (d.ins_alg_ruimte_type_org," - + " ins_alg_ruimte_type) = 'R'" - + " AND COALESCE (d.ins_alg_ruimte_key_org," - + " ins_alg_ruimte_key) = aao.alg_ruimte_key" - + " AND ( (ccp.cnt_alg_plaats_code = 'L'" - + " AND ccp.cnt_alg_plaats_key = aao.alg_locatie_key)" - + " OR (ccp.cnt_alg_plaats_code = 'G'" - + " AND ccp.cnt_alg_plaats_key = aao.alg_gebouw_key))" - + " UNION" - + " SELECT co.cnt_contract_key" - + " FROM CNT_V_AANWEZIGCONTRACT_OBJECT co, ins_deel d" - + " WHERE cnt_ins_deel_key IS NULL" - + " AND co.cnt_ins_srtdeel_key = d.ins_srtdeel_key" - + " AND d.ins_deel_key ="+ ins_key + "" - + " AND (co.cnt_contract_key NOT IN" - + " (SELECT cnt_contract_key" - + " FROM cnt_v_aanwezigcontract_plaats)" - + " OR COALESCE (d.ins_alg_ruimte_type_org," - + " ins_alg_ruimte_type) != 'R')) cobj," - + " cnt_contract c" - + " WHERE c.cnt_contract_key = cobj.cnt_contract_key" - + " AND TRUNC (cnt_contract_looptijd_tot) >= TRUNC (SYSDATE)" - + " AND c.cnt_contract_status = 0"; - + var sql = "SELECT 1" + + " FROM cnt_v_aanwezigcontract_object cao, cnt_contract c" + + " WHERE cao.cnt_contract_key = c.cnt_contract_key" + + " AND c.cnt_contract_status = 0" + + " AND c.cnt_contract_verwijder IS NULL" + + " AND ROWNUM = 1"; + oRs = Oracle.Execute(sql); - insContracts = oRs(0).Value; + insContracts = !oRs.eof; oRs.Close(); } } @@ -219,7 +188,7 @@ if (authparamsCNTMAN || authparamsCNTUSE) IFRAMER("insMldframe", page, { initHide: true } ); } - if (!ins_deleted && ins_key > 0 && !copy && insContracts > 0 && (authparamsCNTMAN || authparamsCNTUSE)) + if (!ins_deleted && ins_key > 0 && !copy && insContracts && (authparamsCNTMAN || authparamsCNTUSE)) { page = "../cnt/cnt_search_list.asp?ffutu=1&fact=1&frap=1&fopz=1&sact=1&ins_key=" + ins_key + "&urole=" + curole; IFRAMER("insCNTframe", page, { initHide: true } );