diff --git a/components/tvplanit/examples/printing/monthview/data.ini b/components/tvplanit/examples/printing/monthview/data.ini index 3cb377e62..2892b029f 100644 --- a/components/tvplanit/examples/printing/monthview/data.ini +++ b/components/tvplanit/examples/printing/monthview/data.ini @@ -16,6 +16,7 @@ Version=v105 1387047049={StartTime:2022/10/07 09:00:00}|{EndTime:2022/10/07 13:00:00}|{ResourceID:1178568021}|{Description:Test 6}|{Category:0}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} 825453432={StartTime:2022/10/07 12:30:00}|{EndTime:2022/10/07 19:00:00}|{ResourceID:1178568021}|{Description:Test 6a}|{Category:2}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} 939711377={StartTime:2022/10/08 10:00:00}|{EndTime:2022/10/08 10:30:00}|{ResourceID:1178568021}|{Description:Test}|{Category:3}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} +121790187={StartTime:2022/10/10 12:00:00}|{EndTime:2022/10/10 12:30:00}|{ResourceID:0}|{Description:Recurring}|{Category:0}|{AllDayEvent:true}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtDaily}|{RepeatRangeEnd:2022/10/15}|{CustomInterval:0} 638950699={StartTime:2022/10/31 15:00:00}|{EndTime:2022/10/31 18:00:00}|{ResourceID:1178568021}|{Description:Test Oct-31}|{Category:0}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} 1339092840={StartTime:2022/11/06 10:00:00}|{EndTime:2022/11/06 15:00:00}|{ResourceID:1178568021}|{Description:Test Nov-10}|{Category:1}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} 1915067938={StartTime:2022/11/30 12:00:00}|{EndTime:2022/11/30 14:00:00}|{ResourceID:1178568021}|{Description:Test Nov-30}|{Category:3}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} diff --git a/components/tvplanit/source/vpdayview.pas b/components/tvplanit/source/vpdayview.pas index bb9175964..a64cceb42 100644 --- a/components/tvplanit/source/vpdayview.pas +++ b/components/tvplanit/source/vpdayview.pas @@ -1009,13 +1009,13 @@ end; function TVpDayView.IsHoliday(ADate: TDate; out AHolidayName: String): Boolean; begin - if Assigned(FOnHoliday) then AHolidayName := ''; if Assigned(FOnHoliday) then begin FOnHoliday(Self, trunc(ADate), AHolidayName); Result := AHolidayName <> ''; end else + if Assigned(FControlLink) then Result := FControlLink.IsHoliday(ADate, AHolidayName); end; diff --git a/components/tvplanit/source/vpganttview.pas b/components/tvplanit/source/vpganttview.pas index d5625d58e..61372081c 100644 --- a/components/tvplanit/source/vpganttview.pas +++ b/components/tvplanit/source/vpganttview.pas @@ -1284,6 +1284,7 @@ begin FOnHoliday(Self, ADate, AHolidayName); Result := AHolidayName <> ''; end else + if Assigned(FControlLink) then Result := FControlLink.IsHoliday(ADate, AHolidayName); end; diff --git a/components/tvplanit/source/vpmonthview.pas b/components/tvplanit/source/vpmonthview.pas index 4e93c5932..fa8d8ac42 100644 --- a/components/tvplanit/source/vpmonthview.pas +++ b/components/tvplanit/source/vpmonthview.pas @@ -626,6 +626,7 @@ begin FOnHoliday(Self, ADate, AHolidayName); Result := AHolidayName <> ''; end else + if Assigned(FControlLink) then Result := FControlLink.IsHoliday(ADate, AHolidayName); end; diff --git a/components/tvplanit/source/vpweekview.pas b/components/tvplanit/source/vpweekview.pas index fe5e4ab11..abb52c688 100644 --- a/components/tvplanit/source/vpweekview.pas +++ b/components/tvplanit/source/vpweekview.pas @@ -785,6 +785,7 @@ begin FOnHoliday(Self, ADate, AHolidayName); Result := AHolidayName <> ''; end else + if Assigned(FControlLink) then Result := FControlLink.IsHoliday(ADate, AHolidayName); end;