Changeset 31 for trunk/Forms/UItemEdit.pas

Timestamp:

Nov 24, 2011, 10:03:48 AM (13 years ago)

Author:

chronos

Message:

• Modified: Item list is separated from MainForm as ItemListForm.
• Modified: Now it is possible to open multiple forms for same operation as View, Edit, Add, List. Open forms are listed in main windows tab list.

File:

• trunk/Forms/UItemEdit.pas (modified) (10 diffs)

trunk/Forms/UItemEdit.pas

@@ -46 +46 @@
     procedure TabControl1Change(Sender: TObject);
   private
-    SelectedItem: Integer;
     SubListObject: TChronisObject;
     TabObjectList: TListInteger;
@@ -52 +51 @@
     procedure LoadSubList;
   public
+    SelectedObject: TChronisObject;
+    SelectedItemId: Integer;
     Report: TReport;
     procedure BuildControls;
@@ -88 +89 @@
 procedure TItemEditForm.ButtonAddClick(Sender: TObject);
 begin
-  if Assigned(ListView1.Selected) then
-    ItemAddForm.Show;
+  ItemAddForm.Show;
 end;
 
@@ -99 +99 @@
   with TReportLine(Report[Item.Index]) do begin
     Item.Caption := Items[0];
+    Item.Data := Pointer(Id);
     for I := 1 to Items.Count - 1 do
     if not TReportColumn(Report.Columns[I]).VirtualItem then
@@ -127 +128 @@
     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 <> MainForm.SelectedObject.PrimaryKey then begin
+    if TReportColumn(Report.Columns[I]).ColumnName <> SelectedObject.PrimaryKey then begin
       DataType := TReportColumn(Report.Columns[I]).CustomType;
       Data.Add(TReportColumn(Report.Columns[I]).ColumnName,
         DataType.GetControlValue(TWinControl(TReportColumn(Report.Columns[I]).Control)));
     end;
-    Database.Update(MainForm.SelectedObject.Table, Data,
-      '`' + MainForm.SelectedObject.PrimaryKey + '` = ' + IntToStr(MainForm.SelectedItem), MainForm.SelectedObject.Schema);
+    Database.Update(SelectedObject.Table, Data,
+      '`' + SelectedObject.PrimaryKey + '` = ' + IntToStr(SelectedItemId), SelectedObject.Schema);
   finally
     Data.Free;
   end;
-  if (MainForm.SelectedObject.Table = ObjectGroupTable) or
-  (MainForm.SelectedObject.Table = ObjectTable) then
+  if (SelectedObject.Table = ObjectGroupTable) or
+  (SelectedObject.Table = ObjectTable) then
     MainForm.LoadTree;
-  MainForm.LoadItemList;
+  //MainForm.LoadItemList;
   Close;
 end;
@@ -166 +167 @@
   TabDataTypeList.OwnsObjects := False;
   TabControl1.Tabs.Clear;
+  SelectedObject := TChronisObject.Create;
+  SelectedObject.Base := Core.System;
 end;
 
@@ -174 +177 @@
   TabObjectList.Free;
   TabDataTypeList.Free;
+  SelectedObject.Free;
 end;
 
@@ -197 +201 @@
   LastTop := 8;
   Column := 0;
-  Report.Load(MainForm.SelectedObject, MainForm.SelectedObject.PrimaryKey + ' = ' +
-    IntToStr(MainForm.SelectedItem));
+  Report.Load(SelectedObject, SelectedObject.PrimaryKey + ' = ' +
+    IntToStr(SelectedItemId));
 
   // Clear previous controls on panel
@@ -215 +219 @@
         TabControl1.Tabs.Add(TReportColumn(Report.Columns[I]).Caption);
         TabDataTypeList.Add(DataType);
-        TabObjectList.Add(MainForm.SelectedItem);
+        TabObjectList.Add(SelectedItemId);
       end else begin
         NewControl := TLabel.Create(Panel1);
@@ -270 +274 @@
   Selected: Boolean);
 begin
-  if Assigned(ListView1.Selected) then
-    SelectedItem := TReportLine(Report[ListView1.Selected.Index]).Id
-    else SelectedItem := 0;
-
   ButtonDelete.Enabled := Assigned(ListView1.Selected);
   ButtonView.Enabled := Assigned(ListView1.Selected);