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

tvplanit: Some clean-up in holiday calculation.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8390 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2022-08-13 16:40:15 +00:00
parent a33255b5eb
commit c8ac39c295
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/tvplanit/examples/fulldemo/demomain.pas
View File

@ -138,6 +138,7 @@ type
FResID: Integer; FResID: Integer;
FLanguageDir: String; FLanguageDir: String;
FHolidays: THolidayList; FHolidays: THolidayList;
FHolidayYear: Integer;
procedure CalcHolidays(AYear: Integer); procedure CalcHolidays(AYear: Integer);
procedure ConnectHandler(Sender: TObject); procedure ConnectHandler(Sender: TObject);
procedure CreateResourceGroup; procedure CreateResourceGroup;
@ -456,13 +457,12 @@ begin
if d1 <> d then if d1 <> d then
FHolidays.Add(d1, 'Christmas Day (in lieu)'); FHolidays.Add(d1, 'Christmas Day (in lieu)');
// New Year // New Year
d := EncodeDate(AYear+1, 1, 1); // +1 --> following year d := EncodeDate(AYear+1, 1, 1); // +1 --> following year
FHolidays.Add(d, 'New Year'); FHolidays.Add(d, 'New Year');
d1 := InLieuHoliday(d); d1 := InLieuHoliday(d);
if d <> d1 then if d <> d1 then
FHolidays.Add(d1, 'New Year (in lieu)'); FHolidays.Add(d1, 'New Year (in lieu)');
end; end;
procedure TMainForm.Cb3DChange(Sender: TObject); procedure TMainForm.Cb3DChange(Sender: TObject);
@ -595,7 +595,11 @@ var
year: Integer; year: Integer;
begin begin
year := YearOf(ADate); year := YearOf(ADate);
CalcHolidays(year); if year <> FHolidayYear then
begin
CalcHolidays(year);
FHolidayYear := year;
end;
end; end;
procedure TMainForm.FormCloseQuery(Sender: TObject; var CanClose: boolean); procedure TMainForm.FormCloseQuery(Sender: TObject; var CanClose: boolean);