TvPlanIt: Deletion of a resource deletes also the associated events, contacts and tasks. Tested with all database datastores. Update datastore sample projects.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8947 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2023-10-10 22:24:46 +00:00
parent f54a1641df
commit f0d8344fee
19 changed files with 611 additions and 692 deletions

View File

@ -6,7 +6,7 @@ interface
uses
SysUtils, Classes, DB,
VpBaseDS, VpDBDS,
VpData, VpBaseDS, VpDBDS,
ZCompatibility, ZConnection, ZDataset;
type
@ -30,6 +30,9 @@ type
function GetEventsTable: TDataset; override;
function GetResourceTable: TDataset; override;
function GetTasksTable: TDataset; override;
procedure InternalPurgeContacts(Res: TVpResource); override;
procedure InternalPurgeEvents(Res: TVpResource); override;
procedure InternalPurgeTasks(Res: TVpResource); override;
procedure Loaded; override;
procedure Notification(AComponent: TComponent; Operation: TOperation); override;
procedure SetConnected(const AValue: Boolean); override;
@ -507,6 +510,33 @@ begin
Result := FTasksTable;
end;
{ Removes all contacts of the specified resource from the database. }
procedure TVpZeosDataStore.InternalPurgeContacts(Res: TVpResource);
var
sql: String;
begin
sql := Format('DELETE FROM Contacts WHERE ResourceID = %d', [Res.ResourceID]);
FConnection.ExecuteDirect(sql);
end;
{ Removes all events of the specified resource from the database. }
procedure TVpZeosDatastore.InternalPurgeEvents(Res: TVpResource);
var
sql: String;
begin
sql := Format('DELETE FROM Events WHERE ResourceID = %d', [Res.ResourceID]);
FConnection.ExecuteDirect(sql);
end;
{ Removes all tasks of the specified resource from the database. }
procedure TVpZeosDatastore.InternalPurgeTasks(Res: TVpResource);
var
sql: String;
begin
sql := Format('DELETE FROM Tasks WHERE ResourceID = %d', [Res.ResourceID]);
FConnection.ExecuteDirect(sql);
end;
procedure TVpZeosDatastore.Loaded;
begin
inherited;

View File

@ -277,6 +277,10 @@ type
procedure LinkToControls(AOwner: TComponent);
procedure UnlinkFromControls(AOwner: TComponent);
procedure InternalPurgeContacts(Res: TVpResource); virtual;
procedure InternalPurgeEvents(Res: TVpResource); virtual;
procedure InternalPurgeTasks(Res: TVpResource); virtual;
property AutoConnect: Boolean read FAutoConnect write SetAutoConnect default false;
property AutoCreate: Boolean read FAutoCreate write FAutoCreate default true;
@ -948,6 +952,24 @@ begin
NotifyDependents;
end;
procedure TVpCustomDataStore.InternalPurgeContacts(Res: TVpResource);
begin
// Must be overridden by descendants to remove the contacts of the given
// resource from the external storage
end;
procedure TVpCustomDataStore.InternalPurgeEvents(Res: TVpResource);
begin
// Must be overridden by descendants to remove the events of the given
// resource from the external storage
end;
procedure TVpCustomDataStore.InternalPurgeTasks(Res: TVpResource);
begin
// Must be overridden by descendants to remove the tasks of the given
// resource from the external storage
end;
procedure TVpCustomDataStore.PurgeResource(Res: TVpResource);
begin
Unused(Res);
@ -957,23 +979,35 @@ end;
procedure TVpCustomDataStore.PurgeEvents(Res: TVpResource);
begin
Res.Schedule.ClearEvents;
if not Loading then
NotifyDependents;
if Res <> nil then
begin
InternalPurgeEvents(Res);
Res.Schedule.ClearEvents;
if not Loading then
NotifyDependents;
end;
end;
procedure TVpCustomDataStore.PurgeContacts(Res: TVpResource);
begin
Res.Contacts.ClearContacts;
if not Loading then
NotifyDependents;
if Res <> nil then
begin
InternalPurgeContacts(Res);
Res.Contacts.ClearContacts;
if not Loading then
NotifyDependents;
end;
end;
procedure TVpCustomDataStore.PurgeTasks(Res: TVpResource);
begin
Res.Tasks.ClearTasks;
if not Loading then
NotifyDependents;
if Res <> nil then
begin
InternalPurgeTasks(Res);
Res.Tasks.ClearTasks;
if not Loading then
NotifyDependents;
end;
end;
procedure TVpCustomDatastore.UpdateGroupEvents;

View File

