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

KEMP#35414 In planbordje beschikbaarheid ook schoonmaaktijd meerekenen

Browse Source 
svn path=/Website/trunk/; revision=28214
This commit is contained in:
Jos Groot Lipman
2016-02-18 13:05:13 +00:00
parent 8a96cbf3d3
commit 3fc7123068
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/RES/res_plan_obj.inc
View File

@@ -25,7 +25,7 @@ FCLTHeader.Requires({ js: ["./res_plan.js", "date.js"] });
function make_plan_obj(disc_key, res_van, res_tot, params)
{
mkDiv = function (theClass, h_start, h_end, theClick, theMouse, theOther, pre_post, flag_status)
mkDiv = function (theClass, h_start, h_end, theClick, theMouse, theOther, prepost_time, flag_status)
{
var div;
var overleft="";
@@ -248,7 +248,7 @@ function make_plan_obj(disc_key, res_van, res_tot, params)
res_deel_eenheid = oRs("res_deel_eenheid").Value;
var res_deel_opm2 = oRs("res_deel_opmerking").value;
var prepost_time = oRs("res_disc_params_preposttime").Value;
var prepost_time = oRs("res_disc_params_preposttime").Value||0;
var ins_deel_key = oRs("ins_deel_key").value;
var showLendOut = false;
@@ -298,7 +298,8 @@ function make_plan_obj(disc_key, res_van, res_tot, params)
}
else
{
if (res_van < ar[ci].res_tot && res_tot > ar[ci].res_van)
if (res_van.getTime() - prepost_time*60*60*1000 < ar[ci].res_tot.getTime()
&& res_tot.getTime() + prepost_time*60*60*1000 > ar[ci].res_van.getTime())
is_nofit = true; // Overlap!
}
}