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

tvplanit: Fix crash when a DayView/WeekView/MonthView/GanttView is dropped on an empty form.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8552 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2022-10-13 14:43:54 +00:00
parent 26581143a8
commit b7c534c59a
5 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/tvplanit/examples/printing/monthview/data.ini
View File

@ -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} 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} 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} 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} 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} 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} 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}

2
components/tvplanit/source/vpdayview.pas
View File

@ -1009,13 +1009,13 @@ end;
function TVpDayView.IsHoliday(ADate: TDate; out AHolidayName: String): Boolean; function TVpDayView.IsHoliday(ADate: TDate; out AHolidayName: String): Boolean;
begin begin
if Assigned(FOnHoliday) then
AHolidayName := ''; AHolidayName := '';
if Assigned(FOnHoliday) then if Assigned(FOnHoliday) then
begin begin
FOnHoliday(Self, trunc(ADate), AHolidayName); FOnHoliday(Self, trunc(ADate), AHolidayName);
Result := AHolidayName <> ''; Result := AHolidayName <> '';
end else end else
if Assigned(FControlLink) then
Result := FControlLink.IsHoliday(ADate, AHolidayName); Result := FControlLink.IsHoliday(ADate, AHolidayName);
end; end;

1
components/tvplanit/source/vpganttview.pas
View File

@ -1284,6 +1284,7 @@ begin
FOnHoliday(Self, ADate, AHolidayName); FOnHoliday(Self, ADate, AHolidayName);
Result := AHolidayName <> ''; Result := AHolidayName <> '';
end else end else
if Assigned(FControlLink) then
Result := FControlLink.IsHoliday(ADate, AHolidayName); Result := FControlLink.IsHoliday(ADate, AHolidayName);
end; end;

1
components/tvplanit/source/vpmonthview.pas
View File

@ -626,6 +626,7 @@ begin
FOnHoliday(Self, ADate, AHolidayName); FOnHoliday(Self, ADate, AHolidayName);
Result := AHolidayName <> ''; Result := AHolidayName <> '';
end else end else
if Assigned(FControlLink) then
Result := FControlLink.IsHoliday(ADate, AHolidayName); Result := FControlLink.IsHoliday(ADate, AHolidayName);
end; end;

1
components/tvplanit/source/vpweekview.pas
View File

@ -785,6 +785,7 @@ begin
FOnHoliday(Self, ADate, AHolidayName); FOnHoliday(Self, ADate, AHolidayName);
Result := AHolidayName <> ''; Result := AHolidayName <> '';
end else end else
if Assigned(FControlLink) then
Result := FControlLink.IsHoliday(ADate, AHolidayName); Result := FControlLink.IsHoliday(ADate, AHolidayName);
end; end;