Changeset 16 for trunk/USystem.pas

Timestamp:

Jun 13, 2011, 12:43:29 PM (13 years ago)

Author:

george

Message:

• Modified: Enhanced handling of RelationOne and RelationMany rdata types.
• Added: Planned/finished feature list.

File:

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

trunk/USystem.pas

@@ -48 +48 @@
     CustomType: TDataType;
     ColumnName: string;
+    VirtualItem: Boolean;
   end;
 
@@ -104 +105 @@
     function AddPropertyString(ObjectId: Integer; Name, ColumnName: string;
       Default: string = ''; MaxLength: Integer = 255): Integer;
+    function AddPropertyRelationOne(ObjectId: Integer; Name, ColumnName: string;
+      ReferedObject: Integer): Integer;
+    function AddPropertyRelationMany(ObjectId: Integer; Name, ColumnName: string;
+      ReferedObjectProperty: Integer): Integer;
     function AddObjectGroup(Name: string): Integer;
     function AddEnumeration(Name: string): Integer;
@@ -164 +169 @@
   NewColumn: TReportColumn;
   ColumnsQuery: string;
+  DataType: TDataType;
 begin
   Clear;
@@ -179 +185 @@
       NewColumn.CustomType := TDataTypeNumber.Create;
 
-      for I := 0 to Properties.Count - 1 do
-      if Properties[I].Values['CustomType'] <> IntToStr(Integer(vtRelationMany)) then begin
+      for I := 0 to Properties.Count - 1 do begin
+        DataType := GetDataType(StrToInt(Properties[I].Values['CustomType']));
         NewColumn := TReportColumn.Create;
         Columns.Add(NewColumn);
         NewColumn.Caption := Properties[I].Values['Name'];
         NewColumn.ColumnName := Properties[I].Values['ColumnName'];
-        NewColumn.CustomType := GetDataType(StrToInt(Properties[I].Values['CustomType']));
+        NewColumn.CustomType := DataType;
+        if (DataType is TDataTypeRelationMany) then NewColumn.VirtualItem := True;
       end;
 
@@ -192 +199 @@
       ColumnsQuery := '';
       for I := 0 to Columns.Count - 1 do
+        if not TReportColumn(Columns[I]).VirtualItem then
         ColumnsQuery := ColumnsQuery + ', `' + TReportColumn(Columns[I]).ColumnName + '`';
       System.Delete(ColumnsQuery, 1, 2);
@@ -202 +210 @@
         NewItem.Id := StrToInt(Values[I].Values[Obj.PrimaryKey]);
         for C := 0 to Properties.Count - 1 do
-        if Properties[C].Values['CustomType'] <> IntToStr(Integer(vtRelationMany)) then begin
-          NewItem.Items.Add(Values[I].Values[Properties[C].Values['ColumnName']]);
-        end;
+        if not TReportColumn(Columns[C]).VirtualItem then begin
+          NewItem.Items.Add(Values[I].Values[TReportColumn(Columns[C]).ColumnName]);
+        end else NewItem.Items.Add('');
         Add(NewItem);
       end;
@@ -328 +336 @@
     Data.Add('Default', Default);
     Database.Insert(TypeString, Data);
+    //CustomTypeId := Database.LastInsertId;
+
+    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId);
+  finally
+    Data.Free;
+    DbRows.Free;
+  end;
+end;
+
+function TChronisBase.AddPropertyRelationOne(ObjectId: Integer; Name,
+  ColumnName: string; ReferedObject: Integer): Integer;
+var
+  DbRows: TDbRows;
+  Data: TDictionaryStringString;
+  CustomTypeId: Integer;
+begin
+  try
+    DbRows := TDbRows.Create;
+    Data := TDictionaryStringString.Create;
+
+    Data.Clear;
+    Data.Add('Type', IntToStr(Integer(vtRelationOne)));
+    Database.Insert(CustomTypeTableName, Data);
+    CustomTypeId := Database.LastInsertId;
+
+    Data.Clear;
+    Data.Add('CustomType', IntToStr(CustomTypeId));
+    Data.Add('Object', IntToStr(ReferedObject));
+    Database.Insert(TypeRelationOne, Data);
+    //CustomTypeId := Database.LastInsertId;
+
+    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId);
+  finally
+    Data.Free;
+    DbRows.Free;
+  end;
+end;
+
+function TChronisBase.AddPropertyRelationMany(ObjectId: Integer; Name,
+  ColumnName: string; ReferedObjectProperty: Integer): Integer;
+var
+  DbRows: TDbRows;
+  Data: TDictionaryStringString;
+  CustomTypeId: Integer;
+begin
+  try
+    DbRows := TDbRows.Create;
+    Data := TDictionaryStringString.Create;
+
+    Data.Clear;
+    Data.Add('Type', IntToStr(Integer(vtRelationMany)));
+    Database.Insert(CustomTypeTableName, Data);
+    CustomTypeId := Database.LastInsertId;
+
+    Data.Clear;
+    Data.Add('CustomType', IntToStr(CustomTypeId));
+    Data.Add('ObjectProperty', IntToStr(ReferedObjectProperty));
+    Database.Insert(TypeRelationMany, Data);
     //CustomTypeId := Database.LastInsertId;