Changeset 9 for trunk/Forms/UItemEdit.pas

Timestamp:

Dec 26, 2010, 8:12:59 PM (14 years ago)

Author:

george

Message:

• Modified: Non-visual functions moved to USystem unit.
• Modified: Loading of object, properties and values rebuilded to general structures.

Location:

trunk

Files:

• . (modified) (1 prop)
• Forms/UItemEdit.pas (modified) (12 diffs)

trunk

@@ -2 +2 @@
 Config.xml
 chronis
+heaptrclog.trc

@@ -2 +2 @@
 Config.xml
 chronis
+heaptrclog.trc

trunk/Forms/UItemEdit.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  StdCtrls, Spin, EditBtn, USqlDatabase, MaskEdit;
+  StdCtrls, Spin, EditBtn, USqlDatabase, MaskEdit, USystem;
 
 type
@@ -20 +20 @@
     procedure ButtonSaveClick(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
+    procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
   private
     { private declarations }
   public
+    Report: TReport;
     procedure BuildControls;
   end; 
@@ -57 +60 @@
 end;
 
+procedure TItemEditForm.FormCreate(Sender: TObject);
+begin
+  Report := TReport.Create;
+  Report.Base := MainForm.System;
+end;
+
+procedure TItemEditForm.FormDestroy(Sender: TObject);
+begin
+  Report.Free;
+end;
+
 procedure TItemEditForm.FormShow(Sender: TObject);
 begin
@@ -65 +79 @@
 procedure TItemEditForm.BuildControls;
 var
-  Properties: TDbRows;
   Values: TDbRows;
   NewControl: TControl;
@@ -71 +84 @@
   I: Integer;
   Column: Integer;
-  ObjectInfo: TDbRows;
   ValueType: Integer;
 const
@@ -78 +90 @@
   LastTop := 8;
   Column := 0;
-  try
-  ObjectInfo := TDbRows.Create;
-  MainForm.Database.Query(ObjectInfo, 'SELECT * FROM `Object` WHERE `Id`=' + IntToStr(MainForm.SelectedObject));
-  if ObjectInfo.Count = 1 then begin
+  Report.Load(MainForm.SelectedObject, MainForm.SelectedObject.PrimaryKey + ' = ' +
+    IntToStr(MainForm.SelectedItem));
 
-    for I := Panel1.ControlCount - 1 downto 0 do
-      Panel1.Controls[I].Free;
+  for I := Panel1.ControlCount - 1 downto 0 do
+    Panel1.Controls[I].Free;
 
-    // Load column names
-    try
-    Properties := TDbRows.Create;
-    MainForm.Database.Query(Properties, 'SELECT * FROM `Property` WHERE `Object`=' +
-      IntToStr(MainForm.SelectedObject));
-    Values := TDbRows.Create;
-    MainForm.Database.Query(Values, 'SELECT * FROM `' + ObjectInfo[0].Values['Schema'] + '`.`' +
-      ObjectInfo[0].Values['Table'] + '` WHERE ' + ObjectInfo[0].Values['PrimaryKey'] + ' = ' +
-      IntToStr(MainForm.SelectedItem));
-    if Values.Count = 1 then
-    for I := 0 to Properties.Count - 1 do begin
+  if Report.Count = 1 then
+    for I := 0 to Report.Columns.Count - 1 do
+    if TReportColumn(Report.Columns[I]).ColumnName <> 'Id' then begin
+
       NewControl := TLabel.Create(Panel1);
       NewControl.Parent := Panel1;
       NewControl.Top := LastTop;
       NewControl.Left := Column * Width div ColumnCount + 10;
-      TLabel(NewControl).Caption := Properties[I].Values['Name'] + ':';
+      TLabel(NewControl).Caption := TReportColumn(Report.Columns[I]).Caption + ':';
 
-      ValueType := StrToInt(Properties[I].Values['Type']);
+      ValueType := TReportColumn(Report.Columns[I]).TypeId;
       if ValueType = Integer(vtInteger) then begin
         NewControl := TSpinEdit.Create(Panel1);
@@ -109 +112 @@
         NewControl.Top := LastTop;
         NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TSpinEdit(NewControl).Value := StrToInt(Values[0].Values[Properties[I].Values['ColumnName']]);
+        TSpinEdit(NewControl).Value := StrToInt(TReportLine(Report[0]).Items[I]);
         TSpinEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
       end else
@@ -117 +120 @@
         NewControl.Top := LastTop;
         NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TDateEdit(NewControl).Date := StrToDate(Values[0].Values[Properties[I].Values['ColumnName']]);
+        TDateEdit(NewControl).Date := StrToDate(TReportLine(Report[0]).Items[I]);
         TDateEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
       end else
@@ -125 +128 @@
         NewControl.Top := LastTop;
         NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TFloatSpinEdit(NewControl).Value := StrToFloat(Values[0].Values[Properties[I].Values['ColumnName']]);
+        TFloatSpinEdit(NewControl).Value := StrToFloat(TReportLine(Report[0]).Items[I]);
         TFloatSpinEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
       end else
@@ -133 +136 @@
         NewControl.Top := LastTop;
         NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TEdit(NewControl).Text := Values[0].Values[Properties[I].Values['ColumnName']];
+        TEdit(NewControl).Text := TReportLine(Report[0]).Items[I];
         TEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
       end else
@@ -148 +151 @@
         NewControl.Top := LastTop;
         NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
-        TCheckBox(NewControl).Checked := Boolean(StrToInt(Values[0].Values[Properties[I].Values['ColumnName']]));
+        TCheckBox(NewControl).Checked := Boolean(StrToInt(TReportLine(Report[0]).Items[I]));
       end else begin
         NewControl := TEdit.Create(Panel1);
@@ -155 +158 @@
         NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
         TEdit(NewControl).Width := (Width div ColumnCount) div 2 - 20;
-        TEdit(NewControl).Text := Values[0].Values[Properties[I].Values['ColumnName']];
+        TEdit(NewControl).Text := TReportLine(Report[0]).Items[I];
       end;
 
       Column := (Column + 1) mod 2;
       if Column = 0 then LastTop := LastTop + NewControl.Height + 4;
-    end else ShowMessage(SItemNotFound);
-    finally
-      Values.Free;
-      Properties.Free;
-    end;
-  end else ShowMessage(SObjectNotFound);
-  finally
-    ObjectInfo.Free;
-  end;
+   end;
 end;
 

@@ -2 +2 @@
 Config.xml
 chronis
+heaptrclog.trc