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

AKZA#36416 Kan catering dat buiten de meetingstijd valt ook geblokt worden?

Browse Source 
svn path=/Website/trunk/; revision=30646
This commit is contained in:
Erik Groener
2016-09-08 12:00:31 +00:00
parent 2bacb4f9f9
commit f5b4a2eeff
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/RES/res_edit_objcat_save.asp
View File

@@ -401,7 +401,6 @@ var cnt;
reserved = 0; reserved = 0;
// delete and update are based on the list of previously reserved objects // 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++) for (i = 0; i < r_a_key.length; i++)
{ {
art_rsv_key = r_a_key[i].key + "_" + r_a_key[i].rsv_key; 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 new_date: jsDate
}); });
trackarray.push(updatetrack); trackarray.push(updatetrack);
// Valt er een artikel buiten de reserveringstijd?
if (jsDate < res_van || jsDate > res_tot)
facility_bound = true;
} }
reserved++; reserved++;
@@ -584,9 +580,6 @@ doneParams = { hasAnyCV: hasAnyCV,
warning: warning, warning: warning,
success: true success: true
}; };
if (facility_bound)
doneParams.toaster = L("lcl_res_facility_bound");
Response.Write(JSON.stringify(doneParams)); Response.Write(JSON.stringify(doneParams));
Response.End; Response.End;
%> %>

7
APPL/RES/res_plan.js
View File

@@ -206,9 +206,16 @@ function checkArtikelen(starttime_room, endtime_room)
allGood = false; allGood = false;
return; return;
} }
var jsDate = res_van.midnight(); var jsDate = res_van.midnight();
jsDate.setHours(hh); jsDate.setHours(hh);
jsDate.setMinutes(mm); jsDate.setMinutes(mm);
if (jsDate < res_van || jsDate > res_tot)
{
alert(L("lcl_res_facility_bound"));
}
if (jsDate < thisCatExpire && !backo && !fronto) if (jsDate < thisCatExpire && !backo && !fronto)
{ {
alert(L("lcl_res_lastmin")); alert(L("lcl_res_lastmin"));