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

UWVA#37540 RES: per reserveerbare ruimte lunchsluitingstijden kunnen opvoeren

Browse Source 
svn path=/Website/trunk/; revision=31960
This commit is contained in:
Erik Groener
2016-12-13 15:57:13 +00:00
parent 7c4b2d7dd3
commit b42fe85ee5
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
APPL/RES/res.inc
View File

@@ -1507,9 +1507,30 @@ res = {
? " AND res_ruimte_key_1=" + params.res_ruimte_key
: "")
+ " AND res_ruimte_key_1 IN (SELECT res_ruimte_key FROM (" + room_sql + "))"
+ " ORDER BY res_ruimte_key_1"
+ " , (res_rsv_ruimte_tot - res_rsv_ruimte_van) DESC" // langste reserveringen eerst/onderop
+ " , rv.res_rsv_ruimte_dirtlevel ASC"
// Middag blokkades toevoegen
+ " UNION "
+ "SELECT " + params.res_van.beginToSQL() + " + (res_ruimte_begintijdblok/24)"
+ " , " + params.res_tot.beginToSQL() + " + (res_ruimte_eindtijdblok/24)"
+ " , 0"
+ " , res_ruimte_key"
+ " , 3"
+ " , null, null, null, null"
+ " , res_ruimte_key"
+ " , null, null, null"
+ " , 0, 0"
+ " FROM (" + room_sql + ")"
+ " WHERE res_ruimte_begintijdblok IS NOT NULL"
+ " AND res_ruimte_eindtijdblok IS NOT NULL"
+ " AND ( " + params.res_van.beginToSQL() + " + (res_ruimte_begintijdblok/24) > " + params.res_tot.toSQL()
+ " OR " + params.res_tot.beginToSQL() + " + (res_ruimte_eindtijdblok/24) < " + params.res_van.toSQL()
+ " )";
sql = "SELECT *"
+ " FROM (" + sql + ")"
// Op volgorde zetten
+ " ORDER BY res_ruimte_key_1"
+ " , (res_rsv_ruimte_tot - res_rsv_ruimte_van) DESC" // langste reserveringen eerst/onderop
+ " , res_rsv_ruimte_dirtlevel ASC"
var existing_res = {};
var nnres = 0;