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

DLLG#90075 tracking van reserverstijds-verschuivingen in lokale tijdszone (vd plaats vd reservering)

Browse Source 
svn path=/Website/branches/v2025.4/; revision=70915
This commit is contained in:
Koen Reefman
2025-11-12 14:19:27 +00:00
parent ab6674f815
commit 7443481006
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/RES/res_edit_rsv_ruimte_save.asp
View File

@@ -522,8 +522,8 @@ if (master_act_key > 0) // we zouden kunnen controleren of master_key wijst naar
if (!rsv_ruimte_externnr || (S("msgraph_sync_level") & 6)) // Begin- en enddatum van reserveringen die extern (via Exchange) zijn gemaakt niet aanpassen, tenzij ReadWrite koppeling
{
fields.push({ dbs: "res_rsv_ruimte_van", typ: "datetime", val: server_date_from, track: (restype=="CV"? L("lcl_res_starttime_CV") : L("lcl_res_starttime")) });
fields.push({ dbs: "res_rsv_ruimte_tot", typ: "datetime", val: server_date_to, track: (restype=="CV"? L("lcl_res_endtime_CV") : L("lcl_res_endtime")) });
fields.push({ dbs: "res_rsv_ruimte_van", typ: "datetime", val: server_date_from, track: (restype=="CV"? L("lcl_res_starttime_CV") : L("lcl_res_starttime")), track_in_tz: local_tz });
fields.push({ dbs: "res_rsv_ruimte_tot", typ: "datetime", val: server_date_to, track: (restype=="CV"? L("lcl_res_endtime_CV") : L("lcl_res_endtime")), track_in_tz: local_tz });
fields.push({ dbs: "res_rsv_ruimte_omschrijving", typ: "varchar", frm: "descript", track: L("lcl_descr") });
fields.push({ dbs: "res_rsv_ruimte_opmerking", typ: "varchar", frm: "opmerk", track: L("lcl_remark"), len: 2000 });
}

4
APPL/RES/res_rsv_deel_by_placetime.inc
View File

@@ -662,9 +662,9 @@ rdpt = {
dagcapaciteitCalc: function _dagcapaciteitCalc(date, dagcapaciteit, act_key, res_disc_key_arr, geb_key)
{
var begintijd = new Date();
begintijd.setHours(23, 59);
begintijd.setHours(23, 59, 0);
var eindtijd = new Date();
eindtijd.setHours(0, 0);
eindtijd.setHours(0, 0, 0);
var btBegintijd;
var btEindtijd;
var btArr;

29
APPL/Shared/save2db.inc
View File

@@ -205,24 +205,33 @@ function buildTrackText(typ, oldjsval, newjsval, params)
}
else
{
if (typ == "datetime" || typ == "date" || typ == "time") {
var stringifyParams = {};
if (params.track_in_tz) {
oldjsval = convertToLocalTime(oldjsval, params.track_in_tz);
newjsval = convertToLocalTime(newjsval, params.track_in_tz);
stringifyParams.isLocal = true;
}
}
switch (typ)
{
case "datetime":
{
var oldtxt = toDateTimeString(oldjsval);
var newtxt = toDateTimeString(newjsval);
var oldtxt = toDateTimeString(oldjsval, stringifyParams);
var newtxt = toDateTimeString(newjsval, stringifyParams);
break;
}
case "date":
{
var oldtxt = toDateString(oldjsval);
var newtxt = toDateString(newjsval);
var oldtxt = toDateString(oldjsval, stringifyParams);
var newtxt = toDateString(newjsval, stringifyParams);
break;
}
case "time":
{
var oldtxt = toTimeString(oldjsval);
var newtxt = toTimeString(newjsval);
var oldtxt = toTimeString(oldjsval, stringifyParams);
var newtxt = toTimeString(newjsval, stringifyParams);
break;
}
case "key": // hash foreign moet ook gedefinieerd zijn
@@ -525,10 +534,14 @@ function buildTrackingUpdate(tabel, where, xfields, params)
var lbl = tupel.field.track;
// if (params.dialect_key)
// lbl = lcl.x(tupel.field.track, params.dialect_key);
var trackParams = { foreign: tupel.field.foreign, oldjsvals: oldjsvals };
if ("track_in_tz" in tupel.field) {
trackParams.track_in_tz = tupel.field.track_in_tz;
}
if (tupel.field.buildTrackText)
var tracktxt = tupel.field.buildTrackText(tupel.field.typ, oldjsval, tupel.jsval, { foreign: tupel.field.foreign, oldjsvals: oldjsvals } );
var tracktxt = tupel.field.buildTrackText(tupel.field.typ, oldjsval, tupel.jsval, trackParams);
else
var tracktxt = lbl + ": " + buildTrackText(tupel.field.typ, oldjsval, tupel.jsval, { foreign: tupel.field.foreign, oldjsvals: oldjsvals } );
var tracktxt = lbl + ": " + buildTrackText(tupel.field.typ, oldjsval, tupel.jsval, trackParams);
trackarray.push( (params.includeName ? params.includeName + "; " : "") + tracktxt);
}
oldjsvals[tupel.field.dbs] = oldjsval;