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

UWVA#31991: einddatum bij reserveerbare objecten.

Browse Source 
svn path=/Website/trunk/; revision=25456
This commit is contained in:
Maykel Geerdink
2015-06-15 12:59:25 +00:00
parent 1a74b8ed25
commit 903b41242c
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
APPL/RES/res.inc
View File

@@ -1788,18 +1788,18 @@ function get_res_deel_sql (params)
params.res_ruimte_key = params.res_ruimte_key || -1;
if (params.res_van)
var res_van = new Date(params.res_van);
var res_tot = new Date(params.res_tot);
else
var res_van = new Date();
var res_tot = new Date();
if (params.rsv_ruimte_key > 0)
{
sql = "SELECT res_rsv_ruimte_van"
sql = "SELECT res_rsv_ruimte_tot"
+ " FROM res_rsv_ruimte"
+ " WHERE res_rsv_ruimte_key = " + params.rsv_ruimte_key;
oRs = Oracle.Execute(sql);
var res_van = new Date(oRs("res_rsv_ruimte_van").Value);
var res_tot = new Date(oRs("res_rsv_ruimte_tot").Value);
}
var ora_date1 = res_van.beginToSQL();
var ora_date2 = res_tot.endToSQL();
var sql1 = "SELECT " + params.select_fields
+ " FROM ins_deel d"
@@ -1851,7 +1851,7 @@ function get_res_deel_sql (params)
+ " OR ds.alg_ruimte_key = scope.alg_ruimte_key"
+ " OR ds.res_deel_alg_level = -1)"
+ " AND r.res_deel_key = ds.res_deel_key"
+ " AND (r.res_deel_vervaldatum IS NULL OR r.res_deel_vervaldatum > " + ora_date1 + ")"
+ " AND (r.res_deel_vervaldatum IS NULL OR r.res_deel_vervaldatum > " + ora_date2 + ")"
if (params.res_ruimte_key < 0 && (params.alg_ruimte_key < 0))
{ // Locatie scope of nog groter. Rechten ook meenemen

2
APPL/RES/res_edit_objcat.asp
View File

@@ -219,7 +219,7 @@ var new_item_key = 0; // Globaal
select_fields : " count(*) ",
sdisc : "dis.ins_discipline_key",
autfunction : autfunction,
res_van : res_van
res_tot : res_tot
};
var sql_aantal = " ( " + get_res_deel_sql(params) + ") aantal ";
sql= "SELECT dis.ins_discipline_key,"

2
APPL/RES/res_plan_obj.inc
View File

@@ -234,7 +234,7 @@ function make_plan_obj(disc_key, res_van, res_tot, params)
sdisc : disc_key,
group_by: group_by,
autfunction : autfunction,
res_van: res_van
res_tot: res_tot
});
oRs = Oracle.Execute(sql1);

2
APPL/RES/res_search_plan_obj.asp
View File

@@ -198,7 +198,7 @@ IFRAMER_HEADER(L("lcl_res_frame_voorziening"), buttons);
act_key : params.act_key,
sdisc : "dis.ins_discipline_key",
autfunction : autfunction,
res_van : params.res_van
res_tot : params.res_tot
};
var sql_aantal = " ( " + get_res_deel_sql(deel_params) + ") aantal ";