Changeset 54 for trunk/Client/USystem.pas

Timestamp:

Oct 12, 2012, 11:43:43 AM (12 years ago)

Author:

chronos

Message:

• Added: ChronisAppServer base project.
• Modified: Changes in client virtual database layer handling.

File:

• trunk/Client/USystem.pas (modified) (13 diffs)

trunk/Client/USystem.pas

@@ -12 +12 @@
 const
   SystemModuleObject = 'SystemModule';
-  ObjectGroupTable = 'ObjectGroup';
-  ObjectTable = 'Object';
+  SystemMenuTable = 'SystemMenu';
+  SystemActionTable = 'SystemAction';
+  SystemObjectTable = 'Object';
   InformationTable = 'Information';
   PropertyTable = 'Property';
@@ -92 +93 @@
   TChronisModuleList = class(TListObject) // TListObject<TChronisModule>
     Base: TChronisBase;
+    procedure RegisterModule(ModuleClass: TChronisModuleClass);
     procedure UpdateList;
     function IsInstalled: Boolean;
@@ -109 +111 @@
     Modules: TChronisModuleList;
     ModuleSystem: TChronisModule;
-    procedure RegisterModule(ModuleClass: TChronisModuleClass);
     function AddType(Name, DataType: string; TypeIndex: TDbValueType): Integer;
-    function AddGroup(Name: string; ParentGroupId: Integer = 0): Integer;
-    function AddObject(Name, TableName, Schema: string; GroupId: Integer): Integer;
+    function AddMenu(Name: string; ParentId: Integer = 0; ActionId: Integer = 0): Integer;
+    function AddAction(Name: string; TargetType: string; TargetId: Integer): Integer;
+    function AddObject(Name, TableName, Schema: string): Integer;
     function AddProperty(ObjectId: Integer; Name, ColumnName: string;
       CustomType: Integer; Editable: Boolean): Integer;
@@ -126 +128 @@
     function AddPropertyString(ObjectId: Integer; Name, ColumnName: string;
       Editable: Boolean; Default: string = ''; MaxLength: Integer = 255): Integer;
+    function AddPropertyBoolean(ObjectId: Integer; Name, ColumnName: string;
+      Editable: Boolean; Default: Boolean = False): Integer;
     function AddPropertyText(ObjectId: Integer; Name, ColumnName: string;
       Editable: Boolean; Default: string = ''): Integer;
@@ -132 +136 @@
     function AddPropertyRelationMany(ObjectId: Integer; Name, ColumnName: string;
       Editable: Boolean; ReferedObjectProperty: Integer): Integer;
-    function AddObjectGroup(Name: string): Integer;
     function AddEnumeration(Name: string): Integer;
     function AddEnumerationState(Enum: Integer; Name: string): Integer;
-    function AddModule(Name, Author, Website, Version, Description, License: string): Integer;
     procedure LoadTypes;
-    function IsDatabaseEmpty: Boolean;
     constructor Create;
     destructor Destroy; override;
@@ -264 +265 @@
 end;
 
-procedure TChronisBase.RegisterModule(ModuleClass: TChronisModuleClass);
-begin
-  Modules.AddNew(ModuleClass.Create);
-  TChronisModule(Modules.Last).System := TChronisBase(Self);
+procedure TChronisModuleList.RegisterModule(ModuleClass: TChronisModuleClass);
+begin
+  AddNew(ModuleClass.Create);
+  TChronisModule(Last).System := TChronisBase(Base);
 end;
 
 function TChronisBase.AddType(Name, DataType: string; TypeIndex: TDbValueType): Integer;
-var
-  Proxy: TObjectProxy;
-begin
-  try
-    Proxy := TObjectProxy.Create;
-    Proxy.Client := Client;
-    Proxy.ObjectName := PropertyTypeTable;
-    Proxy.Id := Integer(TypeIndex);
-    Proxy.Properties.Add('Name', Name);
-    Proxy.Properties.Add('DbType', DataType);
-    Proxy.Save;
-    Result := Proxy.Id;
-  finally
-    Proxy.Free;
-  end;
-end;
-
-function TChronisBase.AddGroup(Name: string; ParentGroupId: Integer): Integer;
-var
-  Proxy: TObjectProxy;
-begin
-  try
-    Proxy := TObjectProxy.Create;
-    Proxy.Client := Client;
-    Proxy.ObjectName := ObjectGroupTable;
-    Proxy.Properties.Add('Name', Name);
-    Proxy.Properties.Add('Parent', IntToStr(ParentGroupId));
-    Proxy.Save;
-    Result := Proxy.Id;
-  finally
-    Proxy.Free;
-  end;
-end;
-
-function TChronisBase.AddObject(Name, TableName, Schema: string;
-  GroupId: Integer): Integer;
-var
-  Proxy: TObjectProxy;
-begin
-  try
-    Proxy := TObjectProxy.Create;
-    Proxy.Client := Client;
-    Proxy.ObjectName := ObjectTable;
+begin
+  with TObjectProxy.Create do
+  try
+    Client := Self.Client;
+    ObjectName := PropertyTypeTable;
+    Id := Integer(TypeIndex);
+    with Properties do begin
+      Add('Name', Name);
+      Add('DbType', DataType);
+    end;
+    Save;
+    Result := Id;
+  finally
+    Free;
+  end;
+end;
+
+function TChronisBase.AddMenu(Name: string; ParentId: Integer = 0; ActionId: Integer = 0): Integer;
+begin
+  with TObjectProxy.Create do
+  try
+    Client := Self.Client;
+    ObjectName := SystemMenuTable;
+    with Properties do begin
+      Add('Name', Name);
+      Add('Parent', IntToStr(ParentId));
+      Add('Action', IntToStr(ActionId));
+    end;
+    Save;
+    Result := Id;
+  finally
+    Free;
+  end;
+end;
+
+function TChronisBase.AddAction(Name: string; TargetType: string;
+  TargetId: Integer): Integer;
+begin
+
+end;
+
+function TChronisBase.AddObject(Name, TableName, Schema: string): Integer;
+var
+  Proxy: TObjectProxy;
+begin
+  try
+    Proxy := TObjectProxy.Create;
+    Proxy.Client := Client;
+    Proxy.ObjectName := SystemObjectTable;
     with Proxy.Properties do begin
       Add('Name', Name);
       Add('Schema', Schema);
       Add('Table', TableName);
