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=40830
This commit is contained in:
Erik Groener
2019-02-06 15:40:31 +00:00
parent d8f7d88b40
commit 637b58c0b4
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/ALG/alg_locatie.asp
View File

@@ -88,7 +88,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&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&full=1&loc_key=" + loc_key
IFRAMER("cntFrame", page1, { initHeight: "450px" } );
}
}

3
APPL/CNT/cnt.inc
View File

@@ -250,6 +250,7 @@ cnt = { setcontractstatus:
var grp_sel = params.grp_sel;
var mobile = params.mobile == 1;
var tiny = params.tiny;
var full = params.full;
var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc.
var print = (outputmode == 1 || outputmode == 5);
@@ -577,7 +578,7 @@ cnt = { setcontractstatus:
{
//statussen = "0", en dan ook naar de fases binnen de status Actief kijken.
sqlactief += " (c.cnt_contract_status = 0"
+ cnt.getfaseconditionsql({cntffutu: cntFFutu, cntfact: cntFAct, cntfrap: cntFRap, cntfopz: cntFOpz, cntfverl: cntFVerl})
+ (full ? "" : cnt.getfaseconditionsql({cntffutu: cntFFutu, cntfact: cntFAct, cntfrap: cntFRap, cntfopz: cntFOpz, cntfverl: cntFVerl}) )
+ ")";
}
if (cntInact)

1
APPL/CNT/cnt_list.inc
View File

@@ -25,6 +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)
cntNew search for contracts which are Nieuw
cntTgoe search for contracts which are Ter goedkeuring
cntAct search for contracts which are Actueel

2
APPL/CNT/cnt_search_list.asp
View File

@@ -34,6 +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 urole = getFParamSafe("urole", urole); // Indien niet meegegeven, veronderstel dan frontend gebruik
var fronto = (urole == "fo");
@@ -125,6 +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.cntAct = cntAct;
params.cntNew = cntNew;
params.cntTgoe = cntTgoe;