Changeset 37 for trunk/Forms

Timestamp:

Mar 8, 2012, 3:11:10 PM (13 years ago)

Author:

chronos

Message:

• Modified: Direct acces using Database: TSqlDatabase replaced by TChronisClient interface.

Location:

trunk/Forms

Files:

• UItemAdd.pas (modified) (3 diffs)
• UItemEdit.pas (modified) (4 diffs)
• UMainForm.pas (modified) (5 diffs)

trunk/Forms/UItemAdd.pas

@@ -8 +8 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
   StdCtrls, Spin, EditBtn, MaskEdit, USqlDatabase, USystem,
-  SpecializedDictionary, SpecializedList;
+  SpecializedDictionary, SpecializedList, UChronisClient;
 
 type
@@ -53 +53 @@
 var
   Data: TDictionaryStringString;
+  NewProxy: TObjectProxy;
   I: Integer;
   DataType: TDataType;
@@ -59 +60 @@
   try
     Data := TDictionaryStringString.Create;
+    NewProxy := TObjectProxy.Create;
+    NewProxy.Client := Client;
+    NewProxy.ObjectName := SelectedObject.Table;
+    NewProxy.SchemaName := SelectedObject.Schema;
     for I := 0 to Report.Columns.Count - 1 do
     if not (TReportColumn(Report.Columns[I]).CustomType is TDataTypeRelationMany) then
     if TReportColumn(Report.Columns[I]).ColumnName <> SelectedObject.PrimaryKey then begin
       DataType := TReportColumn(Report.Columns[I]).CustomType;
-      Data.Add(TReportColumn(Report.Columns[I]).ColumnName,
+      NewProxy.Properties.Add(TReportColumn(Report.Columns[I]).ColumnName,
         DataType.GetControlValue(TWinControl(TReportColumn(Report.Columns[I]).Control)));
     end;
-    Database.Insert(SelectedObject.Table, Data, SelectedObject.Schema);
+    NewProxy.Save;
   finally
     Data.Free;
+    NewProxy.Free;
   end;
   //MainForm.LoadItemList;

trunk/Forms/UItemEdit.pas

@@ -1 +1 @@
 unit UItemEdit;
 
-{$mode objfpc}{$H+}
+{$mode Delphi}{$H+}
 
 interface
@@ -8 +8 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
   StdCtrls, Spin, EditBtn, USqlDatabase, MaskEdit, ComCtrls, USystem,
-  SpecializedList, SpecializedDictionary;
+  SpecializedList, SpecializedDictionary, UChronisClient;
 
 type
@@ -119 +119 @@
 procedure TItemEditForm.ButtonSaveClick(Sender: TObject);
 var
-  Data: TDictionaryStringString;
+  Proxy: TObjectProxy;
   I: Integer;
   DataType: TDataType;
@@ -125 +125 @@
   with Core.System do
   try
-    Data := TDictionaryStringString.Create;
+    Proxy := TObjectProxy.Create;
+    Proxy.Client := Client;
+    Proxy.ObjectName := SelectedObject.Table;
+    Proxy.SchemaName := SelectedObject.Schema;
+    Proxy.Id := SelectedItemId;
     for I := 0 to Report.Columns.Count - 1 do
     if not (TReportColumn(Report.Columns[I]).CustomType is TDataTypeRelationMany) then
     if TReportColumn(Report.Columns[I]).ColumnName <> SelectedObject.PrimaryKey then begin
       DataType := TReportColumn(Report.Columns[I]).CustomType;
-      Data.Add(TReportColumn(Report.Columns[I]).ColumnName,
+      Proxy.Properties.Add(TReportColumn(Report.Columns[I]).ColumnName,
         DataType.GetControlValue(TWinControl(TReportColumn(Report.Columns[I]).Control)));
     end;
-    Database.Update(SelectedObject.Table, Data,
-      '`' + SelectedObject.PrimaryKey + '` = ' + IntToStr(SelectedItemId), SelectedObject.Schema);
+    Proxy.Save;
   finally
-    Data.Free;
+    Proxy.Free;
   end;
   if (SelectedObject.Table = ObjectGroupTable) or

trunk/Forms/UMainForm.pas

@@ -148 +148 @@
 procedure TMainForm.UpdateInterface;
 begin
-  ADisconnect.Enabled := Core.System.Database.Connected;
-  AConnect.Enabled := not Core.System.Database.Connected;
-  AImportStructure.Enabled := Core.System.Database.Connected;
+  ADisconnect.Enabled := Core.System.Client.Connected;
+  AConnect.Enabled := not Core.System.Client.Connected;
+  AImportStructure.Enabled := Core.System.Client.Connected;
   if Assigned(MainPanelForm) then
     Caption := MainPanelForm.Caption + ' - ' + ApplicationInfo.Name
@@ -257 +257 @@
   if LoginForm.ShowModal = mrOK then begin
     with TConnectProfile(Core.Profiles[Core.LastProfile]) do begin
-      Core.System.Database.HostName := HostName;
-      Core.System.Database.Database := Database;
-      Core.System.Database.UserName := Core.LastUserName;
-      Core.System.Database.Password := Core.LastPassword;
-      Core.System.Database.Port := Port;
+      Core.System.Client.Host := HostName;
+      Core.System.Client.Schema := Database;
+      Core.System.Client.User := Core.LastUserName;
+      Core.System.Client.Password := Core.LastPassword;
+      Core.System.Client.Port := Port;
       if Protocol = cpDirect then Core.Client := TChronisClientDirect.Create;
     end;
     try
-      Core.System.Database.Connect;
+      Core.System.Client.Connect;
       if Core.System.IsDatabaseEmpty then Core.System.ModuleSystem.Install;
       Core.System.LoadTypes;
@@ -277 +277 @@
 procedure TMainForm.ADisconnectExecute(Sender: TObject);
 begin
-  if Core.System.Database.Connected then begin
-    Core.System.Database.Disconnect;
+  if Core.System.Client.Connected then begin
+    Core.System.Client.Disconnect;
     TreeView1.Items.Clear;
     Core.System.Types.Clear;
@@ -361 +361 @@
       Groups.Client := Core.System.Client;
       Groups.ObjectName := ObjectGroupTable;
-      Groups.SchemaName := Core.System.Database.Database;
+      Groups.SchemaName := Core.System.Client.Schema;
       Groups.Load;
       for I := 0 to Groups.Objects.Count - 1 do begin
@@ -373 +373 @@
           Objects.Client := Core.System.Client;
           Objects.ObjectName := ObjectTable;
-          Objects.SchemaName := Core.System.Database.Database;
-          Objects.SetCondition('Group', Obj.Properties.Values['Id']);
+          Objects.SchemaName := Core.System.Client.Schema;
+          Objects.Condition := '`Group`="' + Obj.Properties.Values['Id'] + '"';
           Objects.Load;
           for O := 0 to Objects.Objects.Count - 1 do begin