From f5b4a2eeff5d6720cc12059972aec39a5cf3762f Mon Sep 17 00:00:00 2001 From: Erik Groener Date: Thu, 8 Sep 2016 12:00:31 +0000 Subject: [PATCH] AKZA#36416 Kan catering dat buiten de meetingstijd valt ook geblokt worden? svn path=/Website/trunk/; revision=30646 --- APPL/RES/res_edit_objcat_save.asp | 7 ------- APPL/RES/res_plan.js | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/APPL/RES/res_edit_objcat_save.asp b/APPL/RES/res_edit_objcat_save.asp index c49c32ad78..c4163851ef 100644 --- a/APPL/RES/res_edit_objcat_save.asp +++ b/APPL/RES/res_edit_objcat_save.asp @@ -401,7 +401,6 @@ var cnt; reserved = 0; // delete and update are based on the list of previously reserved objects -var facility_bound = false; for (i = 0; i < r_a_key.length; i++) { art_rsv_key = r_a_key[i].key + "_" + r_a_key[i].rsv_key; @@ -475,9 +474,6 @@ for (i = 0; i < r_a_key.length; i++) new_date: jsDate }); trackarray.push(updatetrack); - // Valt er een artikel buiten de reserveringstijd? - if (jsDate < res_van || jsDate > res_tot) - facility_bound = true; } reserved++; @@ -584,9 +580,6 @@ doneParams = { hasAnyCV: hasAnyCV, warning: warning, success: true }; -if (facility_bound) - doneParams.toaster = L("lcl_res_facility_bound"); - Response.Write(JSON.stringify(doneParams)); Response.End; %> diff --git a/APPL/RES/res_plan.js b/APPL/RES/res_plan.js index 7310aa3583..d79b22937b 100644 --- a/APPL/RES/res_plan.js +++ b/APPL/RES/res_plan.js @@ -206,9 +206,16 @@ function checkArtikelen(starttime_room, endtime_room) allGood = false; return; } + var jsDate = res_van.midnight(); jsDate.setHours(hh); jsDate.setMinutes(mm); + + if (jsDate < res_van || jsDate > res_tot) + { + alert(L("lcl_res_facility_bound")); + } + if (jsDate < thisCatExpire && !backo && !fronto) { alert(L("lcl_res_lastmin"));