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

UWVA#52356 bugfix; als res_activiteit_posttime == 0 dan ar[ci].act_post_time == null, dat leverde errors op

Browse Source 
svn path=/Website/branches/v2017.3/; revision=37169
This commit is contained in:
Koen Reefman
2018-02-23 13:43:49 +00:00
parent 122a5a4b9d
commit 8b5508f695
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/RES/res_plan_room.inc
View File

@@ -24,8 +24,6 @@ function set_will_fit(plan_rooms_info, plan_bezet_info, params)
var is_nofit = false;
var room = plan_rooms_info[i_room];
room.post_time = Math.max(room.prepost_time, params.act_post_time);
var ar = plan_bezet_info[room.res_ruimte_key];
var df = params.res_van.getHours() + params.res_van.getMinutes()/60;
@@ -50,7 +48,8 @@ function set_will_fit(plan_rooms_info, plan_bezet_info, params)
else
{
// deze_room.pre_time = Max van deze_room.prepost_time en geplande_room.activity.post_time
room.pre_time = (ar[ci].act_post_time ? Math.max(room.prepost_time, ar[ci].act_post_time) : room.prepost_time);
room.pre_time = (ar[ci].act_post_time ? Math.max(room.prepost_time, ar[ci].act_post_time) : room.prepost_time);
room.post_time = Math.max(room.prepost_time, params.act_post_time);
if (params.res_van.getTime() - room.pre_time *60*60*1000 < ar[ci].res_tot.getTime()
&& params.res_tot.getTime() + room.post_time*60*60*1000 > ar[ci].res_van.getTime())
@@ -197,7 +196,7 @@ function make_plan_regel(room, ar, params, nr_days, hour_px)
var theStyleRight = "";
// Perhaps cleaning time, alleen optie en definitief
// room.post_time >= room.prepost_time (always)
var this_post_time = Math.max(room.prepost_time, ar[ci].act_post_time);
var this_post_time = Math.max(room.prepost_time, (ar[ci].act_post_time || 0));
if (this_post_time && (ar[ci].fo_status == 1 || ar[ci].fo_status == 2))
{
theClass += " res_cleaning";

2
APPL/RES/res_search_plan_room.asp
View File

@@ -56,7 +56,7 @@ if (act_key > 0)
{ // Voeg de disciplines van de activiteit aan de ruimtecatalogus toe.
var sql = "SELECT res_discipline_key"
+ " FROM res_activiteitdiscipline"
+ " WHERE res_activiteit_key = "+act_key;
+ " WHERE res_activiteit_key = " + act_key;
var oRs = Oracle.Execute(sql);
while (!oRs.eof)
{