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

MNNL#35925: RES: bolletjes ook in overzicht kunnen aanpassen.

Browse Source 
svn path=/Website/trunk/; revision=29806
This commit is contained in:
Maykel Geerdink
2016-06-22 09:16:54 +00:00
parent efdebce3ef
commit a120addfd6
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
APPL/RES/res_list.inc
View File

@@ -661,13 +661,13 @@ function res_list (pautfunction, params)
+ ", rec2.prs_afdeling_key"
+ ", rec2.remark"
+ ", rec2.res_rsv_ruimte_volgnr"
+ ", rec2.res_rsv_ruimte_key"
+ ", (SELECT COUNT('1')"
+ " FROM res_rsv_deel rrd, res_deel resd"
+ " WHERE rrd.res_rsv_ruimte_key = rec2.res_rsv_ruimte_key"
+ " AND rrd.res_deel_key = resd.res_deel_key"
+ (S("vis_parking_key") != -1 ? " AND resd.res_discipline_key != " + S("vis_parking_key") : "")
+ ") + "
+ ", rec2.res_rsv_ruimte_key rsv_ruimte_key"
+ ", (SELECT COUNT('1')"
+ " FROM res_rsv_deel rrd, res_deel resd"
+ " WHERE rrd.res_rsv_ruimte_key = rec2.res_rsv_ruimte_key"
+ " AND rrd.res_deel_key = resd.res_deel_key"
+ (S("vis_parking_key") != -1 ? " AND resd.res_discipline_key != " + S("vis_parking_key") : "")
+ ") + "
+ " (SELECT COUNT('2')"
+ " FROM res_rsv_artikel"
+ " WHERE res_rsv_ruimte_key = rec2.res_rsv_ruimte_key) nrObjects"
@@ -887,7 +887,7 @@ function res_list (pautfunction, params)
{
var resKey = oRs("res_reservering_key").value; // Reservering key
var resVolgnr = oRs("res_rsv_ruimte_volgnr").value; // Reservering volgnummer
var resRsvRuimteKey = oRs("res_rsv_ruimte_key").value; // rsv_ruimte_key
var resRsvRuimteKey = oRs("rsv_ruimte_key").value; // rsv_ruimte_key
var data = {resKey: resKey, resVolgnr: resVolgnr, resRsvRuimteKey: resRsvRuimteKey};
@@ -933,7 +933,7 @@ function res_list (pautfunction, params)
* End callback functies ResultsetTable for FE and FO only
********************************************************/
var rst = new ResultsetTable({keyColumn: "res_rsv_ruimte_key",
var rst = new ResultsetTable({keyColumn: "rsv_ruimte_key",
ID: "restable",
rowClass: fnrowClassF,
rowData: fnrowDataF,
@@ -1492,7 +1492,6 @@ function res_list (pautfunction, params)
{
// Voor groepering nog verder filteren
sql = " SELECT DISTINCT res_reservering_key"
+ ", res_rsv_ruimte_key"
+ ", locatie"
+ ", alg_gebouw_key"
+ ", alg_verdieping_key"
@@ -2153,7 +2152,7 @@ function res_list (pautfunction, params)
rowActionEnabler: fnrowActionEnabler,
sql: sql,
flexModule: "RES",
flexId: "res_rsv_ruimte_key", // keycolumn is soms res_rsv_deel_key
flexId: "rsv_ruimte_key", // keycolumn is soms res_rsv_deel_key
flexGroupId: "res_activiteit_key",
filterParams: params,
outputmode: outputmode,
@@ -2161,7 +2160,7 @@ function res_list (pautfunction, params)
inlineDetails: ((backo || minfo) && groupres == 1)?"inlineVoorzieningUrl":null,
hasInlineDetails: ((backo || minfo) && groupres == 1)?fnHasVZ:null,
showAll: showall,
suppressKeyRepeat: print?"res_rsv_ruimte_key":null // suppress fields when no key-change
suppressKeyRepeat: print?"rsv_ruimte_key":null // suppress fields when no key-change
});
// Kolommen
// AAFM#14872/PF: Deze locatiekolom is wat dubbelop. We spreken af dat we die