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

ASTE#37915 Setting "fac_server_timezone" toegevoegd, timezone editable gemaakt bij persoonsgegevens, date.js aangepast

Browse Source 
svn path=/Website/trunk/; revision=33309
This commit is contained in:
Koen Reefman
2017-03-29 12:19:35 +00:00
parent 56f8b5c224
commit bd0a016bda
7 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/Localscripts/date.js
View File

@@ -208,8 +208,8 @@ function cal_checkVolgnr(fieldId, volgnr)
// Indien veld Kx+i wel een tijdsveld heeft, dan eigen tijd behouden.
var value = fromdate.midnight().getTime()
+ ($("#time_from_" + calArray[i].id).length > 0 && $("#time_from_" + calArray[i].id).val() != "" // Heeft veld Kx+i een tijdsveld en is die niet leeg?
? timetoms // Tijdsveld is aanwezig en niet leeg. Dan kan ik met getTime() de tijd ophalen.
: 0) // Tijdsveld is niet aanwezig. Dan nemen we voor de tijd 0.
? timetoms // Tijdsveld is aanwezig en niet leeg. Dan kan ik met getTime() de tijd ophalen.
: 1000*(24*60*60-1)) // Tijdsveld is niet aanwezig. Dan nemen we voor de tijd 23:59:59 (was eerst 0)
$("#" + calArray[i].id).val(value);
}
}

6
APPL/MLD/opdr_uren_list.inc
View File

@@ -90,10 +90,10 @@ function opdr_uren_list (pautfunction, params)
// Queries vaak apart gedefinieerd omdat anders de outer-join syntax niet werd geaccepteerd
// Alle (recente) mogelijke weken
var weekSQL = "SELECT TO_CHAR ("+datefrom.toSQL()+" - 1 + 7*LEVEL, 'IYYY-IW') week,"
+ " TRUNC ("+datefrom.toSQL()+" - 1 + 7*LEVEL, 'IW') startdatum"
var weekSQL = "SELECT TO_CHAR ("+datefrom.beginToSQL()+" - 1 + 7*LEVEL, 'IYYY-IW') week,"
+ " TRUNC ("+datefrom.beginToSQL()+" - 1 + 7*LEVEL, 'IW') startdatum"
+ " FROM DUAL"
+ " WHERE ("+datefrom.toSQL()+" - 1 + 7*LEVEL) <=" + params.dateto.toSQL()
+ " WHERE ("+datefrom.beginToSQL()+" - 1 + 7*LEVEL) <=" + params.dateto.endToSQL()
+ " CONNECT BY LEVEL <= 13*7";
// Alle mogelijke uitvoerenden (mensen die MLDORD schrijfrechten hebben)

2
APPL/PRS/prs_edit_perslid.asp
View File

@@ -71,7 +71,7 @@ if (prs_key > -1)
+ " prs_perslid_tussenvoegsel, "
+ " fac_profiel_key, "
+ " prs_perslid_email, "
+ " COALESCE(prs_perslid_timezone, 'Europe/Amsterdam') prs_perslid_timezone, "
+ " prs_perslid_timezone, "
+ " prs_perslid_mobiel, "
+ " prs_perslid_ingids "
+ " FROM prs_v_aanwezigperslid p, "

5
APPL/PRS/prs_edit_perslid_save.asp
View File

@@ -105,8 +105,6 @@ if (prs_key > 0)
if (err.friendlyMsg)
abort_with_warning(err.friendlyMsg);
Session("time_zone") = getFParam("prs_tz", "Europe/Amsterdam");
var oldapi = prsUpd.oldjsvals["prs_perslid_apikey"] || "";
var newapi = getFParam("prs_apikey", "")
if (prsauthparams.writetab && oldapi != newapi)
@@ -119,6 +117,9 @@ if (prs_key > 0)
prsUpd.trackarray.push(L("lcl_prs_apiuser")+ " " + txt);
}
if (user.prs_perslid_key() == prs_key)
Session("time_zone") = getFParam("prs_tz", "");
shared.trackaction("PRSUPD", prs_key, (prsUpd.trackarray.length ? prsUpd.trackarray.join("\n") : null) );
}
else

2
APPL/PRS/prs_show_perslid.asp
View File

@@ -52,7 +52,7 @@ var sql = "SELECT p.prs_perslid_key, "
+ " d.prs_bedrijf_key, "
+ " prs_perslid_tussenvoegsel, "
+ " prs_perslid_email, "
+ " COALESCE(prs_perslid_timezone, 'Europe/Amsterdam') prs_perslid_timezone, "
+ " prs_perslid_timezone, "
+ " prs_perslid_mobiel, "
+ " k.prs_kostenplaats_nr, "
+ S("prs_kpn_string") + " kpl, "

9
APPL/Shared/Shared.inc
View File

@@ -720,20 +720,21 @@ function getUserHour(h)
return tempDate.getHours();
}
// User timezone = Session("time_zone")
// Server timezone = S("fac_server_timezone")
function toUserTimeZone(thisDate)
{
return convertTimeZone(thisDate, "Europe/Amsterdam", Session("time_zone"));
return convertTimeZone(thisDate, S("fac_server_timezone"), Session("time_zone"));
}
function toServerTimeZone(thisDate)
{
return convertTimeZone(thisDate, Session("time_zone"), "Europe/Amsterdam");
return convertTimeZone(thisDate, Session("time_zone"), S("fac_server_timezone"));
}
function convertTimeZone(thisDate, fromTZ, toTZ)
{
// var USER = Session("time_zone") || "Europe/London"; // SESSIONTIMEZONE
// var SERVER = "Europe/Amsterdam" // "TO_CHAR (SYSTIMESTAMP, 'tzr')"; temp hardcoded
if (fromTZ == "" || toTZ == "" || fromTZ.toUpperCase() == toTZ.toUpperCase())
return thisDate;

2
APPL/Shared/User.inc
View File

@@ -70,7 +70,7 @@ Perslid.prototype._require_prs_perslid = function __require_prs_perslid()
+ " , prs_perslid_wachtwoord_exp"
+ " , prs_perslid_apikey"
+ " , prs_perslid_terms_version"
+ " , COALESCE(prs_perslid_timezone, 'Europe/Amsterdam') prs_perslid_timezone" // Default/Null == 'Europe/Amsterdam'
+ " , prs_perslid_timezone"
+ " FROM prs_perslid p"
+ " WHERE p.prs_perslid_key = " + this._prs_perslid_key
var oRs = Oracle.Execute(sql);