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

FBEA#84083

Browse Source 
- Fix activity key(s) as either singular or array on multiple places. 
- Remove comments and log.
- Use getQParamKeyArray. 
- roomcatalogue_key_arr to act_key_arr

svn path=/Website/trunk/; revision=67504
This commit is contained in:
Rik Hassing
2025-01-06 10:42:25 +00:00
parent ee6e64f574
commit c1fd473cf0
8 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/RES/load_kenmerk.asp
View File

@@ -28,7 +28,7 @@ var DOCTYPE_Disable = true;
<%
generateFlexKenmerkBlock ({ urole : getQParamSafe("urole"),
act_key : getQParamInt("act_key", -1), // Activiteit key
act_key_arr : getQParamKeyArray("act_key_arr", []),
act_change : getQParamInt("act_change", 0) == 1, // Activiteit is gewijzigd.
rsv_ruimte_key : getQParamInt("rsv_ruimte_key", -1), // Rsv ruimte key
serie : getQParamInt("serie", 0) == 1, // Serie reservering

3
APPL/RES/res_edit_rsv_ruimte.asp
View File

@@ -2054,10 +2054,9 @@ FCLTHeader.Requires({ plugins: ["jQuery", "kenmerk"] });
<%
}
BLOCK_END();
generateFlexKenmerkBlock({urole: urole,
res_key : rrr.reservering_key,
act_key : rrr.activiteit_key,
act_key_arr : [rrr.activiteit_key],
defaults : rrr.flex_defaults, // pacta: { bsn: "12345678", plaats: "Enschede", postcode:"1234AB" }
rsv_ruimte_key : ((restype == "CV" && rsv_copy_key > -1) ? rsv_copy_key : rsv_ruimte_key), // ook bij 'ruimte erbij'
reado: false,

12
APPL/RES/res_flexkenmerk.inc
View File

@@ -27,17 +27,15 @@ function generateFlexKenmerkBlock(params)
var frontend = (urole == "fe" || (!fronto && !backo && !minfo));
var disc_key = params.disc_key; // Res discipline key
var act_key = params.act_key; // Activiteit key
var act_key_arr = params.act_key_arr; // Activiteit keys
var act_change = params.act_change; // Activiteit is gewijzigd
var rsv_ruimte_key = params.rsv_ruimte_key; // Rsv ruimte key
var serie = params.serie; // Serie reservering
var reado = params.reado; // Readonly
var readofe = params.readofe;
var advanced = params.advanced; // Geavanceerd
var advancedNoAct = (advanced && act_key < 0 && rsv_ruimte_key < 0);
var reqId = params.reqId; // Perslid key (!search && multiMode)
var hasfilter = params.hasfilter? params.hasfilter : null;
var autfunction = "";
switch(urole)
{
@@ -171,9 +169,11 @@ function generateFlexKenmerkBlock(params)
+ " FROM res_srtkenmerk t"
+ " , res_kenmerk k"
+ " , res_activiteit s"
+ " WHERE " + (advancedNoAct ? "(1=1)" : "s.res_activiteit_key = " + act_key)
+ " AND (k.res_activiteit_key = s.res_activiteit_key"
+ " AND k.res_kenmerk_niveau = 'A')"
+ " WHERE ( k.res_activiteit_key = s.res_activiteit_key"
+ " AND k.res_kenmerk_niveau = 'A')"
+ (act_key_arr.length
? " AND s.res_activiteit_key IN (" + act_key_arr.join(',') + ")"
: "")
+ " AND k.res_kenmerk_verwijder IS NULL"
+ " AND k.res_srtkenmerk_key = t.res_srtkenmerk_key"
+ " AND t.res_srtkenmerk_verwijder IS NULL";

4
APPL/RES/res_plan_room_v2.inc
View File

@@ -560,7 +560,7 @@ __Log("start make_plan_room");
if (!params.forSelectRoom && authparams.PRSwritelevel < 9 && authparams.ALGwritelevel < 9)
{
var dt = params.res_van.midnight().getTime();
onclick = "onclick=\"room_table_click(event,new Date("+dt+"), " + hour_px + ", "+safe.jsfloat(S("res_t1"))+",'"+params.urole+"',"+(params.activiteit_key || -1)+")\"";
onclick = "onclick=\"room_table_click(event,new Date("+dt+"), " + hour_px + ", "+safe.jsfloat(S("res_t1"))+",'"+params.urole+"',"+(params.act_key_arr.join(",") || -1)+")\"";
}
if (!params.forSelectRoom)
@@ -815,7 +815,7 @@ __Log("start make_plan_room");
}
if (evt.type == "click")
{
roomGridClick(evt, '<%=params.urole%>', '<%=params.activiteit_key || -1%>');
roomGridClick(evt, '<%=params.urole%>', '<%=params.act_key_arr.join(",") || -1%>');
}
lasteventtype = evt.type;
}

16
APPL/RES/res_search.asp
View File

@@ -113,7 +113,7 @@ var group = getQParamInt("groupby", -1); // Groepering, standaard -1 (backo), 4
var alg_startlevel = getQParamInt("alg_startlevel", 2); // Startlevel van plaatsselector (Locatie)
var alg_endlevel = getQParamInt("alg_endlevel", 5); // Endlevel van plaatsselector
var secsearch_alg_level = getQParamInt("secsearch_alg_level", 3); // Endlevel van plaatsselector voor secsearch
var act_key_arr = getQParamIntArray("act_key", []); // Activiteit
var act_key_arr = getQParamKeyArray ("act_key", []); // Activiteit
var roomcatalogue_key_arr = getQParamIntArray("roomcatmulti", []); // Ruimte soort catalogus
var obj_key_arr = getQParamIntArray("objcatmulti", []); // Voorzieningen catalogus
var art_key_arr = getQParamIntArray("artcatmulti", []); // Verbruiksartikelen catalogus
@@ -209,7 +209,7 @@ oRs.Close();
async function myModal(init)
{
var key = $('#act').val();
var url = "load_kenmerk.asp?act_key=" + $('#act').val()
var url = "load_kenmerk.asp?act_key_arr=" + key
+ "&urole=<%=urole%>"
+ "&advanced=1"
+ "&hasFilter=1";
@@ -263,7 +263,7 @@ oRs.Close();
{ // Dus alleen als direct voorzieningenplanbord aangeroepen wordt.
if (act_key_arr.length > -1)
{
%> <input type="hidden" name="act" id="act" value="<%=act_key_arr%>"> <%
%> <input type="hidden" name="act" id="act" value="<%=act_key_arr.join(",")%>"> <%
}
if (srtact > -1)
{
@@ -276,8 +276,6 @@ oRs.Close();
sql += " AND ra.res_activiteit_key IN (" + act_key_arr.join(", ") + ")";
var oRs = Oracle.Execute(sql);
__DoLog(sql);
while (!oRs.eof)
{
obj_key_arr.push(oRs("res_discipline_key").Value);
@@ -343,16 +341,12 @@ oRs.Close();
+ " ORDER BY res_activiteit_volgnr, sa.res_srtactiviteit_prefix, UPPER("+ lcl.xsql('a.res_activiteit_omschrijving', 'a.res_activiteit_key')+")";
FCLTselector("act",
sql,
{ //initKey: act,
initKey: act_key_arr.length > 0 ? roomcatalogue_key_arr.join(",") : "-1", // Indien geen waarde meegegeven dan "Alles" selecteren (key = -1).
{
initKey: act_key_arr.length > 0 ? act_key_arr.join(",") : "-1", // Indien geen waarde meegegeven dan "Alles" selecteren (key = -1).
label: L("lcl_activity"),
trclass: "primsearch",
multi: true,
emptyOption: L("lcl_search_generic")
// emptyOption: "",
// selectjustone: true,
// multi: true,
// trclass: "primsearch"
});
// Locatie, gebouw, verdieping en ruimte

2
APPL/RES/res_search_list.asp
View File

@@ -131,7 +131,7 @@ else
params.bld_key_arr = bld_key_arr;
params.floor_key_arr = floor_key_arr;
params.room_key_arr = room_key_arr;
params.act_key_arr = (act_key_arr > 0 ? act_key_arr : null);
params.act_key_arr = act_key_arr;
params.suppress_cont = (backo || minfo? suppress_cont : null); // Wordt alleen gebruikt bij bo en mi
params.srtact = (srtact != -1? srtact : null);
params.searchtext = (searchtext != ""? searchtext : null);

9
APPL/RES/res_search_plan_obj_v2.asp
View File

@@ -73,14 +73,13 @@ var show_park = getFParamInt("park", 0)==1;
var disc_key = getQParamInt("disc", -1);
var objcatmulti = getFParamIntArray("objcatmulti", []);
var act_key_arr = getFParamKeyArray("act", []);
var act_key = getFParamInt("act", -1);
// discard activity filter in case of filter on objcatmulti
if (act_key_arr.length > 0 && objcatmulti.length == 0)
if (act_key > 0 && objcatmulti.length == 0)
{ // Voeg de disciplines van de activiteit aan de objectcatalogus toe.
var sql = "SELECT res_discipline_key"
+ " FROM res_activiteitdiscipline"
+ " WHERE res_activiteit_key IN (" + act_key_arr.join(", ") + ")";
+ " WHERE res_activiteit_key = "+act_key;
var oRs = Oracle.Execute(sql);
while (!oRs.eof)
{
@@ -446,7 +445,7 @@ IFRAMER_HEADER(L("lcl_res_frame_voorziening"), buttons);
+ "?restype=CV"
+ "&res_deel_key=" + res_deel_key
+ "&res_van=" + res_van.getTime()
+ (activiteit != -1 ? "&act_key_arr=" + activiteit : "")
+ (activiteit != -1 ? "&activiteit_key=" + activiteit : "")
+ "&urole="+urole;
FcltMgr.openDetail(cmd);
}

2
APPL/RES/res_show_rsv_ruimte.asp
View File

@@ -754,7 +754,7 @@ FCLTHeader.Requires({plugins: ["jQuery"]})
generateFlexKenmerkBlock( { urole: urole
, res_key: rrr.reservering_key
, act_key: rrr.activiteit_key
, act_key_arr: [rrr.activiteit_key]
, rsv_ruimte_key: rrr.rsv_ruimte_key
, reado: true
}