Changeset 53

Timestamp:

Apr 3, 2012, 8:31:39 AM (12 years ago)

Author:

chronos

Message:

• Opraveno: Aktualizace seznamu modulů do databáze a použití příznaku modulů "Instalován" pro zjištění, zda vytvářet znova strukturu.

Location:

trunk/Client

Files:

• Application/UChronisModule.pas (modified) (5 diffs)
• Components/PersistentData-0.1.zip (modified) ( previous)
• Forms/UFormItemAdd.pas (modified) (1 diff)
• Forms/UFormItemEdit.pas (modified) (1 diff)
• Forms/UFormMenu.pas (modified) (2 diffs)
• Module/UModuleSystem.pas (modified) (1 diff)
• Module/UModuleUser.pas (modified) (1 diff)
• UCore.pas (modified) (3 diffs)
• USystem.pas (modified) (7 diffs)

trunk/Client/Application/UChronisModule.pas

@@ -45 +45 @@
   List := TListProxy.Create;
   List.Client := TChronisBase(System).Client;
-  List.SchemaName := TChronisBase(System).Client.Schema;
+  List.Path := TChronisBase(System).Client.Schema;
   List.ObjectName := SystemModuleObject;
   List.Condition := '(SysName="' + SysName + '") AND (Installed=1)';
@@ -60 +60 @@
   List := TListProxy.Create;
   List.Client := TChronisBase(System).Client;
-  List.SchemaName := TChronisBase(System).Client.Schema;
+  List.Path := TChronisBase(System).Client.Schema;
   List.ObjectName := SystemModuleObject;
   List.Condition := 'SysName="' + SysName + '"';
@@ -68 +68 @@
     NewObject.Id := StrToInt(TObjectProxy(List.Objects[0]).Properties.Values['Id']);
     NewObject.Client := TChronisBase(System).Client;
-    NewObject.SchemaName := TChronisBase(System).Client.Schema;
+    NewObject.Path := TChronisBase(System).Client.Schema;
     NewObject.ObjectName := SystemModuleObject;
     NewObject.Properties.Add('Installed', '1');
@@ -84 +84 @@
   List := TListProxy.Create;
   List.Client := TChronisBase(System).Client;
-  List.SchemaName := TChronisBase(System).Client.Schema;
+  List.Path := TChronisBase(System).Client.Schema;
   List.ObjectName := SystemModuleObject;
   List.Condition := 'SysName="' + SysName + '"';
@@ -92 +92 @@
     NewObject.Id := StrToInt(TObjectProxy(List.Objects[0]).Properties.Values['Id']);
     NewObject.Client := TChronisBase(System).Client;
-    NewObject.SchemaName := TChronisBase(System).Client.Schema;
+    NewObject.Path := TChronisBase(System).Client.Schema;
     NewObject.ObjectName := SystemModuleObject;
     NewObject.Properties.Add('Installed', '0');

trunk/Client/Forms/UFormItemAdd.pas

@@ -64 +64 @@
     NewProxy.Client := Client;
     NewProxy.ObjectName := SelectedObject.Table;
-    NewProxy.SchemaName := SelectedObject.Schema;
+    NewProxy.Path := SelectedObject.Schema;
     for I := 0 to Report.Columns.Count - 1 do
     if not (TReportColumn(Report.Columns[I]).CustomType is TDataTypeRelationMany) then

trunk/Client/Forms/UFormItemEdit.pas

@@ -128 +128 @@
     Proxy.Client := Client;
     Proxy.ObjectName := SelectedObject.Table;
-    Proxy.SchemaName := SelectedObject.Schema;
+    Proxy.Path := SelectedObject.Schema;
     Proxy.Id := SelectedItemId;
     for I := 0 to Report.Columns.Count - 1 do

trunk/Client/Forms/UFormMenu.pas

@@ -142 +142 @@
       Groups.Client := Core.System.Client;
       Groups.ObjectName := ObjectGroupTable;
-      Groups.SchemaName := Core.System.Client.Schema;
+      Groups.Path := Core.System.Client.Schema;
       Groups.Load;
       for I := 0 to Groups.Objects.Count - 1 do begin
@@ -154 +154 @@
           Objects.Client := Core.System.Client;
           Objects.ObjectName := ObjectTable;
-          Objects.SchemaName := Core.System.Client.Schema;
+          Objects.Path := Core.System.Client.Schema;
           Objects.Condition := '`Group`="' + Obj.Properties.Values['Id'] + '"';
           Objects.Load;

trunk/Client/Module/UModuleSystem.pas

@@ -312 +312 @@
 begin
   inherited Create;
+  SysName := 'System';
   Name := 'System';
+  Version := '1.0';
 end;
 

