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

PCHD#55972 Locatiekaart: verlopen contracten ook tonen

Browse Source 
svn path=/Website/trunk/; revision=41005
This commit is contained in:
Erik Groener
2019-02-15 13:00:12 +00:00
parent a462d606ee
commit f8f1273837
11 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/ALG/alg_gebouw.asp
View File

@@ -20,6 +20,7 @@
FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["jquery-ui.js"]})
var bld_key = getQParamInt("key", -1);
var cnt_full = getQParamInt("cnt_full", 0) == 1;
if (bld_key > 0)
{
@@ -92,6 +93,7 @@ else
if (authparamsCNTMAN || authparamsCNTUSE)
{
var page1="../cnt/cnt_search_list.asp?embedded=1&tiny=1&collapsed=1&urole=" + curole + "&ffutu=1&fact=1&frap=1&fopz=1&sact=1&bld_key=" + bld_key
page1 += (cnt_full ? "&cnt_full=1" : "");
IFRAMER("cntFrame", page1, { initHide: true } );
}
}

4
APPL/ALG/alg_gebouw_list.inc
View File

@@ -60,6 +60,8 @@ function fnrowClass(oRs)
}
return lclass;
}
var all_cnt = getQParamInt("cnt_full", 0);
%>
<script type="text/javascript">
@@ -80,7 +82,7 @@ function fnrowClass(oRs)
function gebouwEdit(row)
{
var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
var url = "appl/alg/alg_gebouw.asp?mode=viewChange&key=" + algData.key;
var url = "appl/alg/alg_gebouw.asp?mode=viewChange&key=" + algData.key + (v_all_cnt == 1 ? "&cnt_full=1" : "");
FcltMgr.openDetail(url, "<%=L("lcl_building")%>" + ' ' + algData.oms);
}

4
APPL/ALG/alg_gebouw_search.asp
View File

@@ -21,6 +21,7 @@ var srtgebouw_key = getQParamInt("gebouw_func", -1); // Gebouwfunctie
var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2
var autosearch = getQParamInt("autosearch", 0) == 1;
var cnt_full = getQParamInt("cnt_full", 0) == 1;
var authparams = alg.checkAutorisation();
var this_alg = alg.func_enabled(gebouw_key);
%>
@@ -51,6 +52,9 @@ var this_alg = alg.func_enabled(gebouw_key);
<body id="searchbody">
<div id="search">
<form name="u2" target="workFrame" action="alg_gebouw_search_list.asp" method="get">
<% if (cnt_full) { %>
<input type="hidden" id="cnt_full" name="cnt_full" value="1">
<% } %>
<% BLOCK_START("searchtable", L("lcl_filterblok"));%>
<tr>
<td class="searchkolom1">

2
APPL/ALG/alg_gebouw_search_list.asp
View File

@@ -32,12 +32,14 @@ var srtgebouw_key = getQParamInt("srt", -1); // Gebouwfunctie
var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2
var expalgincl = getQParamInt("expAlgIncl", 0) == 1; // Ook vervallen gebouwen
var cnt_full = getQParamInt("cnt_full", 0) == 1;
var fitness_score1_from = getQParamInt("fitness_score1_from", -1); // Conditie score van.
var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.
gebouw_list ( "*",
{ outputmode: outputmode,
showall: showall,
cnt_full: cnt_full,
srtgebouw_key: (srtgebouw_key != -1? srtgebouw_key: null),
verantw_key: (verantw_key != -1? verantw_key: null),
verantw_key2: (verantw_key2 != -1? verantw_key2: null),

4
APPL/ALG/alg_locatie.asp
View File

@@ -20,6 +20,7 @@ FCLTHeader.Requires({ plugins: ["suggest", "jQuery"],
js: ["jquery-ui.js"]})
var loc_key = getQParamInt("key", -1);
var cnt_full = getQParamInt("cnt_full", 0) == 1;
if (loc_key > 0)
{
@@ -88,7 +89,8 @@ else
if (authparamsCNTMAN || authparamsCNTUSE)
{
var page1="../cnt/cnt_search_list.asp?embedded=1&tiny=1&collapsed=1&urole=" + curole + "&ffutu=1&fact=1&frap=1&fopz=1&sact=1&full=1&loc_key=" + loc_key
var page1="../cnt/cnt_search_list.asp?embedded=1&tiny=1&collapsed=1&urole=" + curole + "&ffutu=1&fact=1&frap=1&fopz=1&sact=1&loc_key=" + loc_key
page1 += (cnt_full ? "&cnt_full=1" : "");
IFRAMER("cntFrame", page1, { initHeight: "450px" } );
}
}

5
APPL/ALG/alg_locatie_list.inc
View File

@@ -62,6 +62,8 @@ function fnrowClass(oRs)
}
return lclass;
}
var all_cnt = getQParamInt("cnt_full", 0);
%>
<script type="text/javascript">
var autosearch = 1; //automatisch laden van resultaat op search pagina
@@ -80,8 +82,9 @@ function fnrowClass(oRs)
}
function locatieEdit(row)
{
var v_all_cnt = <%=all_cnt%>;
var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
var url = "appl/ALG/alg_locatie.asp?key="+algData.key;
var url = "appl/ALG/alg_locatie.asp?key="+algData.key + (v_all_cnt == 1 ? "&cnt_full=1" : "");
FcltMgr.openDetail(url, "<%=L("lcl_location")%>" + ' ' + algData.oms);
}