-      Add('Group', IntToStr(GroupId));
       Add('PrimaryKey', 'Id');
     end;
@@ -471 +477 @@
 end;
 
+function TChronisBase.AddPropertyBoolean(ObjectId: Integer; Name,
+  ColumnName: string; Editable: Boolean; Default: Boolean): Integer;
+begin
+
+end;
+
 function TChronisBase.AddPropertyText(ObjectId: Integer; Name,
   ColumnName: string; Editable: Boolean; Default: string): Integer;
@@ -556 +568 @@
 end;
 
-function TChronisBase.AddObjectGroup(Name: string): Integer;
-var
-  Proxy: TObjectProxy;
-begin
-  try
-    Proxy := TObjectProxy.Create;
-    Proxy.Client := Client;
-    Proxy.ObjectName := ObjectGroupTable;
-    Proxy.Properties.Add('Name', Name);
-    Proxy.Save;
-    Result := Proxy.Id;
-  finally
-    Proxy.Free;
-  end;
-end;
-
 function TChronisBase.AddEnumeration(Name: string): Integer;
 var
@@ -600 +596 @@
     Proxy.Properties.Add('Name', Name);
     Proxy.Properties.Add('Sequence', '0');
-    Proxy.Save;
-    Result := Proxy.Id;
-  finally
-    Proxy.Free;
-  end;
-end;
-
-function TChronisBase.AddModule(Name, Author, Website, Version, Description,
-  License: string): Integer;
-var
-  Proxy: TObjectProxy;
-begin
-  try
-    Proxy := TObjectProxy.Create;
-    Proxy.Client := Client;
-    Proxy.ObjectName := ModuleTable;
-    Proxy.Properties.Add('Name', Name);
-    Proxy.Properties.Add('Author', Author);
-    Proxy.Properties.Add('Website', Website);
-    Proxy.Properties.Add('Version', Version);
-    Proxy.Properties.Add('Description', Description);
-    Proxy.Properties.Add('License', License);
     Proxy.Save;
     Result := Proxy.Id;
@@ -653 +627 @@
 end;
 
-function TChronisBase.IsDatabaseEmpty: Boolean;
-var
-  Proxy: TListProxy;
-begin
-  try
-    Proxy := TListProxy.Create;
-    Proxy.Client := Client;
-    Proxy.Path := 'information_schema';
-    Proxy.ObjectName := 'tables';
-    Proxy.Condition := 'table_name = "SystemModule" AND table_schema = "' +
-      Client.Schema + '"';
-    Proxy.Load;
-    Result := Proxy.Objects.Count = 0;
-  finally
-    Proxy.Free;
-  end;
-end;
-
 constructor TChronisBase.Create;
 begin
@@ -723 +679 @@
     List := TListProxy.Create;
     List.Client := Core.System.Client;
-    List.ObjectName := ObjectTable;
+    List.ObjectName := SystemObjectTable;
     List.Path := Core.System.Client.Schema;
     List.Condition := 'Id=' + IntToStr(ObjectId);
@@ -782 +738 @@
       Add('License', License);
       Add('Creator', Creator);
-      Add('HomePage', HomePage);
+      Add('Website', Website);
+      Add('Description', Description.Text);
     end;
     NewObject.Save;
@@ -813 +770 @@
     Name := SystemModuleObject;
     with Properties do begin
-      Add('SysName', 'String');
-      Add('Name', 'String');
-      Add('Version', 'String');
-      Add('License', 'String');
-      Add('Creator', 'String');
-      Add('HomePage', 'String');
-      Add('Installed', 'Boolean');
+      AddSimple('SysName', 'String');
+      AddSimple('Name', 'String');
+      AddSimple('Version', 'String');
+      AddSimple('License', 'String');
+      AddSimple('Creator', 'String');
+      AddSimple('Website', 'String');
+      AddSimple('Installed', 'Boolean');
+      AddSimple('Description', 'Text');
     end;
     Define;