trunk/Client/Module/UModuleUser.pas

@@ -37 +37 @@
 constructor TModuleUser.Create;
 begin
+  SysName := 'User';
   Name := 'User';
+  Version := '1.0';
   inherited Create;
 end;

trunk/Client/UCore.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, UCoolTranslator, UDebugLog, USystem, Registry,
-  USqlDatabase, UFormLoginProfile, URegistry, UPDClient, UModuleSystem;
+  USqlDatabase, UFormLoginProfile, URegistry, UPDClient;
 
 type
@@ -38 +38 @@
   Core: TCore;
 
+
 implementation
 
+uses
+  UModuleSystem, UModuleUser, UApplicationInfo;
+
 {$R *.lfm}
-
-uses
-  UApplicationInfo;
 
 { TCore }
@@ -58 +59 @@
   System.RegisterModule(TModuleSystem);
   System.ModuleSystem := TModuleSystem(System.Modules.Last);
+  System.RegisterModule(TModuleUser);
 
   {$IFDEF DEBUG}

trunk/Client/USystem.pas

@@ -194 +194 @@
       Properties.Client := Base.Client;
       Properties.ObjectName := PropertyTable;
-      Properties.SchemaName := Base.Client.Schema;
+      Properties.Path := Base.Client.Schema;
       Properties.Condition := 'Object="' + IntToStr(Obj.Id) + '"';
       Properties.Load;
@@ -219 +219 @@
       Values.ColummsFilterUse := True;
       Values.ObjectName := Obj.Table;
-      Values.SchemaName := Obj.Schema;
+      Values.Path := Obj.Schema;
       Values.Condition := Filter;
       Values.Load;
@@ -249 +249 @@
     Client.Connect;
     if Client.Connected then begin
+      if not Modules.IsInstalled then begin
+        Modules.Install;
+        Modules.UpdateList;
+      end;
+      Modules.UpdateList;
       if not ModuleSystem.IsInstalled then ModuleSystem.Install;
       LoadTypes;
@@ -273 +278 @@
     Proxy.Client := Client;
     Proxy.ObjectName := PropertyTypeTable;
+    Proxy.Id := Integer(TypeIndex);
     Proxy.Properties.Add('Name', Name);
     Proxy.Properties.Add('DbType', DataType);
-    Proxy.Properties.Add('Id', IntToStr(Integer(TypeIndex)));
     Proxy.Save;
     Result := Proxy.Id;
@@ -655 +660 @@
     Proxy := TListProxy.Create;
     Proxy.Client := Client;
-    Proxy.SchemaName := 'information_schema';
+    Proxy.Path := 'information_schema';
     Proxy.ObjectName := 'tables';
     Proxy.Condition := 'table_name = "SystemModule" AND table_schema = "' +
@@ -719 +724 @@
     List.Client := Core.System.Client;
     List.ObjectName := ObjectTable;
-    List.SchemaName := Core.System.Client.Schema;
+    List.Path := Core.System.Client.Schema;
     List.Condition := 'Id=' + IntToStr(ObjectId);
     List.Load;
@@ -758 +763 @@
   List := TListProxy.Create;
   List.Client := Base.Client;
-  List.SchemaName := Base.Client.Schema;
-  NewObject := TObjectProxy.Create;
-  NewObject.Client := Base.Client;
+  List.Path := Base.Client.Schema;
+  List.ObjectName := SystemModuleObject;
   for I := 0 to Count - 1 do
   with TChronisModule(Items[I]) do begin
     List.Condition := 'SysName="' + SysName + '"';
     List.Load;
+    NewObject := TObjectProxy.Create;
+    NewObject.Client := Base.Client;
     if List.Objects.Count > 0 then
       NewObject.Id := StrToInt(TObjectProxy(List.Objects[0]).Properties.Values['Id'])
       else NewObject.Id := 0;
-    NewObject.SchemaName := Base.Client.Schema;
+    NewObject.Path := Base.Client.Schema;
     NewObject.ObjectName := SystemModuleObject;
-    NewObject.Properties.Add('SysName', SysName);
-    NewObject.Properties.Add('Name', Name);
-    NewObject.Properties.Add('Version', Version);
-    NewObject.Properties.Add('License', License);
-    NewObject.Properties.Add('Creator', Creator);
-    NewObject.Properties.Add('HomePage', HomePage);
+    with NewObject.Properties do begin
+      Add('SysName', SysName);
+      Add('Name', Name);
+      Add('Version', Version);
+      Add('License', License);
+      Add('Creator', Creator);
+      Add('HomePage', HomePage);
+    end;
     NewObject.Save;
-  end;
-  NewObject.Free;
+    NewObject.Free;
+  end;
   List.Free;
 end;