Changeset 35 for trunk/Forms

Timestamp:

Nov 25, 2011, 9:17:21 AM (13 years ago)

Author:

chronos

Message:

• Modified: More direct SQL queries replaced by TChronisClient execution.

File:

• trunk/Forms/UMainForm.pas (modified) (3 diffs)

trunk/Forms/UMainForm.pas

@@ -112 +112 @@
   UItemView, UItemEdit, UItemAdd, ULoginForm, USettingForm, UApplicationInfo,
   UCore, UImportStructureForm, UAboutForm, ULoginProfileForm, UChronisClientDirect,
-  UItemList;
+  UItemList, UChronisClient;
 
 {$R *.lfm}
@@ -334 +334 @@
 procedure TMainForm.LoadTree;
 var
-  DbRows: TDbRows;
-  ObjectDbRows: TDbRows;
+  Groups: TListProxy;
+  Obj: TObjectProxy;
+  Objects: TListProxy;
+  Obj2: TObjectProxy;
   I: Integer;
   O: Integer;
@@ -348 +350 @@
     TopItem.SelectedIndex := 0;
     try
-      DbRows := TDbRows.Create;
-      Core.System.Database.Query(DbRows, 'SELECT * FROM `' + ObjectGroupTable + '`');
-      for I := 0 to DbRows.Count - 1 do begin
-        NewNode := AddChild(TopItem, DbRows[I].Values['Name']);
+      Groups := TListProxy.Create;
+      Groups.Client := Core.System.Client;
+      Groups.ObjectName := ObjectGroupTable;
+      Groups.SchemaName := Core.System.Database.Database;
+      Groups.Load;
+      for I := 0 to Groups.Objects.Count - 1 do begin
+        Obj := TObjectProxy(Groups.Objects[I]);
+        NewNode := AddChild(TopItem, Obj.Properties.Values['Name']);
         NewNode.ImageIndex := 0;
         NewNode.SelectedIndex := 0;
-        NewNode.Data := Pointer(StrToInt(DbRows[I].Values['Id']));
+        NewNode.Data := Pointer(StrToInt(Obj.Properties.Values['Id']));
         try
-          ObjectDbRows := TDbRows.Create;
-          Core.System.Database.Query(ObjectDbRows, 'SELECT * FROM `' + ObjectTable + '` WHERE `Group`=' + DbRows[I].Values['Id']);
-          for O := 0 to ObjectDbRows.Count - 1 do begin
-            NewObjectNode := AddChild(NewNode, ObjectDbRows[O].Values['Name']);
-            NewObjectNode.Data := Pointer(StrToInt(ObjectDbRows[O].Values['Id']));
+          Objects := TListProxy.Create;
+          Objects.Client := Core.System.Client;
+          Objects.ObjectName := ObjectTable;
+          Objects.SchemaName := Core.System.Database.Database;
+          Objects.SetCondition('Group', Obj.Properties.Values['Id']);
+          Objects.Load;
+          for O := 0 to Objects.Objects.Count - 1 do begin
+            Obj2 := TObjectProxy(Objects.Objects[O]);
+            NewObjectNode := AddChild(NewNode, Obj2.Properties.Values['Name']);
+            NewObjectNode.Data := Pointer(StrToInt(Obj2.Properties.Values['Id']));
             NewObjectNode.ImageIndex := 1;
             NewObjectNode.SelectedIndex := 1;
           end;
         finally
-          ObjectDbRows.Free;
+          Objects.Free;
         end;
       end;
       TopItem.Expand(True);
     finally
-      DbRows.Free;
+      Groups.Free;
     end;
     TreeState.LoadTree(TreeView1);