4
APPL/ALG/alg_locatie_search.asp
View File

@@ -16,6 +16,7 @@ var ins_score_enabled = S("ins_score_enabled") == 1;
var district_key = getQParamInt("district_key", -1); //district
var locatie_key = getQParamInt("locatie_key", -1); //locatie
var autosearch = getQParamInt("autosearch", 0) == 1;
var cnt_full = getQParamInt("cnt_full", 0) == 1;
var authparams = alg.checkAutorisation();
%>
@@ -45,6 +46,9 @@ var authparams = alg.checkAutorisation();
<body id="searchbody">
<div id="search">
<form name="u2" target="workFrame" action="alg_locatie_search_list.asp" method="get">
<% if (cnt_full) { %>
<input type="hidden" id="cnt_full" name="cnt_full" value="1">
<% } %>
<% BLOCK_START("searchtable", L("lcl_filterblok"));%>
<tr>
<td class="searchkolom1">

2
APPL/ALG/alg_locatie_search_list.asp
View File

@@ -27,12 +27,14 @@ var dis_key = getQParamInt("districtkey", -1); // District
var loc_key = getQParamInt("locatiekey", -1); // Locatie
var loc_code = getQParam("loc_code", ""); // Locatiecode
var loc_descr = getQParam("loc_descr", ""); // Locatienaam
var cnt_full = getQParamInt("cnt_full", 0) == 1;
var fitness_score1_from = getQParamInt("fitness_score1_from", -1); // Conditie score van.
var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.
locatie_list ( "*",
{ outputmode: outputmode,
showall: showall,
cnt_full: cnt_full,
reg_key: (reg_key != -1? reg_key : null),
dis_key: (dis_key != -1? dis_key : null),
loc_key: (loc_key != -1? loc_key : null),

15
APPL/CNT/cnt.inc
View File

@@ -250,7 +250,18 @@ cnt = { setcontractstatus:
var grp_sel = params.grp_sel;
var mobile = params.mobile == 1;
var tiny = params.tiny;
var full = params.full;
var cntNotclosed = params.cntNotclosed;
if (cntNotclosed)
{ // Alle niet gesloten contracten zien: dus deze vinkjes zetten.
cntAct = true;
cntInact = false;
cntFFutu = true;
cntFAct = true;
cntFRap = true;
cntFOpz = true;
cntFVerl = true;
}
var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc.
var print = (outputmode == 1 || outputmode == 5);
@@ -578,7 +589,7 @@ cnt = { setcontractstatus:
{
//statussen = "0", en dan ook naar de fases binnen de status Actief kijken.
sqlactief += " (c.cnt_contract_status = 0"
+ (full ? "" : cnt.getfaseconditionsql({cntffutu: cntFFutu, cntfact: cntFAct, cntfrap: cntFRap, cntfopz: cntFOpz, cntfverl: cntFVerl}) )
+ cnt.getfaseconditionsql({cntffutu: cntFFutu, cntfact: cntFAct, cntfrap: cntFRap, cntfopz: cntFOpz, cntfverl: cntFVerl})
+ ")";
}
if (cntInact)

3
APPL/CNT/cnt_list.inc
View File

@@ -25,7 +25,7 @@
ks_key search for contracts with the given kostensoort key
mantel_key search for contracts with the given mantel key
descript search for contracts with the given contract text in contract description
full select all contracts (used from alg_locatie)
cntNotclosed select all contracts which are not closed (used from alg_locatie)
cntNew search for contracts which are Nieuw
cntTgoe search for contracts which are Ter goedkeuring
cntAct search for contracts which are Actueel
@@ -72,6 +72,7 @@ function cnt_list (pautfunction, params)
// params.cntsrt_key : key
// params.mantel_key : key
// params.descript : wildcard string
// params.cntNotclosed : boolean (true | false)
// params.cntAct : boolean (true | false)
// params.cntInact : boolean (true | false)
// params.cntNew : boolean (true | false)

4
APPL/CNT/cnt_search_list.asp
View File

@@ -34,7 +34,7 @@
var outputmode = getQParamInt("outputmode", 0); // 0 = screen, 1 = print, 2 = excel etc
var showall = getQParamInt("showall", 0);
var tiny = getQParamInt("tiny", 0) == 1; // voor framed lijsten bij objecten etc.
var full = getQParamInt("full", 0) == 1; // alle niet-gesloten contracten tonen.
var notclosed = getQParamInt("cnt_full", 0) == 1; // alle niet-gesloten contracten tonen.
var urole = getFParamSafe("urole", urole); // Indien niet meegegeven, veronderstel dan frontend gebruik
var fronto = (urole == "fo");
@@ -126,7 +126,7 @@ if (!cntAct && !cntInact && !cntNew && !cntTgoe)
params.ks_key = (ks_key != -1 ? ks_key : null);
params.mantel_key = (mantel_key != -1? mantel_key : null);
params.descript = (descript != ""? descript : null);
params.full = full;
params.cntNotclosed = notclosed;
params.cntAct = cntAct;
params.cntNew = cntNew;
params.cntTgoe = cntTgoe;