Merge branch 'pu/2013.10-tagmatrix'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 18:47:07 +0000 (20:47 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 18:47:07 +0000 (20:47 +0200)
Conflicts:
tine20/Tinebase/Export/Spreadsheet/Abstract.php

Change-Id: I63806d2247fcd00f7b2c1999bf6c5a5e8f688ae7

1  2 
tests/tine20/TestCase.php
tine20/Tinebase/Export/Spreadsheet/Abstract.php
tine20/Tinebase/Export/Spreadsheet/Ods.php
tine20/Tinebase/Model/Tag.php

Simple merge
  abstract class Tinebase_Export_Spreadsheet_Abstract extends Tinebase_Export_Abstract
  {
      /**
 +     * group by this field
 +     *
 +     * @var string
 +     */
 +    protected $_groupBy = NULL;
 +    
 +    /**
 +     * config for the groupBy field
 +     * 
 +     * @var Zend_Config
 +     */
 +    protected $_groupByFieldConfig = NULL;
 +    
 +    /**
 +     * type of the field
 +     * 
 +     * @var string
 +     */
 +    protected $_groupByFieldType = NULL;
 +    
 +    /**
 +     * count of columns
 +     * 
 +     * @var integer
 +     */
 +    protected $_columnCount = NULL;
 +    
 +    /**
 +     * the constructor
 +     *
 +     * @param Tinebase_Model_Filter_FilterGroup $_filter
 +     * @param Tinebase_Controller_Record_Interface $_controller (optional)
 +     * @param array $_additionalOptions (optional) additional options
 +     */
 +    public function __construct(Tinebase_Model_Filter_FilterGroup $_filter, Tinebase_Controller_Record_Interface $_controller = NULL, $_additionalOptions = array())
 +    {
 +        parent::__construct($_filter, $_controller, $_additionalOptions);
 +    
 +        if ($this->_config->grouping) {
 +            $this->_groupBy = (string) $this->_config->grouping->by;
 +            $this->_sortInfo = array('sort' => $this->_groupBy);
 +        }
 +    }
 +    
 +    /**
+      * holds all records for the matrix
+      * 
+      * @var array
+      */
+     protected $_matrixCache = array();
+     
+     /**
       * get export document object
       * 
       * @return Object the generated document
Simple merge