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

FCLT#86343 Naamgeving van noConvert aangepast naar isUserTimeZone danwel isServerTimeZone, en commentaar aangepast/toegevoegd

Browse Source 
svn path=/Website/trunk/; revision=67774
This commit is contained in:
Koen Reefman
2025-01-29 09:16:46 +00:00
parent 43dc9d70ed
commit bc82f3b47b
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
APPL/Shared/Shared.inc
View File

@@ -1308,8 +1308,8 @@ function oRaAsUserTZ(prefix, varName, isGroupClause)
/////
// Returns;
// for GROUP BY Clause: syntax for converted timezone
// for SELECT Clause: syntax for converted timezone with comma for SELECT Clause, named: [varName + "_tz"]
// for GROUP BY Clause: syntax for converted time-zone
// for SELECT Clause: syntax for converted time-zone with comma for SELECT Clause, named: [varName + "_tz"]
/////
return (isGroupClause ? "" : " , ")
+ "CAST(FROM_TZ(CAST(" + prefix + varName + " AS TIMESTAMP), TO_CHAR (SYSTIMESTAMP, 'tzr')) AT TIME ZONE SESSIONTIMEZONE AS DATE)"
@@ -1332,8 +1332,8 @@ function getUserHour(h)
return tempDate.getHours();
}
// User timezone = Session("time_zone")
// Server timezone = S("fac_server_timezone")
// User time-zone = Session("time_zone")
// Server time-zone = S("fac_server_timezone")
function toUserTimeZone(thisDate)
{
@@ -1367,7 +1367,8 @@ function convertTimeZone(thisDate, fromTZ, toTZ)
// This function should only be used to format display,
// <20> never as part of a computation.
function toTimeString(jsDate, bWithSeconds, noConvert)
// Als de jsDate van de user(client) afkomstig is, hoeft er geen conversie naar de user-time-zone plaats te vinden
function toTimeString(jsDate, bWithSeconds, isUserTimeZone)
{
if (jsDate===null)
return "";
@@ -1389,14 +1390,15 @@ function toTimeString(jsDate, bWithSeconds, noConvert)
if (!jsDate)
return "";
if (!noConvert)
if (!isUserTimeZone)
jsDate = toUserTimeZone(jsDate);
ret = padout(jsDate.getHours()) + ":" + padout(jsDate.getMinutes());
if (bWithSeconds) ret += ":" + padout(jsDate.getSeconds());
return ret;
}
function toDateString(jsDate, noDay, pretty, noConvert)
// Als de jsDate van de user(client) afkomstig is, hoeft er geen conversie naar de user-time-zone plaats te vinden
function toDateString(jsDate, noDay, pretty, isUserTimeZone)
{
var resstr = "";
var today = new Date().midnight();
@@ -1417,7 +1419,7 @@ function toDateString(jsDate, noDay, pretty, noConvert)
if (!jsDate)
return "";
if (!noConvert)
if (!isUserTimeZone)
jsDate = toUserTimeZone(jsDate);
// Ik wil graag, alleen als parameter friendly?, voor de datums gisteren, vandaag en morgen de tekst Gisteren, Vandaag en Morgen opleveren
@@ -2457,22 +2459,22 @@ Date.prototype.toSQL = function toSQL(withTime, withSeconds)
}
return "to_date(" + safe.quoted_sql(str) + ", '" + dateformat + "')";
}
Date.prototype.beginToSQL = function beginToSQL(dateOnly, noConvert) // Gebruik noConvert = true als deze datum geen userinput is
// Als de Date al een server-datetime is, hoeven we geen time-zone conversie uit te voeren
Date.prototype.beginToSQL = function beginToSQL(dateOnly, isServerTimeZone)
{
var theDateStart = new Date(this);
if (noConvert) {
if (isServerTimeZone) {
return new Date(theDateStart.setHours(0, 0)).toSQL(!dateOnly);
} else {
theDateStart = new Date(toUserTimeZone(theDateStart).setHours(0, 0));
return toServerTimeZone(theDateStart).toSQL(!dateOnly);
}
}
Date.prototype.endToSQL = function endToSQL(dateOnly, noConvert) // Gebruik noConvert = true als deze datum geen userinput is
// Als de Date al een server-datetime is, hoeven we geen time-zone conversie uit te voeren
Date.prototype.endToSQL = function endToSQL(dateOnly, isServerTimeZone)
{
var theDateEnd = new Date(this);
if (noConvert) {
if (isServerTimeZone) {
return new Date(theDateEnd.setHours(23, 59)).toSQL(!dateOnly);
} else {
theDateEnd = new Date(toUserTimeZone(theDateEnd).setHours(23, 59));