paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-08-18 16:49:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Accept native Javascript Date, (adapted) patch from Bruno

Browse Source
This commit is contained in:
michael 2020-07-09 09:57:53 +00:00
parent d744f40921
commit 50ce665a76
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/fcl-db/db.pas
View File

@ -3932,6 +3932,8 @@ begin
end end
else if IsNumber(aValue) then else if IsNumber(aValue) then
Result:=TDateTime(AValue) Result:=TDateTime(AValue)
else if IsDate(aValue) then
Result:=JSDateToDateTime(TJSDate(aValue));
end; end;
function TDataSet.ConvertDateTimeToNative(aField: TField; aValue : TDateTime) : JSValue; function TDataSet.ConvertDateTimeToNative(aField: TField; aValue : TDateTime) : JSValue;

13
packages/fcl-db/jsondataset.pas
View File

@ -657,9 +657,18 @@ function TDateTimeFieldComparer.Compare(RowIndex: Integer; aValue: JSValue): Int
var var
D1,D2 : TDateTime; D1,D2 : TDateTime;
Function ToDate(v: JSValue) : TDateTime;
begin
if IsDate(v) then
Result:= JSDateToDateTime(TJSDate(v))
else
Result:=Dataset.ConvertDateTimeField(String(v),Self.Field);
end;
begin begin
D1:=Dataset.ConvertDateTimeField(String(GetFieldValue(Rowindex)),Self.Field); D1:=ToDate(GetFieldValue(RowIndex));
D2:=Dataset.ConvertDateTimeField(String(aValue),Self.Field); D2:=ToDate(aValue);
Result:=Round(D1-D2); Result:=Round(D1-D2);
end; end;