@ -64,6 +64,10 @@ type
procedure SetReadOnly(const Value: boolean);
{ internal methods }
procedure InternalPurgeContacts(Res: TVpResource); override;
procedure InternalPurgeEvents(Res: TVpResource); override;
procedure InternalPurgeTasks(Res: TVpResource); override;
procedure LoadContact(AContact: TVpContact); virtual;
procedure LoadTask(ATask: TVpTask); virtual;
procedure SetFilterCriteria(ATable: TDataset; AUseDateTime: Boolean;
@ -96,9 +100,6 @@ type
procedure PostResources; override;
procedure PurgeResource(Res: TVpResource); override;
procedure PurgeEvents(Res: TVpResource); override;
procedure PurgeContacts(Res: TVpResource); override;
procedure PurgeTasks(Res: TVpResource); override;
procedure SetResourceByName(Value: string); override;
procedure CreateFieldDefs(const TableName: string; FieldDefs: TFieldDefs); virtual;
@ -1879,7 +1880,6 @@ begin
end;
end;
{ - Added}
procedure TVpCustomDBDataStore.PurgeResource(Res: TVpResource);
begin
Res.Deleted := true;
@ -1887,27 +1887,64 @@ begin
Load;
end;
procedure TVpCustomDBDataStore.PurgeEvents(Res: TVpResource);
{ Deletes all events from the database which are assigned to the specified
resource. Does this by iterating over the dataset.
Override if the descendant class provides a more efficient method. }
procedure TVpCustomDBDataStore.InternalPurgeEvents(Res: TVpResource);
var
resIDField: TField;
begin
{ Purging the events from the database is done by the descendant !!.01}
{ classes !!.01}
inherited;
Assert(Res <> nil);
EventsTable.Open;
EventsTable.First;
resIDField := EventsTable.FieldByName('ResourceID');
while not EventsTable.EOF do
begin
if resIDField.AsInteger = Res.ResourceID then
EventsTable.Delete
else
EventsTable.Next;
end;
end;
procedure TVpCustomDBDataStore.PurgeContacts(Res: TVpResource);
{ Deletes all contacts from the database which are assigned to the specified
resource. Does this by iterating over the dataset. Override if the descendant
class provides a more efficient method. }
procedure TVpCustomDBDataStore.InternalPurgeContacts(Res: TVpResource);
var
resIDField: TField;
begin
{ Purging the contacts from the database is done by the descendant !!.01}
{ classes !!.01}
inherited;
ContactsTable.Open;
ContactsTable.First;
resIDField := ContactsTable.FieldByName('ResourceID');
while not ContactsTable.EOF do
begin
if resIDField.AsInteger = Res.ResourceID then
ContactsTable.Delete
else
ContactsTable.Next;
end;
end;
procedure TVpCustomDBDataStore.PurgeTasks(Res: TVpResource);
{ Deletes all tasks from the database which are assigned to the specified
resource. Does this by iterating over the dataset. Override if the descendant
class provides a more efficient method. }
procedure TVpCustomDBDataStore.InternalPurgeTasks(Res: TVpResource);
var
resIDField: TField;
begin
{ Purging the tasks from the database is done by the descendant !!.01}
{ classes !!.01}
inherited;
TasksTable.Open;
TasksTable.First;
resIDField := TasksTable.FieldByName('ResourceID');
while not TasksTable.EOF do
begin
if resIDField.AsInteger = Res.ResourceID then
TasksTable.Delete
else
TasksTable.Next;
end;
end;
{ - End}
procedure TVpCustomDBDataStore.SetResourceByName(Value: string);
var

View File

@ -8,7 +8,7 @@ interface
uses
SysUtils, Classes, DB, IBConnection, sqldb,
VpBaseDS, VpDBDS;
VpBaseDS, VpData, VpDBDS;
type
TVpFirebirdDatastore = class(TVpCustomDBDatastore)
@ -28,6 +28,9 @@ type
function GetEventsTable: TDataset; override;
function GetResourceTable: TDataset; override;
function GetTasksTable: TDataset; override;
procedure InternalPurgeContacts(Res: TVpResource); override;
procedure InternalPurgeEvents(Res: TVpResource); override;
procedure InternalPurgeTasks(Res: TVpResource); override;
procedure Loaded; override;
procedure Notification(AComponent: TComponent; Operation: TOperation); override;
procedure OpenTables;
@ -576,6 +579,33 @@ begin
FTasksTable.Refresh;
end;
{ Removes all contacts of the specified resource from the database. }
procedure TVpFirebirdDataStore.InternalPurgeContacts(Res: TVpResource);
var
sql: String;
begin
sql := Format('DELETE FROM Contacts WHERE ResourceID = %d', [Res.ResourceID]);
FConnection.ExecuteDirect(sql);
end;
{ Removes all events of the specified resource from the database. }
procedure TVpFirebirdDatastore.InternalPurgeEvents(Res: TVpResource);
var
sql: String;
begin
sql := Format('DELETE FROM Events WHERE ResourceID = %d', [Res.ResourceID]);
FConnection.ExecuteDirect(sql);
end;
{ Removes all tasks of the specified resource from the database. }
procedure TVpFirebirdDatastore.InternalPurgeTasks(Res: TVpResource);
var
sql: String;
begin
sql := Format('DELETE FROM Tasks WHERE ResourceID = %d', [Res.ResourceID]);
FConnection.ExecuteDirect(sql);
end;
procedure TVpFirebirdDatastore.SetConnected(const AValue: Boolean);
begin
if (AValue = Connected) or (FConnection = nil) or (FConnectLock > 0) then

View File

@ -157,10 +157,6 @@ type
procedure PostContacts; override;
procedure PostTasks; override;
procedure PostResources; override;
procedure PurgeResource(Res: TVpResource); override;
procedure PurgeEvents(Res: TVpResource); override;
procedure PurgeContacts(Res: TVpResource); override;
procedure PurgeTasks(Res: TVpResource); override;
function GetFieldName(Mappings: TCollection; VPField: string): string;
function GetNextID(TableName: string): Integer; override;
@ -207,7 +203,8 @@ uses
{$IFDEF VERSION6} Variants, {$ELSE} FileCtrl, {$ENDIF} VpConst;
{*****************************************************************************}
{ TVpFieldMapping }
{ TVpFieldMapping }
(*****************************************************************************)
procedure TVpFieldMapping.Assign(Source: TPersistent);
begin
@ -219,7 +216,8 @@ begin
end;
(*****************************************************************************)
{ TVpFlexDataStore }
{ TVpFlexDataStore }
(*****************************************************************************)
constructor TVpFlexDataStore.Create(AOwner: TComponent);
begin
@ -232,7 +230,6 @@ begin
FConnected := false;
FResourceID := 0;
end;
{=====}
destructor TVpFlexDataStore.Destroy;
begin
@ -243,7 +240,6 @@ begin
FDataSources.Free;
inherited;
end;
{=====}
function TVpFlexDataStore.GetConnected: Boolean;
var
@ -263,7 +259,6 @@ begin
Result := AllAssigned and AllActive;
end;
{=====}
function TVpFlexDataStore.GetResourceTable : TDataset;
begin
@ -271,7 +266,6 @@ begin
if (FResourceDataSrc <> nil) and (FResourceDataSrc.DataSet <> nil) then
Result := FResourceDataSrc.DataSet;
end;
{=====}
function TVpFlexDataStore.GetEventsTable : TDataset;
begin
@ -279,7 +273,6 @@ begin
if (FEventsDataSrc <> nil) and (FEventsDataSrc.DataSet <> nil) then
Result := FEventsDataSrc.DataSet;
end;
{=====}
function TVpFlexDataStore.GetContactsTable : TDataset;
begin
@ -287,7 +280,6 @@ begin
if (FContactsDataSrc <> nil) and (FContactsDataSrc.DataSet <> nil) then
Result := FContactsDataSrc.DataSet;
end;
{=====}
function TVpFlexDataStore.GetTasksTable : TDataset;
begin
@ -295,7 +287,6 @@ begin
if (FTasksDataSrc <> nil) and (FTasksDataSrc.DataSet <> nil) then
Result := FTasksDataSrc.DataSet;
end;
{=====}
procedure TVpFlexDataStore.SetConnected(const Value: boolean);
var
@ -435,7 +426,6 @@ begin
inherited;
end;
{=====}
procedure TVpFlexDataStore.Load;
var
@ -539,7 +529,6 @@ begin
end;
NotifyDependents;
end;
{=====}
procedure TVpFlexDataStore.LoadEventsOfResource(AResID: Integer);
var
@ -685,7 +674,8 @@ begin
end; {with FEventsDataSrc.Dataset}
end; {if resource <> nil}
end;
(*
(*
procedure TVpFlexDataStore.LoadEvents;
var
Event: TVpEvent;
@ -828,7 +818,6 @@ begin
end; {with FEventsDataSrc.Dataset}
end; {if resource <> nil}
end;*)
{=====}
{ Loads the contact from the current cursor position of the contacts table }
procedure TVpFlexDatastore.LoadContact(AContact: TVpContact);
@ -1306,8 +1295,8 @@ begin
end; {with ContactsTable}
end; {if Resource <> nil}
end;
{=====}
*)
procedure TVpFlexDataStore.LoadTasks;
var
Task: TVpTask;
@ -1410,7 +1399,6 @@ begin
end;
end;
end;
{=====}
procedure TVpFlexDataStore.RefreshResource;
var
@ -1502,8 +1490,8 @@ begin
if not Loading then
NotifyDependents;
end;
{=====}
(*
(*
procedure TVpFlexDataStore.RefreshEvents;
begin
if Resource <> nil then begin
@ -1535,8 +1523,8 @@ begin
if not Loading then
NotifyDependents;
end;
{=====}
*)
procedure TVpFlexDataStore.PostEvents;
var
J: Integer;
@ -1738,7 +1726,6 @@ begin
if not Loading then
NotifyDependents;
end;
{=====}
procedure TVpFlexDataStore.PostContacts;
var
@ -2055,7 +2042,6 @@ begin
Resource.Contacts.Sort;
end;
end;
{=====}
procedure TVpFlexDataStore.PostTasks;
var
@ -2215,9 +2201,7 @@ begin
Resource.Tasks.Sort;
end;
end;
{=====}
{ - New}
procedure TVpFlexDataStore.PostResources;
var
I: Integer;
@ -2348,52 +2332,6 @@ begin
Loading := false;
end;
end;
{=====}
{ - New}
procedure TVpFlexDataStore.PurgeResource(Res: TVpResource);
begin
Res.Deleted := true;
PostResources;
Load;
end;
{=====}
{ - New}
procedure TVpFlexDataStore.PurgeEvents(Res: TVpResource);
var
I: integer;
begin
for I := 0 to pred(Res.Schedule.EventCount) do
TVpEvent(Res.Schedule.GetEvent(I)).Deleted := true;
PostEvents;
Res.Schedule.ClearEvents;
end;
{=====}
{ - New}
procedure TVpFlexDataStore.PurgeContacts(Res: TVpResource);
var
I: integer;
begin
for I := 0 to pred(Res.Contacts.Count) do
TVpContact(Res.Contacts.GetContact(I)).Deleted := true;
PostContacts;
Res.Contacts.ClearContacts;
end;
{=====}
{ - New}
procedure TVpFlexDataStore.PurgeTasks(Res: TVpResource);
var
I: integer;
begin
for I := 0 to pred(Res.Tasks.Count) do
TVpTask(Res.Tasks.GetTask(I)).Deleted := true;
PostTasks;
Res.Tasks.ClearTasks;
end;
{=====}
procedure TVpFlexDataStore.SetResourceDataSrc(Value: TDataSource);
begin
@ -2403,7 +2341,6 @@ begin
Load;
end;
end;
{=====}
procedure TVpFlexDataStore.SetEventsDataSrc(Value: TDataSource);
begin
@ -2413,7 +2350,6 @@ begin
Load;
end;
end;
{=====}
procedure TVpFlexDataStore.SetContactsDataSrc(Value: TDataSource);
begin
@ -2423,7 +2359,6 @@ begin
Load;
end;
end;
{=====}
procedure TVpFlexDataStore.SetTasksDataSrc(Value: TDataSource);
begin
@ -2433,7 +2368,6 @@ begin
Load;
end;
end;
{=====}
{ - New Field Mapping Streamers}
procedure TVpFlexDataStore.DefineProperties(Filer: TFiler);
@ -2448,7 +2382,6 @@ begin
Filer.DefineProperty('TaskFieldMappings', LoadTaskMapping,
StoreTaskMapping, FTaskMappings.Count > 0);
end;
{=====}
procedure TVpFlexDataStore.LoadResMapping(Reader: TReader);
var
@ -2463,7 +2396,6 @@ begin
end;
Reader.ReadListEnd;
end;
{=====}
procedure TVpFlexDataStore.StoreResMapping(Writer: TWriter);
var
@ -2478,7 +2410,6 @@ begin
end;
Writer.WriteListEnd;
end;
{=====}
procedure TVpFlexDataStore.LoadEventMapping(Reader: TReader);
var
@ -2493,7 +2424,6 @@ begin
end;
Reader.ReadListEnd;
end;
{=====}
procedure TVpFlexDataStore.StoreEventMapping(Writer: TWriter);
var
@ -2508,7 +2438,6 @@ begin
end;
Writer.WriteListEnd;
end;
{=====}
procedure TVpFlexDataStore.LoadContactMapping(Reader: TReader);
var
@ -2523,7 +2452,6 @@ begin
end;
Reader.ReadListEnd;
end;
{=====}
procedure TVpFlexDataStore.StoreContactMapping(Writer: TWriter);
var
@ -2538,7 +2466,6 @@ begin
end;
Writer.WriteListEnd;
end;
{=====}
procedure TVpFlexDataStore.LoadTaskMapping(Reader: TReader);
var
@ -2553,7 +2480,6 @@ begin
end;
Reader.ReadListEnd;
end;
{=====}
procedure TVpFlexDataStore.StoreTaskMapping(Writer: TWriter);
var
@ -2568,7 +2494,6 @@ begin
end;
Writer.WriteListEnd;
end;
{=====}
procedure TVpFlexDataStore.Loaded;
begin
@ -2576,7 +2501,6 @@ begin
if not (csDesigning in ComponentState) then
Connected := AutoConnect;
end;
{=====}
function TVpFlexDataStore.GetNextID(TableName: string): Integer;
begin
@ -2654,7 +2578,6 @@ begin
then
Result := '';
end;
{=====}
procedure TVpFlexDataStore.SetFilterCriteria(ATable: TDataset; AUseDateTime: Boolean;
AResourceID: Integer; AStartDateTime, aEndDateTime: TDateTime);
@ -2665,7 +2588,7 @@ begin
else
inherited;
end;
{=====}
{ TVpDataSources }
@ -2673,55 +2596,46 @@ constructor TVpDataSources.Create(Owner: TVpFlexDataStore);
begin
FOwner := Owner;
end;
{=====}
function TVpDataSources.GetContactsDataSrc: TDataSource;
begin
result := FOwner.ContactsDataSource;
end;
{=====}
function TVpDataSources.GetEventsDataSrc: TDataSource;
begin
result := FOwner.EventsDataSource;
end;
{=====}
function TVpDataSources.GetResourceDataSrc: TDataSource;
begin
result := FOwner.ResourceDataSource;
end;
{=====}
function TVpDataSources.GetTasksDataSrc: TDataSource;
begin
result := FOwner.TasksDataSource;
end;
{=====}
procedure TVpDataSources.SetContactsDataSrc(const Value: TDataSource);
begin
FOwner.ContactsDataSource := Value;
end;
{=====}
procedure TVpDataSources.SetEventsDataSrc(const Value: TDataSource);
begin
FOwner.EventsDataSource := Value;
end;
{=====}
procedure TVpDataSources.SetResourceDataSrc(const Value: TDataSource);
begin
FOwner.ResourceDataSource := Value;
end;
{=====}
procedure TVpDataSources.SetTasksDataSrc(const Value: TDataSource);
begin
FOwner.TasksDataSource := Value;
end;
{=====}
end.

View File

@ -6,7 +6,7 @@ interface
uses
SysUtils, Classes, DB, sqlite3conn, sqldb,
VpBaseDS, VpDBDS;
VpData, VpBaseDS, VpDBDS;
type
@ -27,6 +27,9 @@ type
function GetEventsTable: TDataset; override;
function GetResourceTable: TDataset; override;
function GetTasksTable: TDataset; override;
procedure InternalPurgeContacts(Res: TVpResource); override;
procedure InternalPurgeEvents(Res: TVpResource); override;
procedure InternalPurgeTasks(Res: TVpResource); override;
procedure Loaded; override;
procedure Notification(AComponent: TComponent; Operation: TOperation); override;
procedure OpenTables;
@ -516,6 +519,33 @@ begin
Result := FTasksTable;
end;
{ Removes all contacts of the specified resource from the database. }
procedure TVpSqlite3DataStore.InternalPurgeContacts(Res: TVpResource);
var
sql: String;
begin
sql := Format('DELETE FROM Contacts WHERE ResourceID = %d', [Res.ResourceID]);
FConnection.ExecuteDirect(sql);
end;
{ Removes all events of the specified resource from the database. }
procedure TVpSqlite3Datastore.InternalPurgeEvents(Res: TVpResource);
var
sql: String;
begin
sql := Format('DELETE FROM Events WHERE ResourceID = %d', [Res.ResourceID]);
FConnection.ExecuteDirect(sql);
end;
{ Removes all tasks of the specified resource from the database. }
procedure TVpSqlite3Datastore.InternalPurgeTasks(Res: TVpResource);
var
sql: String;
begin
sql := Format('DELETE FROM Tasks WHERE ResourceID = %d', [Res.ResourceID]);
FConnection.ExecuteDirect(sql);
end;
procedure TVpSqlite3Datastore.Loaded;
begin
inherited;