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

FCLT#57181 Default begintijd van een reservering mee kunnen geven als parameter

Browse Source 
svn path=/Website/branches/v2019.1/; revision=41878
This commit is contained in:
Alex Tiehuis
2019-04-01 08:51:28 +00:00
parent d3f936fd0c
commit aad2f2f41b
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
APPL/RES/res_edit_rsv_ruimte.asp
View File

@@ -41,7 +41,8 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
// Required parameters
var urole = getQParamSafe("urole");
var rsv_ruimte_key = getQParamInt("rsv_ruimte_key", -1);
// pre-selected timefrom value
var timeFrom = getQParamFloat("timefrom", S("res_t1"));
var autfunction = { fe: "WEB_RESUSE", bo: "WEB_RESBOF", fo: "WEB_RESFOF" } [urole];
var authparams = user.checkAutorisation(autfunction);
@@ -295,10 +296,9 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
}
else
{
rrr.rsv_ruimte_van = new Date().setFloatHours(S("res_t1"), S("res_h"));
rrr.rsv_ruimte_van = new Date().setFloatHours(timeFrom, S("res_h"));
rrr.rsv_ruimte_tot = rrr.rsv_ruimte_van.addFloatHours(S("res_dur"), S("res_h"));
}
if (restype == "CV" && rrr.host_key == user_key && rrr.alg_ruimte_key == -1)
{
rrr.alg_locatie_key = user.alg_locatie_key();
@@ -392,6 +392,21 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
}
}
//else wordt wel de eigen kamer ingevuld die hiervoor al bepaald is.
// find timefrom through item
var sqlRa = "SELECT res_artikel_begintijd"
+ " FROM res_artikel ra"
+ " WHERE ra.res_artikel_key = " + res_artikel_key;
var oRsRa = Oracle.Execute(sqlRa);
if (!oRsRa.Eof)
{
if (oRsRa(0).Value > timeFrom)
{
timeFrom = oRsRa(0).Value;
rrr.rsv_ruimte_van = new Date().setFloatHours(timeFrom, S("res_h"));
rrr.rsv_ruimte_tot = rrr.rsv_ruimte_van.addFloatHours(S("res_dur"), S("res_h"));
}
}
oRsRa.Close();
}
rrr.flex_defaults = {};
@@ -1024,7 +1039,8 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
<% if (rsv_ruimte_key < 0) { /* alleen bij nieuwe */ %>
var start = new Date(parseInt($('#date_from').val()));
var today = new Date(Math.floor(new Date().getTime() / 1000) * 1000);
if (start.getDate() === today.getDate() &&
if ($("#time_from_date_from").val() < toTimeString(today) &&
start.getDate() === today.getDate() &&
start.getMonth() === today.getMonth() &&
start.getFullYear() === today.getFullYear())
{ // entered date is today -> set time to now
@@ -1232,7 +1248,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
initEmpty: (rsv_ruimte_key<0 && rsv_copy_key<0 && !res_van),
timeField: true,
timeStep : S("res_h")*60,
startTime: S("res_t1"),
startTime: timeFrom,
calendars: (rsv_ruimte_key<0?2:1),
endTime : S("res_t2"),
noConvert: true,
@@ -1346,7 +1362,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
maxFuture: ((urole=="fe"&&S("res_fe_reservering_limiet")>0)?S("res_fe_reservering_limiet"):S("res_reservering_limiet")),
timeField: true,
timeStep : S("res_h")*60,
startTime: S("res_t1"),
startTime: timeFrom,
endTime : S("res_t2"),
noConvert: true,
volgnr : 2,

2
APPL/RES/res_reservering.asp
View File

@@ -50,7 +50,7 @@ if (verynew)
// flex_defaults pacta, bijv: bsn=12345678&plaats=Enschede&postcode=1234AB
transitParam += buildTransitParam(["res_deel_key", "res_artikel_key", "res_ruimte_key", "disc_key", "host_key", "activiteit_key",
"res_van", "res_tot", "ab_mode", "alg_ruimte_key",
"flex_defaults", "rsv_copy_key","rsv_is_serie","pool",
"flex_defaults", "rsv_copy_key","rsv_is_serie","pool","timefrom",
"bez_omschr", // vanuit Outlook
"bez_naam", "bez_bedrijf"]); // alleen eerste naam/bedrijf