Commit 8fc96250 by cam

PDF Corrugated Report is finished and fixed a bug with editting corrugated orders

parent f22ff51b
...@@ -146,7 +146,6 @@ uses ...@@ -146,7 +146,6 @@ uses
procedure TrptOrderCorrugated.PopulateColorTable; procedure TrptOrderCorrugated.PopulateColorTable;
var var
frxTable: TfrxTableObject;
row: TfrxCustomTableRow; row: TfrxCustomTableRow;
colorArray: TJSONArray; colorArray: TJSONArray;
colorsObject, colorObject: TJSONObject; colorsObject, colorObject: TJSONObject;
...@@ -155,28 +154,23 @@ var ...@@ -155,28 +154,23 @@ var
temp: TObject; temp: TObject;
begin begin
logger.Log(1, 'Adding Color Rows'); logger.Log(1, 'Adding Color Rows');
frxTable := frxOrderCorrugated.FindObject('ColorTable') as TfrxTableObject;
colorsString := uqOrderCorrugated.FieldByName('colors_colors').AsString; colorsString := uqOrderCorrugated.FieldByName('colors_colors').AsString;
colorsObject := TJSONObject.ParseJSONValue(colorsString) as TJSONObject; colorsObject := TJSONObject.ParseJSONValue(colorsString) as TJSONObject;
colorArray := TJSONArray(colorsObject.GetValue<TJSONArray>('items')); colorArray := TJSONArray(colorsObject.GetValue<TJSONArray>('items'));
for i := 0 to colorArray.Count - 1 do
begin
row := frxOrderCorrugated.FindObject('ColorRow' + IntToStr(i + 1)) as TfrxCustomTableRow;
colorObject := colorArray.Items[i] as TJSONObject;
row.Cells[4].Text := colorObject.GetValue<string>('#');
row.Cells[5].Text := colorObject.GetValue<string>('Color');
row.Cells[6].Text := colorObject.GetValue<string>('LPI');
row.Cells[7].Text := colorObject.GetValue<string>('Size');
end;
for i := 0 to colorArray.Count - 1 do colorsObject.Free;
begin
row := frxOrderCorrugated.FindObject('ColorRow' + IntToStr(i + 1)) as TfrxCustomTableRow;
colorObject := colorArray.Items[i] as TJSONObject;
{row.Cells[5].DataField := colorObject.GetValue<string>('#');
row.Cells[6].DataField := colorObject.GetValue<string>('Color');
row.Cells[7].DataField := colorObject.GetValue<string>('LPI');
row.Cells[8].DataField := colorObject.GetValue<string>('Size');
}
row.Cells[4].Text := colorObject.GetValue<string>('#');
row.Cells[5].Text := colorObject.GetValue<string>('Color');
row.Cells[6].Text := colorObject.GetValue<string>('LPI');
row.Cells[7].Text := colorObject.GetValue<string>('Size');
end;
end; end;
......
[Settings] [Settings]
MemoLogLevel=4 MemoLogLevel=4
FileLogLevel=5 FileLogLevel=5
LogFileNum=187 LogFileNum=196
webClientVersion=1.0.0 webClientVersion=1.0.0
[Database] [Database]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment