Commit 66158609 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Report: replace rbeg after the row has been processed - using latest row values becomes possible.

parent 03840cf7
...@@ -507,16 +507,16 @@ class Report { ...@@ -507,16 +507,16 @@ class Report {
$content .= $columnValueSeparator; $content .= $columnValueSeparator;
$columnValueSeparator = $this->variables->doVariables($this->frArray[$full_level . "." . TOKEN_RSEP]); $columnValueSeparator = $this->variables->doVariables($this->frArray[$full_level . "." . TOKEN_RSEP]);
// RBEG //-----------------------------
// COLUMNS: Collect all columns
$content .= $this->collectRow($row, $keys, $full_level, $rowIndex);
// RBEG - replace after 'collectRow' to use values from the current row
$rbeg = $this->variables->doVariables($this->frArray[$full_level . "." . TOKEN_RBEG]); $rbeg = $this->variables->doVariables($this->frArray[$full_level . "." . TOKEN_RBEG]);
// RBGD: even/odd rows // RBGD: even/odd rows
$content .= str_replace(TOKEN_RBGD, $arrRbgd[$rowIndex % 2], $rbeg); $content .= str_replace(TOKEN_RBGD, $arrRbgd[$rowIndex % 2], $rbeg);
//-----------------------------
// COLUMNS: Collect all columns
$content .= $this->collectRow($row, $keys, $full_level, $rowIndex);
// REND // REND
$content .= $this->variables->doVariables($this->frArray[$full_level . "." . TOKEN_REND]); $content .= $this->variables->doVariables($this->frArray[$full_level . "." . TOKEN_REND]);
......
Supports Markdown
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