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

HSLE#39254 Catering - verbruiksartikelen - autorisatie

Browse Source 
svn path=/Website/trunk/; revision=38199
This commit is contained in:
Erik Groener
2018-06-14 09:34:41 +00:00
parent 05d6bebda2
commit 83ee9b0c89
6 changed files with 66 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/RES/res_edit_rsv_ruimte.asp
View File

@@ -1456,7 +1456,8 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
readonly: reado_rsv_ruimte || fe_lastminute || getQParamInt("alg_ruimte_key", -1) > 0 || reado_alg,
readonlylevel: reado_level,
no_table: true,
required: true
required: true,
scope: (S("res_fo_catering_scopeless") && (fronto || backo) ? 0 : 1)
});
}

3
APPL/Shared/Suggest/SuggestGebouwTerrein.asp
View File

@@ -34,8 +34,9 @@ var filtcode = getQParam("filtcode", "");
var terrein = getQParamInt("terrein", 0) == 1;
var act_key = getQParamInt("act_key", -1);
var stdm_key = getQParamInt("stdm_key", -1);
var scope = getQParamInt("scope", 0);
var params = { stdm_key: stdm_key, terrein: terrein };
var params = { stdm_key: stdm_key, terrein: terrein, scope: scope };
if (filtcode == "PRK")
{
var date_from = getQParamDate("date_from", new Date());

3
APPL/Shared/Suggest/SuggestLocatie.asp
View File

@@ -32,9 +32,10 @@ var filtcode = getQParam("filtcode", "");
var extracode = getQParam("extraCode", "");
var act_key = getQParamInt("act_key", -1);
var stdm_key = getQParamInt("stdm_key", -1);
var scope = getQParamInt("scope", 0);
//if (autlevel == 0 && filtcode == 'RESB')
// autlevel = -1;
var params = { act_key: act_key, stdm_key: stdm_key };
var params = { act_key: act_key, stdm_key: stdm_key, scope: scope };
chars = chars.replace(/\*/g,"%");

3
APPL/Shared/Suggest/SuggestVerdieping.asp
View File

@@ -33,8 +33,9 @@ var gebkey = getQParamInt("gebkey", "-1");
var filtcode = getQParam("filtcode", "");
var act_key = getQParamInt("act_key", -1);
var stdm_key = getQParamInt("stdm_key", -1);
var scope = getQParamInt("scope", 0);
var params = { act_key: act_key, stdm_key: stdm_key };
var params = { act_key: act_key, stdm_key: stdm_key, scope:scope };
chars = chars.replace(/\*/g,"%");

79
APPL/Shared/Suggest/plaatsFilter.inc
View File

@@ -652,40 +652,46 @@ function get_res_bezorgfilter(params, level)
else
{
// Alleen catering
var niveau = {alias: "l", field: "alg_district_key"};
switch (level)
if (!params.scope)
{
case 2: niveau = {alias: "l", field: "alg_locatie_key"}; break;
case 3: niveau = {alias: "g", field: "alg_gebouw_key"}; break;
case 4: niveau = {alias: "v", field: "alg_verdieping_key"}; break;
case 5: niveau = {alias: "r", field: "alg_ruimte_key"}; break;
bezorgfilter = "";
}
else
{
var niveau = {alias: "l", field: "alg_district_key"};
switch (level)
{
case 2: niveau = {alias: "l", field: "alg_locatie_key"}; break;
case 3: niveau = {alias: "g", field: "alg_gebouw_key"}; break;
case 4: niveau = {alias: "v", field: "alg_verdieping_key"}; break;
case 5: niveau = {alias: "r", field: "alg_ruimte_key"}; break;
}
bezorgfilter = "AND " + niveau.alias + "." + niveau.field + " IN "
+ "(SELECT aob." + niveau.field
+ " FROM ( SELECT alg_onrgoed_key"
+ " , alg_onrgoed_niveau"
+ " , res_discipline_key"
+ " , res_srtartikel_og_verwijder alg_onrgoed_verwijder"
+ " , 'C' object_type"
+ " FROM res_srtartikel_onrgoed"
+ ") obj"
+ " , res_activiteitdiscipline rad"
+ " , alg_v_onrgoed_boom aob"
+ " , alg_ruimte r"
+ " WHERE rad.res_discipline_key = obj.res_discipline_key"
+ " AND r.alg_ruimte_key = aob.alg_ruimte_key"
+ " AND ( (obj.alg_onrgoed_niveau = 'R' and obj.alg_onrgoed_key = aob.alg_ruimte_key)"
+ " OR (obj.alg_onrgoed_niveau = 'V' and obj.alg_onrgoed_key = aob.alg_verdieping_key)"
+ " OR (obj.alg_onrgoed_niveau = 'G' and obj.alg_onrgoed_key = aob.alg_gebouw_key)"
+ " OR (obj.alg_onrgoed_niveau = 'L' and obj.alg_onrgoed_key = aob.alg_locatie_key)"
+ " OR (obj.alg_onrgoed_niveau = 'D' and obj.alg_onrgoed_key = aob.alg_district_key)"
+ " )"
+ " AND obj.alg_onrgoed_verwijder IS NULL"
+ " AND rad.res_activiteit_key = " + params.act_key
+ ")";
bezorgfilter = "AND " + niveau.alias + "." + niveau.field + " IN "
+ "(SELECT aob." + niveau.field
+ " FROM ( SELECT alg_onrgoed_key"
+ " , alg_onrgoed_niveau"
+ " , res_discipline_key"
+ " , res_srtartikel_og_verwijder alg_onrgoed_verwijder"
+ " , 'C' object_type"
+ " FROM res_srtartikel_onrgoed"
+ ") obj"
+ " , res_activiteitdiscipline rad"
+ " , alg_v_onrgoed_boom aob"
+ " , alg_ruimte r"
+ " WHERE rad.res_discipline_key = obj.res_discipline_key"
+ " AND r.alg_ruimte_key = aob.alg_ruimte_key"
+ " AND ( (obj.alg_onrgoed_niveau = 'R' and obj.alg_onrgoed_key = aob.alg_ruimte_key)"
+ " OR (obj.alg_onrgoed_niveau = 'V' and obj.alg_onrgoed_key = aob.alg_verdieping_key)"
+ " OR (obj.alg_onrgoed_niveau = 'G' and obj.alg_onrgoed_key = aob.alg_gebouw_key)"
+ " OR (obj.alg_onrgoed_niveau = 'L' and obj.alg_onrgoed_key = aob.alg_locatie_key)"
+ " OR (obj.alg_onrgoed_niveau = 'D' and obj.alg_onrgoed_key = aob.alg_district_key)"
+ " )"
+ " AND obj.alg_onrgoed_verwijder IS NULL"
+ " AND rad.res_activiteit_key = " + params.act_key
+ ")";
}
}
return " /* get_res_bezorgfilter */ " + bezorgfilter;
}
@@ -757,13 +763,11 @@ function get_loc_scope_act_filter(params, level)
+ " , res_v_aanwezigartikel ra"
// Niet onrgoed_keys aan elkaar gelijk stellen (a.alg_onrgoed_key = og.alg_onroerendgoed_keys).
// Er zijn nog meer regels in de alg_v_allonroerendgoed tabel waarbij alg_onrgoed_key gelijk is aan Gebouw, Verdieping of Ruimte key.
+ " WHERE ((a.alg_onrgoed_niveau = 'G'"
+ " AND a.alg_onrgoed_key = og.alg_gebouw_key)"
+ " OR (a.alg_onrgoed_niveau = 'V'"
+ " AND a.alg_onrgoed_key = og.alg_verdieping_key)"
+ " OR (a.alg_onrgoed_niveau = 'R'"
+ " AND a.alg_onrgoed_key = og.alg_ruimte_key))"
+ " AND a.res_discipline_key = ra.res_discipline_key"
+ " WHERE a.res_discipline_key = ra.res_discipline_key"
+ " AND ( (a.alg_onrgoed_niveau = 'G' AND a.alg_onrgoed_key = og.alg_gebouw_key)"
+ " OR (a.alg_onrgoed_niveau = 'V' AND a.alg_onrgoed_key = og.alg_verdieping_key)"
+ " OR (a.alg_onrgoed_niveau = 'R' AND a.alg_onrgoed_key = og.alg_ruimte_key)"
+ " )"
+ " AND SYSDATE BETWEEN COALESCE(ra.res_artikel_ingangsdatum,SYSDATE)"
+ " AND COALESCE(ra.res_artikel_vervaldatum, SYSDATE)" // Zijn er wel geldige verbruiksartikelen onder deze catalogus?
+ " AND a.alg_onrgoed_niveau IN ('G', 'V', 'R')"
@@ -811,7 +815,6 @@ function get_loc_scope_act_filter(params, level)
+ " WHERE res_activiteit_key = " + params.act_key + ")"
: "")
+ ") scope";
switch (level)
{
case 2: loc_scope_act_filter.where = " AND l.alg_locatie_key = scope.alg_locatie_key";

23
APPL/Shared/plaatsselector.inc
View File

@@ -328,7 +328,8 @@ function FCLTplaatsselector(alglevel, params)
{ objectName: "sgReg<%=idadd%>",
sgType: "<%=sgType%>",
queryField: $("#regio<%=idadd%>")[0],
queryUrl: "<%=rooturl%>/appl/shared/suggest/SuggestRegio.asp?autlevel=<%=plevel%><%=params.filtercode? '&filtcode=' + params.filtercode : ''%>",
queryUrl: "<%=rooturl%>/appl/shared/suggest/SuggestRegio.asp?autlevel=<%=plevel%>"
+ "<%=params.filtercode? '&filtcode=' + params.filtercode : ''%>",
icon: "fa-globe",
initKey: <%=pkey%>,
multitoggle: <%=multiToggle%> >= 0,
@@ -387,7 +388,8 @@ function FCLTplaatsselector(alglevel, params)
{ objectName: "sgDis<%=idadd%>",
sgType: "<%=sgType%>",
queryField: $("#district<%=idadd%>")[0],
queryUrl: "<%=rooturl%>/appl/shared/suggest/SuggestDistrict.asp?autlevel=<%=plevel%><%=params.filtercode? '&filtcode=' + params.filtercode : ''%>",
queryUrl: "<%=rooturl%>/appl/shared/suggest/SuggestDistrict.asp?autlevel=<%=plevel%>"
+ "<%=params.filtercode? '&filtcode=' + params.filtercode : ''%>",
icon: "fa-map-o",
<%= _getUrlAdd(1) %>
initKey: <%=pkey%>,
@@ -458,7 +460,9 @@ function FCLTplaatsselector(alglevel, params)
{ objectName: "sgLoc<%=idadd%>",
sgType: "<%=sgType%>",
queryField: $("#locatie<%=idadd%>")[0],
queryUrl: "<%=rooturl%>/appl/shared/suggest/SuggestLocatie.asp?autlevel=<%=plevel%><%=params.filtercode? '&filtcode=' + params.filtercode : ''%>",
queryUrl: "<%=rooturl%>/appl/shared/suggest/SuggestLocatie.asp?autlevel=<%=plevel%>"
+ "<%=params.filtercode? '&filtcode=' + params.filtercode : ''%>"
+ "<%=params.scope? '&scope=' + params.scope : ''%>",
icon: "fa-location-arrow",
<%= _getUrlAdd(2) %>
initKey: <%=pkey%>,
@@ -545,7 +549,10 @@ function FCLTplaatsselector(alglevel, params)
{ objectName: "sgBld<%=idadd%>",
sgType: "<%=sgType%>",
queryField: $("#gebouw<%=idadd%>")[0],
queryUrl: "<%=rooturl%>/appl/shared/suggest/SuggestGebouwTerrein.asp?autlevel=<%=plevel%><%=params.filtercode? '&filtcode=' + params.filtercode : ''%><%=params.terrein? '&terrein=1' : ''%>",
queryUrl: "<%=rooturl%>/appl/shared/suggest/SuggestGebouwTerrein.asp?autlevel=<%=plevel%>"
+ "<%=params.filtercode? '&filtcode=' + params.filtercode : ''%>"
+ "<%=params.terrein? '&terrein=1' : ''%>"
+ "<%=params.scope? '&scope=' + params.scope : ''%>",
icon: "fa-building",
<%= _getUrlAdd(3) %>
initKey: <%=pkey%>,
@@ -620,7 +627,9 @@ function FCLTplaatsselector(alglevel, params)
{ objectName: "sgFlr<%=idadd%>",
sgType: "<%=sgType%>",
queryField: $("#verdieping<%=idadd%>")[0],
queryUrl: "<%=rooturl%>/appl/shared/suggest/Suggestverdieping.asp?autlevel=<%=plevel%><%=params.filtercode? '&filtcode=' + params.filtercode : ''%>",
queryUrl: "<%=rooturl%>/appl/shared/suggest/Suggestverdieping.asp?autlevel=<%=plevel%>"
+ "<%=params.filtercode? '&filtcode=' + params.filtercode : ''%>"
+ "<%=params.scope? '&scope=' + params.scope : ''%>",
icon: "fa-th-list fa-flip-horizontal",
<%= _getUrlAdd(4) %>
initKey: <%=pkey%>,
@@ -791,7 +800,9 @@ function FCLTplaatsselector(alglevel, params)
{ objectName: "sgWpl<%=idadd%>",
sgType: "<%=sgType%>",
queryField: $("#werkplek<%=idadd%>")[0],
queryUrl: "<%=rooturl%>/appl/shared/suggest/SuggestWerkplek.asp?autlevel=<%=plevel%><%=params.filtercode? '&filtcode=' + params.filtercode : ''%><%=params.showvirtueel? '&showvirtueel=1' : ''%>",
queryUrl: "<%=rooturl%>/appl/shared/suggest/SuggestWerkplek.asp?autlevel=<%=plevel%>"
+ "<%=params.filtercode? '&filtcode=' + params.filtercode : ''%>"
+ "<%=params.showvirtueel? '&showvirtueel=1' : ''%>",
icon: "fa-map-pin",
<%= _getUrlAdd(6) %>
initKey: <%=pkey%>,