Changeset 22 for trunk/Forms/UItemAdd.pas

Timestamp:

Jun 16, 2011, 12:18:21 PM (13 years ago)

Author:

george

Message:

• Modified: Optimalized reloading of columns list in item list.
• Fixed: Add and modify function.

File:

• trunk/Forms/UItemAdd.pas (modified) (6 diffs)

trunk/Forms/UItemAdd.pas

@@ -29 +29 @@
   public
     Report: TReport;
-    ControlList: TListObject;
-  end; 
+  end;
 
 var
@@ -59 +58 @@
     Data := TDictionaryStringString.Create;
     for I := 0 to Report.Columns.Count - 1 do
-    if TReportColumn(Report.Columns[I]).ColumnName <> 'Id' then begin
+    if not (TReportColumn(Report.Columns[I]).CustomType is TDataTypeRelationMany) then
+    if TReportColumn(Report.Columns[I]).ColumnName <> MainForm.SelectedObject.PrimaryKey then begin
       DataType := TReportColumn(Report.Columns[I]).CustomType;
-      Data.Add(TReportColumn(Report.Columns[I]).ColumnName, DataType.GetControlValue(TWinControl(ControlList[I])));
+      Data.Add(TReportColumn(Report.Columns[I]).ColumnName,
+        DataType.GetControlValue(TWinControl(TReportColumn(Report.Columns[I]).Control)));
     end;
     Database.Insert(MainForm.SelectedObject.Table, Data, MainForm.SelectedObject.Schema);
@@ -81 +82 @@
   Report := TReport.Create;
   Report.Base := Core.System;
-  ControlList := TListObject.Create;
-  ControlList.OwnsObjects := False;
 end;
 
@@ -88 +87 @@
 begin
   Report.Free;
-  ControlList.Free;
 end;
 
@@ -119 +117 @@
 
   // Load column names
-  ControlList.Clear;
     for I := 0 to Report.Columns.Count - 1 do
     if TReportColumn(Report.Columns[I]).ColumnName <> 'Id' then begin
@@ -138 +135 @@
         NewControl.Left := Column * Width div ColumnCount + (Width div ColumnCount) div 2;
         NewControl.Width := (Width div ColumnCount) div 2 - 20;
-        ControlList.Add(NewControl);
+        TReportColumn(Report.Columns[I]).Control := NewControl;
 
         Column := (Column + 1) mod 2;
         if Column = 0 then LastTop := LastTop + NewControl.Height + 4;
       end;
-    end else ControlList.Add(nil);
+    end;
 end;