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

FSN#35446 object contracten in een frame tonen ipv een knopje

Browse Source 
svn path=/Website/trunk/; revision=28183
This commit is contained in:
Ruud Lipper
2016-02-16 09:46:50 +00:00
parent 2cd7f165cb
commit 617f964d60
2 changed files with 61 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
APPL/INS/ins_deel.asp
View File

@@ -83,6 +83,59 @@ if (ins_key > 0)
oRs = Oracle.Execute(sql);
isSLE = (oRs(0).Value > 0);
oRs.Close();
var insContracts = false;
var authparamsCNTUSE = user.checkAutorisation("WEB_CNTUSE", true);
var authparamsCNTMAN = user.checkAutorisation("WEB_CNTMAN", true);
var curole = "bo";
if (!authparamsCNTMAN && authparamsCNTUSE)
curole = "fe";
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";
oRs = Oracle.Execute(sql);
insContracts = oRs(0).Value;
oRs.Close();
}
}
%>
<html>
@@ -171,6 +224,13 @@ if (ins_key > 0)
page = "ins_inspect_list.asp?ins_key=" + ins_key + "&urole=" + urole;
IFRAMER("insInspectframe", page, { initHide: false } );
}
if (!ins_deleted && ins_key > 0 && !copy && insContracts > 0 && (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 } );
}
%>
</body>
</html>

59
APPL/INS/ins_show_deel.asp
View File

@@ -31,13 +31,6 @@ if (this_ins.isSleCil)
else
var autfunction = getQParam("pautfunction", (urole == "fo"? "WEB_INSFOF" : "WEB_INSMAN"));
var authparamsCNTUSE = user.checkAutorisation("WEB_CNTUSE", true);
var authparamsCNTMAN = user.checkAutorisation("WEB_CNTMAN", true);
var curole = "bo";
if (!authparamsCNTMAN && authparamsCNTUSE)
curole = "fe";
var authparams = user.checkAutorisation(autfunction);
var sql, oRs;
@@ -221,7 +214,7 @@ oRs.Close();
}
function showHistory()
{
FcltMgr.openDetail("appl/ins/ins_history_search.asp?ins_key=<%=ins_key%>&urole=<%=curole%>", "<%=L("lcl_history")%>");
FcltMgr.openDetail("appl/ins/ins_history_search.asp?ins_key=<%=ins_key%>&urole=<%=urole%>", "<%=L("lcl_history")%>");
}
function ins_reserveerbaar()
{
@@ -238,11 +231,6 @@ oRs.Close();
FcltMgr.openDetail("appl/mld/mld_melding.asp?urole=fo&ins_key=<%=ins_key%>", "<%=L("lcl_add")%>");
}
function ins_contract()
{
FcltMgr.openDetail("appl/cnt/cnt_search_list.asp?ffutu=1&fact=1&frap=1&fopz=1&sact=1&ins_key=<%=ins_key%>&urole=<%=curole%>", "<%=L("lcl_contract")%>");
}
function ins_delete()
{
if (confirm(L("lcl_ins_del_txt_deel")))
@@ -282,48 +270,6 @@ oRs.Close();
+ " AND d.ins_deel_key = " + ins_key;
oRs = Oracle.Execute(sql);
this_ins.verbruiksmeter = oRs("meetwaarde").Value == 1;
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";
oRs = Oracle.Execute(sql);
this_ins.contracts = oRs(0).Value;
oRs.Close();
}
var buttons = [ ];
@@ -345,9 +291,6 @@ oRs.Close();
if (this_ins.canDelete)
buttons.push({title: L("lcl_delete"), action: "ins_delete()", icon: "delete.png"});
if (this_ins.contracts > 0 && (authparamsCNTMAN || authparamsCNTUSE))
buttons.push ({title: L("lcl_contract"), action: "ins_contract()", icon: "contract.png"});
buttons.push ({title: L("lcl_print"), action: "ins_print()", icon: "print.png" });