Changeset 16 for trunk/Forms

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.

Location:

trunk/Forms

Files:

• UItemView.pas (modified) (1 diff)
• UMainForm.pas (modified) (8 diffs)

trunk/Forms/UItemView.pas

@@ -110 +110 @@
   for I := 0 to Report.Columns.Count - 1 do begin
     DataType := TReportColumn(Report.Columns[I]).CustomType;
-  if DataType is TDataTypeRelationOne then begin
+  if DataType is TDataTypeRelationMany then begin
     TabControl1.Tabs.Add(TReportColumn(Report.Columns[I]).Caption);
   end else begin

trunk/Forms/UMainForm.pas

@@ -289 +289 @@
       Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + TypeRelationOne + '` ( ' +
         '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-        '`Type` int(11) NOT NULL,' +
+        '`CustomType` int(11) NOT NULL,' +
         '`Object` int(11) NOT NULL,' +
-        'KEY `Type` (`Type`),' +
+        'KEY `CustomType` (`CustomType`),' +
         'PRIMARY KEY (`Id`)' +
         ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
@@ -299 +299 @@
       Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + TypeRelationMany + '` ( ' +
         '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-        '`Type` int(11) NOT NULL,' +
+        '`CustomType` int(11) NOT NULL,' +
         '`ObjectProperty` int(11) NOT NULL,' +
-        'KEY `Type` (`Type`),' +
+        'KEY `CustomType` (`CustomType`),' +
         'PRIMARY KEY (`Id`)' +
         ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
@@ -365 +365 @@
 var
   ObjectId: Integer;
+  ObjectGroupId: Integer;
+  PropertyParentId: Integer;
+  ObjectPropertyGroupId: Integer;
+  PropertyTypeId: Integer;
+  ObjectPropertyId: Integer;
+  ObjectPropertyIdGroup: Integer;
+  PropertyObjectId: Integer;
+  CustomTypeId: Integer;
+  CustomTypeIdType: Integer;
+  ObjectIdGroupId: Integer;
   TypeNumber: Integer;
+  ObjectGroupParentId: Integer;
   TypeString: Integer;
   TypeBoolean: Integer;
@@ -405 +416 @@
   GroupId := AddObjectGroup('System');
 
-  ObjectId := AddObject('Object groups', 'ObjectGroup', Core.System.Database.Database, GroupId);
-    AddPropertyString(ObjectId, 'Name', 'Name');
-    AddPropertyNumber(ObjectId, 'Parent', 'Parent');
+  ObjectGroupId := AddObject('Object groups', 'ObjectGroup', Core.System.Database.Database, GroupId);
+    AddPropertyString(ObjectGroupId, 'Name', 'Name');
+    ObjectGroupParentId := AddPropertyRelationOne(ObjectGroupId, 'Parent', 'Parent', ObjectGroupId);
+
   ObjectId := AddObject('Objects', 'Object', Core.System.Database.Database, GroupId);
     AddPropertyString(ObjectId, 'Name', 'Name');
-    AddPropertyNumber(ObjectId, 'Group', 'Group');
+    ObjectIdGroupId := AddPropertyRelationOne(ObjectId, 'Group', 'Group', ObjectGroupId);
     AddPropertyString(ObjectId, 'Schema', 'Schema');
     AddPropertyString(ObjectId, 'Table', 'Table');
     AddPropertyString(ObjectId, 'Primary key', 'PrimaryKey');
     AddPropertyNumber(ObjectId, 'Sequence', 'Sequence');
-  ObjectId := AddObject('Property types', 'Type', Core.System.Database.Database, GroupId);
-    AddPropertyString(ObjectId, 'Name', 'Name');
-    AddPropertyString(ObjectId, 'Type', 'DbType');
+
+  PropertyTypeId := AddObject('Property types', 'Type', Core.System.Database.Database, GroupId);
+    AddPropertyString(PropertyTypeId, 'Name', 'Name');
+    AddPropertyString(PropertyTypeId, 'Type', 'DbType');
     //AddPropertyNumber(ObjectId, 'Parent', 'Parent');
-  ObjectId := AddObject('Property groups', 'PropertyGroup', Core.System.Database.Database, GroupId);
-  ObjectId := AddObject('Properties', 'Property', Core.System.Database.Database, GroupId);
-    AddPropertyString(ObjectId, 'Name', 'Name');
-    AddPropertyNumber(ObjectId, 'Object', 'Object');
-    AddPropertyNumber(ObjectId, 'Property group', 'PropertyGroup');
-    AddPropertyNumber(ObjectId, 'Custom type', 'CustomType');
-    AddProperty(ObjectId, 'Editable', 'Editable', TypeBoolean);
-    AddPropertyString(ObjectId, 'Column name', 'ColumnName');
+
+  CustomTypeId := AddObject('Custom types', 'TypeCustom', Core.System.Database.Database, GroupId);
+    CustomTypeIdType := AddPropertyRelationOne(CustomTypeId, 'Type', 'Type', PropertyTypeId);
+
+  ObjectPropertyGroupId := AddObject('Property groups', 'PropertyGroup', Core.System.Database.Database, GroupId);
+
+  ObjectPropertyId := AddObject('Properties', 'Property', Core.System.Database.Database, GroupId);
+    AddPropertyString(ObjectPropertyId, 'Name', 'Name');
+    PropertyObjectId := AddPropertyRelationOne(ObjectPropertyId, 'Object', 'Object', ObjectId);
+    ObjectPropertyIdGroup := AddPropertyRelationOne(ObjectPropertyId, 'Property group', 'PropertyGroup', ObjectPropertyGroupId);
+    AddPropertyNumber(ObjectPropertyId, 'Custom type', 'CustomType');
+    AddProperty(ObjectPropertyId, 'Editable', 'Editable', TypeBoolean);
+    AddPropertyString(ObjectPropertyId, 'Column name', 'ColumnName');
+
+    AddPropertyRelationMany(ObjectGroupId, 'Childs', 'Childs', PropertyParentId);
+    AddPropertyRelationMany(ObjectGroupId, 'Objects', 'Objects', ObjectIdGroupId);
+    AddPropertyRelationMany(ObjectId, 'Properties', 'Properties', PropertyParentId);
+    AddPropertyRelationMany(ObjectPropertyGroupId, 'Properties', 'Properties', ObjectPropertyIdGroup);
+    AddPropertyRelationMany(PropertyTypeId, 'Custom types', 'CustomTypes', CustomTypeIdType);
   end;
 end;
@@ -464 +488 @@
 procedure TMainForm.AItemViewExecute(Sender: TObject);
 begin
-  ItemViewForm.Show;
+  if Assigned(ListView1.Selected) then
+    ItemViewForm.Show;
 end;
 
@@ -573 +598 @@
     Item.Caption := Items[0];
     for I := 1 to Items.Count - 1 do
+    if not TReportColumn(Report.Columns[I]).VirtualItem then
       Item.SubItems.Add(Items[I]);
   end;
@@ -680 +706 @@
 
     Columns.Clear;
-    for I := 0 to Report.Columns.Count - 1 do begin
+    for I := 0 to Report.Columns.Count - 1 do
+    if not TReportColumn(Report.Columns[I]).VirtualItem then begin
       NewColumn := Columns.Add;
       NewColumn.Caption := TReportColumn(Report.Columns[I]).Caption;
@@ -688 +715 @@
   end;
   ListView1Resize(Self);
+  ListView1SelectItem(Self, nil, False);
 end;