Changeset 29 for trunk/Forms

Timestamp:

Sep 10, 2022, 10:54:56 PM (2 years ago)

Author:

chronos

Message:

• Fixed: Load table fields in records list and record edit form.
• Fixed: Record add needs to insert new row into database.

Location:

trunk/Forms

Files:

• UFormConnect.lfm (modified) (4 diffs)
• UFormFields.pas (modified) (1 diff)
• UFormRecord.pas (modified) (4 diffs)
• UFormRecords.pas (modified) (5 diffs)
• UFormTables.pas (modified) (1 diff)

trunk/Forms/UFormConnect.lfm

@@ -87 +87 @@
         Left = 110
         Height = 43
-        Top = 25
+        Top = 16
         Width = 446
         Anchors = [akTop, akLeft, akRight]
@@ -107 +107 @@
       ClientWidth = 693
       object Label4: TLabel
-        Left = 17
+        Left = 19
         Height = 26
         Top = 19
@@ -124 +124 @@
         Left = 19
         Height = 26
-        Top = 58
+        Top = 72
         Width = 40
         Caption = 'Port:'
@@ -130 +130 @@
       end
       object SpinEditPort: TSpinEdit
-        Left = 150
+        Left = 152
         Height = 43
-        Top = 58
+        Top = 64
         Width = 133
         MaxValue = 65535

trunk/Forms/UFormFields.pas

@@ -160 +160 @@
 
 procedure TFormFields.ReloadList;
-var
-  DbRows: TDbRows;
-  NewField: TField;
-  I: Integer;
 begin
-  Fields.Clear;
-  DbRows := TDbRows.Create;
-  try
-    Fields.Table.DbClient.Query('SELECT * FROM ModelField WHERE Model = ' + Fields.Table.Name, DbRows);
-    for I := 0 to DbRows.Count - 1 do begin
-      NewField := Fields.AddNew(DbRows[I].Items['Name'],
-        Fields.Table.DbClient.DbManager.DataTypes.SearchByName(DbRows[I].Items['DataType']));
-      NewField.TextBefore := DbRows[I].Items['Caption'];
-    end;
-  finally
-    DbRows.Free;
-  end;
+  Fields.Load;
 
   ListView1.Items.Count := Fields.Count;

trunk/Forms/UFormRecord.pas

@@ -37 +37 @@
 
 uses
-  UDataTypes;
+  UDataTypes, UCore;
 
 {$R *.lfm}
@@ -86 +86 @@
 const
   LabelWidth = 300;
-begin
+var
+  LineHeight: Integer;
+begin
+  LineHeight := Core.ScaleDPI1.ScaleY(35, Core.ScaleDPI1.DesignDPI.Y);
+
   Row := DataRecord;
   Controls.Clear;
   Labels.Clear;
   for I := 0 to Table.Fields.Count - 1 do begin
-    CellRect := Rect(10, 10 + I * 35, Panel1.Width - 20, (I + 1) * 35);
+    CellRect := Rect(10, 10 + I * LineHeight, Panel1.Width - 20, (I + 1) * LineHeight);
     NewLabel := TLabel.Create(Panel1);
-    NewLabel.Caption := TField(Table.Fields[I]).TextBefore;
+    NewLabel.Caption := Table.Fields[I].TextBefore;
     NewLabel.Parent := Panel1;
     NewLabel.Left := CellRect.Left;
@@ -99 +103 @@
     NewLabel.Visible := True;
     Labels.Add(NewLabel);
-    case TField(Table.Fields[I]).DataType.FieldType of
+    case Table.Fields[I].DataType.FieldType of
       ftString: begin
         NewControl := TEdit.Create(Panel1);
@@ -183 +187 @@
 begin
   for I := 0 to Table.Fields.Count - 1 do begin
-    case TField(Table.Fields[I]).DataType.FieldType of
+    case Table.Fields[I].DataType.FieldType of
       ftString: TValueString(Row.Values[I]).Value := TEdit(Controls[I]).Text;
       ftInteger: TValueInteger(Row.Values[I]).Value := TSpinEdit(Controls[I]).Value;

