You've already forked lazarus-ccr
tvplanit: Some clean-up in holiday calculation.
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8390 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
@ -138,6 +138,7 @@ type
|
||||
FResID: Integer;
|
||||
FLanguageDir: String;
|
||||
FHolidays: THolidayList;
|
||||
FHolidayYear: Integer;
|
||||
procedure CalcHolidays(AYear: Integer);
|
||||
procedure ConnectHandler(Sender: TObject);
|
||||
procedure CreateResourceGroup;
|
||||
@ -456,13 +457,12 @@ begin
|
||||
if d1 <> d then
|
||||
FHolidays.Add(d1, 'Christmas Day (in lieu)');
|
||||
|
||||
// New Year
|
||||
// New Year
|
||||
d := EncodeDate(AYear+1, 1, 1); // +1 --> following year
|
||||
FHolidays.Add(d, 'New Year');
|
||||
d1 := InLieuHoliday(d);
|
||||
if d <> d1 then
|
||||
FHolidays.Add(d1, 'New Year (in lieu)');
|
||||
|
||||
end;
|
||||
|
||||
procedure TMainForm.Cb3DChange(Sender: TObject);
|
||||
@ -595,7 +595,11 @@ var
|
||||
year: Integer;
|
||||
begin
|
||||
year := YearOf(ADate);
|
||||
CalcHolidays(year);
|
||||
if year <> FHolidayYear then
|
||||
begin
|
||||
CalcHolidays(year);
|
||||
FHolidayYear := year;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TMainForm.FormCloseQuery(Sender: TObject; var CanClose: boolean);
|
||||
|
Reference in New Issue
Block a user