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

FCLT#52459 LISTAGG(objecten) wordt nu alleen gebruikt in mld_list en opdr_list indien er 20 of minder objecten aanwezig zijn

Browse Source 
svn path=/Website/branches/v2017.3/; revision=37263
This commit is contained in:
Koen Reefman
2018-03-05 12:48:44 +00:00
parent a1aa90241e
commit de6e3f5976
3 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
APPL/MLD/mld.inc
View File

@@ -5153,10 +5153,21 @@ mld = {setmeldingstatus:
+ " '{0}') "
+ " WITHIN GROUP (ORDER BY ins_deel_omschrijving) "
+ " deel "
+ " FROM ins_v_aanwezigdeel d, ins_srtdeel s, mld_melding_object mo "
+ " FROM ins_v_aanwezigdeel d, ins_srtdeel s, mld_melding_object mo, "
+ " ( SELECT mo2.mld_melding_key, COUNT (1) objCount "
+ " FROM mld_melding_object mo2, ins_v_aanwezigdeel d2 "
+ " WHERE d2.ins_deel_key = mo2.ins_deel_key "
+ " GROUP BY mo2.mld_melding_key) oc "
+ " WHERE mo.mld_melding_key = m.mld_melding_key "
+ " AND d.ins_deel_key = mo.ins_deel_key "
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key) object"
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key "
+ " AND oc.mld_melding_key = m.mld_melding_key "
+ " AND oc.objCount <= 20) object"
+ ", (SELECT COUNT (1) "
+ " FROM ins_v_aanwezigdeel d, ins_srtdeel s, mld_melding_object mo "
+ " WHERE mo.mld_melding_key = m.mld_melding_key "
+ " AND d.ins_deel_key = mo.ins_deel_key "
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key) objCount"
: "")
+ " FROM mld_opdr o"
+ " , cnt_v_aanwezigcontract c"

21
APPL/MLD/mld_list.inc
View File

@@ -277,10 +277,21 @@ function mld_list (pautfunction, params)
+ " '{0}') "
+ " WITHIN GROUP (ORDER BY ins_deel_omschrijving) "
+ " deel "
+ " FROM ins_v_aanwezigdeel d, ins_srtdeel s, mld_melding_object mo "
+ " FROM ins_v_aanwezigdeel d, ins_srtdeel s, mld_melding_object mo, "
+ " (SELECT mo2.mld_melding_key, COUNT (1) objCount "
+ " FROM mld_melding_object mo2, ins_v_aanwezigdeel d2 "
+ " WHERE d2.ins_deel_key = mo2.ins_deel_key "
+ " GROUP BY mo2.mld_melding_key) oc "
+ " WHERE mo.mld_melding_key = m.mld_melding_key "
+ " AND d.ins_deel_key = mo.ins_deel_key "
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key) object";
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key "
+ " AND oc.mld_melding_key = m.mld_melding_key "
+ " AND oc.objCount <= 20) object"
+ ", (SELECT COUNT (1) "
+ " FROM ins_v_aanwezigdeel d, ins_srtdeel s, mld_melding_object mo "
+ " WHERE mo.mld_melding_key = m.mld_melding_key "
+ " AND d.ins_deel_key = mo.ins_deel_key "
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key) objCount";
}
if (S("mld_num_prefix_mode") == 1) // kostenplaats of afdeling
@@ -667,13 +678,15 @@ function mld_list (pautfunction, params)
function fncolObject(oRs)
{
if (oRs("object").Value == null)
if (oRs("objCount").Value > 20)
return "<span class=\"nowrap\">" + (outputmode == 0 ? I("fa-hand-o-right") + " " : "") + "(" + oRs("objCount").Value + " " + L("lcl_mld_objects") + ")</span>";
else if (oRs("object").Value == null)
return "";
var obj = oRs("object").Value;
var ret = (outputmode == 0 ? I("fa-hand-o-right") + " " : "") + obj.format(", ");
if (obj.indexOf("{0}") == -1) // single object
return "<span class='nowrap'>" + ret + "</span>";
return "<span class=\"nowrap\">" + ret + "</span>";
else
return ret;
}

9
APPL/MLD/opdr_list.inc
View File

@@ -421,14 +421,17 @@ function opdr_list(params)
function fncolObject(oRs)
{
if (oRs("object").Value == null)
if (oRs("objCount").Value > 20)
return "<span class=\"nowrap\">" + (outputmode == 0 ? I("fa-hand-o-right") + " " : "") + "(" + oRs("objCount").Value + " " + L("lcl_mld_objects") + ")</span>";
else if (oRs("object").Value == null)
return "";
var obj = oRs("object").Value;
var ret = (outputmode == 0 ? I("fa-hand-o-right") + " " : "") + obj.format(", ");
if (obj.indexOf("{0}") == -1) // single object
return "<span class='nowrap'>" + ret + "</span>";
else return ret;
return "<span class=\"nowrap\">" + ret + "</span>";
else
return ret;
}
var summaryParams = { status_oms: new Array(),