trunk/Forms/UFormRecords.pas

@@ -60 +60 @@
     ToolBar1.Buttons[I].Hint := ToolBar1.Buttons[I].Caption;
   Caption := STable + ' - ' + Table.Caption;
+  Table.Fields.Load;
   ReloadList;
 end;
@@ -68 +69 @@
 begin
   if (Item.Index >= 0) and (Item.Index < Table.Records.Count) then
-  with TRecord(Table.Records[Item.Index]) do begin
+  with Table.Records[Item.Index] do begin
     for I := 0 to Table.Fields.Count - 1 do begin
-      if I = 0 then Item.Caption := TValue(Values[0]).GetString
-        else Item.SubItems.Add(TValue(Values[I]).GetString);
+      if I = 0 then Item.Caption := Values[0].GetString
+        else Item.SubItems.Add(Values[I].GetString);
     end;
     Item.Data := Table.Records[Item.Index];
@@ -116 +117 @@
   I: Integer;
   NewValue: TValue;
+  Columns: string;
+  Values: string;
 begin
   NewRecord := TRecord.Create;
-  NewRecord.Parent := Table;
+  NewRecord.Table := Table;
   NewRecord.Values.Count := Table.Fields.Count;
   for I := 0 to Table.Fields.Count - 1 do begin
-    ValueClass := TField(Table.Fields[I]).GetValueClass;
+    ValueClass := Table.Fields[I].GetValueClass;
     NewValue := ValueClass.Create;
     NewRecord.Values[I] := NewValue;
@@ -132 +135 @@
     if ShowModal = mrOk then begin
       Save(NewRecord);
-      Table.Records.Add(NewRecord);
+
+      Values := '';
+      Columns := '';
+      for I := 0 to Table.Fields.Count - 1 do begin
+        Columns := Columns + Table.Fields[I].Name;
+        Values := Values + '"' + NewRecord.Values[I].GetString + '"';
+        if I < Table.Fields.Count - 1 then begin
+          Columns := Columns + ' , ';
+          Values := Values + ' , ';
+        end;
+      end;
+      Table.DbClient.Query('INSERT INTO ' + Table.Name + ' ( ' + Columns + ' )' +
+        ' VALUES ( ' + Values + ' )');
+
+      NewRecord.Free;
       ReloadList;
     end else NewRecord.Free;
@@ -150 +167 @@
   I: Integer;
 begin
-  Table.LoadRecords;
+  Table.Records.Load;
 
   ListViewRecords.Columns.BeginUpdate;
-  while ListViewRecords.Columns.Count > Table.Fields.Count do
-    ListViewRecords.Columns[ListViewRecords.ColumnCount - 1].Free;
-  while ListViewRecords.Columns.Count < Table.Fields.Count do
-    ListViewRecords.Columns.Add;
-  for I := 0 to Table.Fields.Count - 1 do begin
-    ListViewRecords.Columns[I].Caption := TField(Table.Fields[I]).TextBefore;
-    ListViewRecords.Columns[I].Width := 200;
+  try
+    while ListViewRecords.Columns.Count > Table.Fields.Count do
+      ListViewRecords.Columns[ListViewRecords.ColumnCount - 1].Free;
+    while ListViewRecords.Columns.Count < Table.Fields.Count do
+      ListViewRecords.Columns.Add;
+    for I := 0 to Table.Fields.Count - 1 do begin
+      ListViewRecords.Columns[I].Caption := Table.Fields[I].TextBefore;
+      ListViewRecords.Columns[I].Width := 200;
+    end;
+  finally
+    ListViewRecords.Columns.EndUpdate;
   end;
-  ListViewRecords.Columns.EndUpdate;
 
   ListViewRecords.Items.Count := Table.Records.Count;

trunk/Forms/UFormTables.pas

@@ -73 +73 @@
   with TTable(FTables[Item.Index]) do begin
     Item.Caption := Caption;
-    Item.SubItems.Add(IntToStr(RecordsCount) + ' ' + IntToStr(Fields.Count));
+    Item.SubItems.Add(IntToStr(RecordsCount));
     Item.Data := FTables[Item.Index];
   end