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

UWVA#38222 Locatie met louter vervallen gebouwen toch te selecteren

Browse Source 
svn path=/Website/branches/v2016.2/; revision=31381
This commit is contained in:
Erik Groener
2016-11-08 08:20:54 +00:00
parent 7c4848a594
commit 59468d9e0e
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
APPL/BES/bes_edit_bestelling.asp
View File

@@ -669,22 +669,22 @@ else // nieuwe bestelling. Defaults bepalen
if (getQParamInt("adres_key", -1) > 0)
aflever_readonly = true;
sql = "SELECT m.mld_adres_key"
+ ", m.mld_adres_naam, m.mld_adres_upper"
+ (aflever_readonly? " FROM mld_adres m" : " FROM mld_v_afleveradres m")
sql = "SELECT l.mld_adres_key"
+ ", l.mld_adres_naam, l.mld_adres_upper"
+ (aflever_readonly? " FROM mld_adres l" : " FROM mld_v_afleveradres l")
+ " WHERE 1=1"
+ getFiltClauseLocatie("EXP");
+ getFiltClauseLocatie("EXP").where;
+ (ALGreadlevel >= 0
? " AND m.alg_locatie_key IN (SELECT alg_locatie_key FROM fac_v_my_locations "
? " AND l.alg_locatie_key IN (SELECT alg_locatie_key FROM fac_v_my_locations "
+ " WHERE prs_perslid_key = " + user_key
+ " AND niveau = " + ALGreadlevel + ")"
: "")
+ (bes_bestelling.bes_key > 0 // Huidige waarde ook toevoegen aan lijst
? " UNION"
+ " SELECT m.mld_adres_key"
+ ", m.mld_adres_naam, m.mld_adres_upper"
+ " FROM mld_v_afleveradres m"
+ " WHERE m.mld_adres_key = " + bes_bestelling.mld_adres_key
+ " SELECT l.mld_adres_key"
+ ", l.mld_adres_naam, l.mld_adres_upper"
+ " FROM mld_v_afleveradres l"
+ " WHERE l.mld_adres_key = " + bes_bestelling.mld_adres_key
: "")
+ " ORDER BY mld_adres_upper";
FCLTselector("deliveryAddr", sql,

2
APPL/PRS/prs_edit_dienstlocs.asp
View File

@@ -153,7 +153,7 @@ var dienst_key = getQParamInt("dienst_key"); // bedrijf key
+ " , 'L' locorgeb"
+ " FROM alg_v_aanweziglocatie l"
+ " WHERE 1=1"
+ getFiltClauseLocatie("EXP");
+ getFiltClauseLocatie("EXP").where;
FCLTselector("locPossible", loc_sql + " MINUS " + existing_loc_sql + " ORDER BY 2",
{ startmulti: true,