pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

RxFPC:sort date values in RxDBGrid filter

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6396 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2018-05-08 12:31:39 +00:00
parent 6e428bf96d
commit 44f158a3aa
3 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/rx/trunk/rxtools/rxdateutil.pas
View File

@ -99,7 +99,7 @@ const
implementation
uses SysUtils, RXStrUtils, rxdconst{, DBConsts }{$IFDEF WIN32}, Windows{$ENDIF};
uses DateUtils, SysUtils, RXStrUtils, rxdconst{, DBConsts }{$IFDEF WIN32}, Windows{$ENDIF};
function NvlDate(DateValue, DefaultValue: TDateTime): TDateTime;
@ -436,7 +436,7 @@ begin
DateOrder := GetDateOrder(DateFormat);
if DefaultFormatSettings.ShortDateFormat[1] = 'g' then { skip over prefix text }
ScanToNumber(S, Pos);
if not (ScanNumber(S, MaxInt, Pos, N1) and ScanChar(S, Pos, DateSeparator) and
if not (ScanNumber(S, MaxInt, Pos, N1) and ScanChar(S, Pos, DefaultFormatSettings.DateSeparator) and
ScanNumber(S, MaxInt, Pos, N2)) then Exit;
if ScanChar(S, Pos, DateSeparator) then begin
if not ScanNumber(S, MaxInt, Pos, N3) then Exit;
@ -642,6 +642,7 @@ begin
end;
{$ENDIF}
{$IFDEF USE_FOUR_DIGIT_YEAR}
initialization
FourDigitYear := Pos('YYYY', AnsiUpperCase(ShortDateFormat)) > 0;