Changeset 34 for trunk/USystem.pas

Timestamp:

Nov 24, 2011, 2:06:10 PM (13 years ago)

Author:

chronos

Message:

• Modified: Report loading is now done by TChronisClient.

File:

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

trunk/USystem.pas

@@ -187 +187 @@
 procedure TReport.Load(Obj: TChronisObject; Filter: string = '');
 var
-  Properties: TDbRows;
-  Values: TDbRows;
+  Properties: TListProxy;
+  Values: TListProxy;
   I: Integer;
   C: Integer;
@@ -195 +195 @@
   ColumnsQuery: string;
   DataType: TDataType;
+  ProxyObj: TObjectProxy;
 begin
   Clear;
@@ -200 +201 @@
     // Load column names
     try
-      Properties := TDbRows.Create;
-      Base.Database.Query(Properties, 'SELECT * FROM `' + PropertyTable +
-        '` WHERE `Object`=' + IntToStr(Obj.Id));
+      Properties := TListProxy.Create;
+      Properties.Client := Base.Client;
+      Properties.ObjectName := PropertyTable;
+      Properties.SchemaName := Base.Database.Database;
+      Properties.SetCondition('Object', IntToStr(Obj.Id));
+      Properties.Load;
       Columns.Clear;
 
-      for I := 0 to Properties.Count - 1 do begin
-        DataType := GetDataType(StrToInt(Properties[I].Values['CustomType']));
+      for I := 0 to Properties.Objects.Count - 1 do begin
+        ProxyObj := TObjectProxy(Properties.Objects[I]);
+        DataType := GetDataType(StrToInt(ProxyObj.Properties.Values['CustomType']));
         NewColumn := TReportColumn.Create;
         Columns.Add(NewColumn);
-        NewColumn.Caption := Properties[I].Values['Name'];
-        NewColumn.ColumnName := Properties[I].Values['ColumnName'];
+        NewColumn.Caption := ProxyObj.Properties.Values['Name'];
+        NewColumn.ColumnName := ProxyObj.Properties.Values['ColumnName'];
         NewColumn.CustomType := DataType;
         if (DataType is TDataTypeRelationMany) then NewColumn.VirtualItem := True;
@@ -216 +221 @@
 
       // Load items
-      Values := TDbRows.Create;
-      ColumnsQuery := '';
+      Values := TListProxy.Create;
+      Values.Client := Base.Client;
       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);
-      if Filter <> '' then Filter := ' WHERE ' + Filter;
-      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
+          Values.ColumnsFilter.Add(TReportColumn(Columns[I]).ColumnName);
+      Values.ColumnsFilter.Add(Obj.PrimaryKey);
+      Values.ColummsFilterUse := True;
+      Values.ObjectName := Obj.Table;
+      Values.SchemaName := Obj.Schema;
+      Values.Load;
+
+      //Base.Database.Query(Values, 'SELECT ' + ColumnsQuery + ', `' + Obj.PrimaryKey + '` AS `SYS_PRIMARY_KEY`  FROM `' + Obj.Schema + '`.`' +
+      //  Obj.Table + '`' + Filter);
+      for I := 0 to Values.Objects.Count - 1 do begin
+        ProxyObj := TObjectProxy(Values.Objects[I]);
         NewItem := TReportLine.Create;
         //NewItem.Items.Add(Values[I].Values[Obj.PrimaryKey]);
-        NewItem.Id := StrToInt(Values[I].Values['SYS_PRIMARY_KEY']);
+        NewItem.Id := StrToInt(ProxyObj.Properties.Values[Obj.PrimaryKey]);
         for C := 0 to Columns.Count - 1 do
         if not TReportColumn(Columns[C]).VirtualItem then begin
-          NewItem.Items.Add(Values[I].Values[TReportColumn(Columns[C]).ColumnName]);
+          NewItem.Items.Add(ProxyObj.Properties.Values[TReportColumn(Columns[C]).ColumnName]);
         end else NewItem.Items.Add('');
         Add(NewItem);