Changeset 21 for trunk/USystem.pas

Timestamp:

Jun 16, 2011, 10:32:01 AM (13 years ago)

Author:

george

Message:

• Added: Item selection form for TypeRelationOne.
• Modified: Primary keys have to have their property record for each object.
• Added: Object propery havet to be initialized with Editable flag.

File:

• trunk/USystem.pas (modified) (21 diffs)

trunk/USystem.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, SpecializedList, SpecializedDictionary, USqlDatabase,
-  Strings, UDataTypes, Dialogs;
+  Strings, UDataTypes, Dialogs, ComCtrls, StdCtrls;
 
 const
@@ -53 +53 @@
   end;
 
+  { TReport }
+
   TReport = class(TListObject)
     Base: TChronisBase;
@@ -58 +60 @@
     constructor Create;
     destructor Destroy; override;
+    procedure FillListColumns(AColumns: TListColumns);
     procedure Load(Obj: TChronisObject; Filter: string = '');
   end;
@@ -102 +105 @@
     function AddGroup(Name: string; ParentGroupId: Integer = 0): Integer;
     function AddObject(Name, TableName, Schema: string; GroupId: Integer): Integer;
-    function AddProperty(ObjectId: Integer; Name, ColumnName: string; CustomType: Integer): Integer;
+    function AddProperty(ObjectId: Integer; Name, ColumnName: string;
+      CustomType: Integer; Editable: Boolean): Integer;
     function AddPropertyNumber(ObjectId: Integer; Name,
-      ColumnName: string; Default: Integer = 0; Min: Integer = Low(Integer);
+      ColumnName: string; Editable: Boolean; Default: Integer = 0; Min: Integer = Low(Integer);
       Max: Integer = High(Integer)): Integer;
     function AddPropertyFloat(ObjectId: Integer; Name,
-      ColumnName: string; Default: Double = 0; Min: Double = 0;
+      ColumnName: string; Editable: Boolean; Default: Double = 0; Min: Double = 0;
       Max: Double = 0): Integer;
     function AddPropertyDateTime(ObjectId: Integer; Name,
-      ColumnName: string; Default: TDateTime = 0; Min: TDateTime = 0;
+      ColumnName: string; Editable: Boolean; Default: TDateTime = 0; Min: TDateTime = 0;
       Max: TDateTime = 0): Integer;
     function AddPropertyString(ObjectId: Integer; Name, ColumnName: string;
-      Default: string = ''; MaxLength: Integer = 255): Integer;
+      Editable: Boolean; Default: string = ''; MaxLength: Integer = 255): Integer;
     function AddPropertyRelationOne(ObjectId: Integer; Name, ColumnName: string;
-      ReferedObject: Integer): Integer;
+      Editable: Boolean; ReferedObject: Integer): Integer;
     function AddPropertyRelationMany(ObjectId: Integer; Name, ColumnName: string;
-      ReferedObjectProperty: Integer): Integer;
+      Editable: Boolean; ReferedObjectProperty: Integer): Integer;
     function AddObjectGroup(Name: string): Integer;
     function AddEnumeration(Name: string): Integer;
@@ -188 +192 @@
         '` WHERE `Object`=' + IntToStr(Obj.Id));
       Columns.Clear;
-      NewColumn := TReportColumn.Create;
-      Columns.Add(NewColumn);
-      NewColumn.Caption := 'Id';
-      NewColumn.ColumnName := 'Id';
-      NewColumn.CustomType := TDataTypeNumber.Create;
 
       for I := 0 to Properties.Count - 1 do begin
@@ -212 +211 @@
       System.Delete(ColumnsQuery, 1, 2);
       if Filter <> '' then Filter := ' WHERE ' + Filter;
-      Base.Database.Query(Values, 'SELECT ' + ColumnsQuery + ' FROM `' + Obj.Schema + '`.`' +
+      Base.Database.Query(Values, 'SELECT ' + ColumnsQuery + ', `' + Obj.PrimaryKey + '` AS `SYS_PRIMARY_KEY`  FROM `' + Obj.Schema + '`.`' +
         Obj.Table + '`' + Filter);
       for I := 0 to Values.Count - 1 do begin
         NewItem := TReportLine.Create;
         //NewItem.Items.Add(Values[I].Values[Obj.PrimaryKey]);
-        NewItem.Id := StrToInt(Values[I].Values[Obj.PrimaryKey]);
+        NewItem.Id := StrToInt(Values[I].Values['SYS_PRIMARY_KEY']);
         for C := 0 to Columns.Count - 1 do
         if not TReportColumn(Columns[C]).VirtualItem then begin
@@ -289 +288 @@
 
 function TChronisBase.AddProperty(ObjectId: Integer; Name, ColumnName: string;
-  CustomType: Integer): Integer;
+  CustomType: Integer; Editable: Boolean): Integer;
 var
   DbRows: TDbRows;
