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

FSN#35446 contracten met scope bij gebouw en locatie tonen

Browse Source 
svn path=/Website/trunk/; revision=28121
This commit is contained in:
Ruud Lipper
2016-02-11 08:07:25 +00:00
parent d90cb3808a
commit 89566cc50a
4 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
APPL/ALG/alg_gebouw.asp
View File

@@ -23,18 +23,21 @@ var bld_key = getQParamInt("key", -1);
if (bld_key > 0)
{
sql = " select alg_gebouw_code "
sql = " select alg_gebouw_code, alg_locatie_key "
+ " FROM alg_gebouw "
+ " WHERE alg_gebouw_key = " + bld_key;
oRs = Oracle.Execute(sql);
var bld_name = " " + oRs("alg_gebouw_code").value;
var loc_key = " " + oRs("alg_locatie_key").value;
}
else
{
var bld_name = ""
var bld_name = "";
var loc_key = -1;
}
%>
<html>
@@ -76,6 +79,17 @@ else
IFRAMER("algFrame", page, { title: L("lcl_alg_gebouw_frame"),
initHeight: "450px",
FcltClose: "algClose" } );
if (bld_key > -1)
{
var authparamsCNTMAN = user.checkAutorisation("WEB_CNTMAN", true);
var cntman_read = authparamsCNTMAN;
if (cntman_read)
{
var page1="../cnt/cnt_search_list.asp?embedded=1&tiny=1&collapsed=1&urole=bo&ffutu=1&fact=1&frap=1&fopz=1&sact=1&loc_key="+ loc_key + "&bld_key=" + bld_key
IFRAMER("cntFrame", page1, { initHeight: "0px" } );
}
}
%>
</body>
</html>

11
APPL/ALG/alg_locatie.asp
View File

@@ -76,6 +76,17 @@ else
IFRAMER("algFrame", page, { title: L("lcl_alg_locatie_frame"),
initHeight: "450px",
FcltClose: "algClose" } );
if (loc_key > -1)
{
var authparamsCNTMAN = user.checkAutorisation("WEB_CNTMAN", true);
var cntman_read = authparamsCNTMAN;
if (cntman_read)
{
var page1="../cnt/cnt_search_list.asp?embedded=1&tiny=1&collapsed=1&urole=bo&ffutu=1&fact=1&frap=1&fopz=1&sact=1&loc_key=" + loc_key
IFRAMER("cntFrame", page1, { initHeight: "450px" } );
}
}
%>
</body>
</html>

1
APPL/CNT/cnt_list.inc
View File

@@ -621,6 +621,7 @@ function cnt_list (pautfunction, params)
if ((S("cnt_contract_approval") == 0 && authparamsCNTMAN && authparamsCNTMAN.ALGwritelevel < 9 && authparamsCNTMAN.PRSwritelevel < 9) ||
(S("cnt_contract_approval") == 1 && authparamsCNTUSE && authparamsCNTUSE.ALGwritelevel < 9 && authparamsCNTUSE.PRSwritelevel < 9))
{
buttons.push({ icon: "page_refresh.png", title: L("lcl_refresh"), action: "FcltMgr.reload()" });
var addurl = "appl/cnt/cnt_contract.asp?urole=bo";
buttons.push({ icon: "plus.png", title: L("lcl_add"), action: "FcltMgr.openDetail('"+addurl+"', '"+L("lcl_add")+"')" });
}

24
APPL/CNT/cnt_search_list.asp
View File

@@ -18,7 +18,15 @@
// Vanuit ins_show_deel komen ze deze twee QParam
var urole = getQParamSafe("urole", "");
var ins_key = getQParamInt("ins_key", -1);
var bld_key = getQParamInt("bld_key", -1);
var loc_key = getQParamInt("loc_key", -1);
var cntFFutu = getQParamInt("ffutu", 0); // Fase Toekomstig binnen status actief
var cntFAct = getQParamInt("fact", 0); // Fase Actueel binnen status actief
var cntFRap = getQParamInt("frap", 0); // Fase Rappel binnen status actief
var cntFOpz = getQParamInt("fopz", 0); // Fase In opzegtermijn binnen status actief
var cntAct = getQParamInt("sact", 0);
var urole = getFParamSafe("urole", urole); // Indien niet meegegeven, veronderstel dan frontend gebruik
var fronto = (urole == "fo");
var backo = (urole == "bo");
@@ -56,8 +64,8 @@ else
var beheerder_key = getFParamInt("sBeh_key", -1); // Beheerder
var reg_key = getFParamInt("regiokey", -1); // Regio
var dist_key = getFParamInt("districtkey", -1);
var loc_key = getFParamInt("locatiekey", -1); // Locatie
var bld_key = getFParamInt("gebouwkey", -1); // Gebouw
var loc_key = getFParamInt("locatiekey", loc_key); // Locatie
var bld_key = getFParamInt("gebouwkey", bld_key); // Gebouw
var objectsrt_key = getFParamInt("srtdeel", -1); // Objectsoort
var cntsrt_key = getFParamInt("disc", -1); // Contractsoort / discipline
var mantel_key = getFParamInt("mantel", -1); // Mantel
@@ -66,15 +74,15 @@ else
var kp_key = getFParamInt("kp_key", -1);
var ksgrp_key = getFParamInt("ksgrp_key", -1);
var ks_key = getFParamInt("ks_key", -1);
var cntAct = getFParamInt("cntAct", 0) == 1; // Status Actief(0)
var cntAct = getFParamInt("cntAct", cntAct) == 1; // Status Actief(0)
var cntInact = getFParamInt("cntInact", 0) == 1; // Status Inactief(1)
var cntNew = getFParamInt("cntNew", 0) == 1; // Status Nieuw(2)
var cntTgoe = getFParamInt("cntTgoe", 0) == 1; // Status Ter goedkeuring(3)
var cntFFutu = getFParamInt("cntFFutu", 0) == 1; // Fase Toekomstig binnen status actief
var cntFAct = getFParamInt("cntFAct", 0) == 1; // Fase Actueel binnen status actief
var cntFRap = getFParamInt("cntFRap", 0) == 1; // Fase Rappel binnen status actief
var cntFOpz = getFParamInt("cntFOpz", 0) == 1; // Fase In opzegtermijn binnen status actief
var cntFFutu = getFParamInt("cntFFutu", cntFFutu) == 1; // Fase Toekomstig binnen status actief
var cntFAct = getFParamInt("cntFAct", cntFAct) == 1; // Fase Actueel binnen status actief
var cntFRap = getFParamInt("cntFRap", cntFRap) == 1; // Fase Rappel binnen status actief
var cntFOpz = getFParamInt("cntFOpz", cntFOpz) == 1; // Fase In opzegtermijn binnen status actief
var cntFVerl = getFParamInt("cntFVerl", 0) == 1; // Fase Verlopen binnen status actief
if (!cntAct && !cntInact && !cntNew && !cntTgoe)