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

tvplanit: Fire OnAddEvent after DavView's/WeekView's/MonthView's event editor only in case of a new event (mentioned in the discussion of issue #33749).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6431 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2018-05-17 16:35:44 +00:00
parent 451b6e0016
commit a38f491755
5 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,7 +215,7 @@ type
{ internal methods }
function GetDateAtCoord(APoint: TPoint): TDateTime;
procedure mvPopulate;
procedure mvSpawnEventEditDialog(NewEvent: Boolean);
procedure mvSpawnEventEditDialog(IsNewEvent: Boolean);
procedure mvSpinButtonClick(Sender: TObject; Button: TUDBtnType);
procedure mvSetDateByCoord(APoint: TPoint);
procedure mvHookUp;
@@ -686,21 +686,21 @@ begin
end;
{=====}
procedure TVpMonthView.mvSpawnEventEditDialog(NewEvent: Boolean);
procedure TVpMonthView.mvSpawnEventEditDialog(IsNewEvent: Boolean);
var
AllowIt: Boolean;
EventDlg : TVpEventEditDialog;
begin
if DataStore = nil then Exit;
if (not NewEvent) and (not mvActiveEvent.CanEdit) then begin
if (not IsNewEvent) and (not mvActiveEvent.CanEdit) then begin
MessageDlg(RSCannotEditOverlayedEvent, mtInformation, [mbOk], 0);
exit;
end;
AllowIt := false;
if Assigned(FOwnerEditEvent) then
FOwnerEditEvent(self, mvActiveEvent, NewEvent, DataStore.Resource, AllowIt)
FOwnerEditEvent(self, mvActiveEvent, IsNewEvent, DataStore.Resource, AllowIt)
else begin
EventDlg := TVpEventEditDialog.Create(nil);
try
@@ -715,17 +715,16 @@ begin
if AllowIt then begin
mvActiveEvent.Changed := true;
DataStore.PostEvents;
if Assigned(FOnAddEvent) then
if IsNewEvent and Assigned(FOnAddEvent) then
FOnAddEvent(self, mvActiveEvent);
Invalidate;
end else begin
if NewEvent then begin
if IsNewEvent then begin
DataStore.Resource.Schedule.DeleteEvent(mvActiveEvent);
mvActiveEvent := nil;
end;
DataStore.PostEvents;
Invalidate;
end;
Invalidate;
mvActiveEvent := nil;
end;