@@ -301 +300 @@
     Data.Add('ColumnName', ColumnName);
     Data.Add('CustomType', IntToStr(CustomType));
-    Data.Add('Editable', '1');
+    Data.Add('Editable', IntToStr(Integer(Editable)));
     Database.Insert(PropertyTable, Data);
     Result := Database.LastInsertId;
@@ -311 +310 @@
 
 function TChronisBase.AddPropertyNumber(ObjectId: Integer; Name,
-  ColumnName: string; Default: Integer = 0; Min: Integer = Low(Integer);
+  ColumnName: string; Editable: Boolean; Default: Integer = 0; Min: Integer = Low(Integer);
   Max: Integer = High(Integer)): Integer;
 var
@@ -335 +334 @@
     //CustomTypeId := Database.LastInsertId;
 
-    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId);
+    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId, Editable);
   finally
     Data.Free;
@@ -343 +342 @@
 
 function TChronisBase.AddPropertyFloat(ObjectId: Integer; Name,
-  ColumnName: string; Default: Double; Min: Double; Max: Double): Integer;
+  ColumnName: string; Editable: Boolean; Default: Double; Min: Double; Max: Double): Integer;
 var
   DbRows: TDbRows;
@@ -366 +365 @@
     //CustomTypeId := Database.LastInsertId;
 
-    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId);
+    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId, Editable);
   finally
     Data.Free;
@@ -374 +373 @@
 
 function TChronisBase.AddPropertyDateTime(ObjectId: Integer; Name,
-  ColumnName: string; Default: TDateTime; Min: TDateTime; Max: TDateTime
+  ColumnName: string; Editable: Boolean; Default: TDateTime; Min: TDateTime; Max: TDateTime
   ): Integer;
 var
@@ -398 +397 @@
     //CustomTypeId := Database.LastInsertId;
 
-    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId);
+    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId, Editable);
   finally
     Data.Free;
@@ -406 +405 @@
 
 function TChronisBase.AddPropertyString(ObjectId: Integer; Name,
-  ColumnName: string; Default: string = ''; MaxLength: Integer = 255): Integer;
+  ColumnName: string; Editable: Boolean; Default: string = ''; MaxLength: Integer = 255): Integer;
 var
   DbRows: TDbRows;
@@ -428 +427 @@
     //CustomTypeId := Database.LastInsertId;
 
-    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId);
+    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId, Editable);
   finally
     Data.Free;
@@ -436 +435 @@
 
 function TChronisBase.AddPropertyRelationOne(ObjectId: Integer; Name,
-  ColumnName: string; ReferedObject: Integer): Integer;
+  ColumnName: string; Editable: Boolean; ReferedObject: Integer): Integer;
 var
   DbRows: TDbRows;
@@ -457 +456 @@
     //CustomTypeId := Database.LastInsertId;
 
-    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId);
+    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId, Editable);
   finally
     Data.Free;
@@ -465 +464 @@
 
 function TChronisBase.AddPropertyRelationMany(ObjectId: Integer; Name,
-  ColumnName: string; ReferedObjectProperty: Integer): Integer;
+  ColumnName: string; Editable: Boolean; ReferedObjectProperty: Integer): Integer;
 var
   DbRows: TDbRows;
@@ -486 +485 @@
     //CustomTypeId := Database.LastInsertId;
 
-    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId);
+    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId, Editable);
   finally
     Data.Free;
@@ -591 +590 @@
   Columns.Free;
   inherited Destroy;
+end;
+
+procedure TReport.FillListColumns(AColumns: TListColumns);
+var
+  I: Integer;
+  NewColumn: TListColumn;
+begin
+  AColumns.Clear;
+  for I := 0 to Columns.Count - 1 do
+  if not TReportColumn(Columns[I]).VirtualItem then begin
+    NewColumn := AColumns.Add;
+    NewColumn.Caption := TReportColumn(Columns[I]).Caption;
+  end;
 end;