paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-08-15 23:29:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Better handling of empty dates

Browse Source
This commit is contained in:
Michaël Van Canneyt 2024-01-14 14:48:01 +01:00
parent f6aa05353b
commit 0cffa26111
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/bootstrap/src/bootstraptablewidget.pp
View File

@ -878,25 +878,22 @@ function TCustomDBBootstrapTableWidget.MakeDateTimeRenderCol(aCol: TBootstrapTab
DT : TDateTime; DT : TDateTime;
begin begin
if aTableCol.Formatting = '' then if IsNull(Data) or isUndefined(Data) then
Result:=''
else if aTableCol.Formatting = '' then
Result := String(Data) Result := String(Data)
else else
begin begin
if IsNull(Data) then if Data is TJSDate then
Dt:=JSDateToDateTime(TJSDate(Data))
else if isString(Data) then
Dt:=ISO8601ToDate(String(Data),False)
else
Dt:=0;
if Dt<=100 then
Result:='' Result:=''
else else
begin Result := FormatDateTime(aTableCol.Formatting, DT)
if Data is TJSDate then
Dt:=JSDateToDateTime(TJSDate(Data))
else if isString(Data) then
Dt:=ISO8601ToDate(String(Data),False)
else
Dt:=0;
if Dt<=100 then
Result:=''
else
Result := FormatDateTime(aTableCol.Formatting, DT)
end;
end; end;
if aTableCol.ExtraAttributes <> '' then if aTableCol.ExtraAttributes <> '' then
Result := Format('<span %s>%s</span>', [ReplaceMoustache(row, aTableCol.ExtraAttributes), Result]); Result := Format('<span %s>%s</span>', [ReplaceMoustache(row, aTableCol.ExtraAttributes), Result]);