Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #26 Fix error for non-DB attributes #27

Merged
merged 1 commit into from
Aug 3, 2018
Merged

Issue #26 Fix error for non-DB attributes #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 29 additions & 19 deletions src/ActiveExcelSheet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ActiveExcelSheet extends ExcelSheet

protected $_query;
protected $_attributes;
protected $_columnTypes;
protected $_columnSchemas;
protected $_modelInstance;

/**
Expand Down Expand Up @@ -131,18 +131,21 @@ public function getFormats()
if ($this->_formats === null) {
$this->_formats = [];
$attrs = $this->normalizeIndex($this->getAttributes());
$types = $this->normalizeIndex($this->getColumnTypes());
$schemas = $this->normalizeIndex($this->getColumnSchemas());
foreach ($attrs as $c => $attr) {
switch ($types[$c]->type) {
if (!isset($schemas[$c])) {
continue;
}
switch ($schemas[$c]->type) {
case 'date':
$this->_formats[$c] = $this->dateFormat;
break;
case 'datetime':
$this->_formats[$c] = $this->dateTimeFormat;
break;
case 'decimal':
$decimals = str_pad('#,', $types[$c]->scale, '#');
$zeroPad = str_pad('0.', $types[$c]->scale, '0');
$decimals = str_pad('#,', $schemas[$c]->scale, '#');
$zeroPad = str_pad('0.', $schemas[$c]->scale, '0');
$this->_formats[$c] = $decimals.$zeroPad;
break;
}
Expand Down Expand Up @@ -181,9 +184,12 @@ public function getFormatters()
if ($this->_formatters === null) {
$this->_formatters = [];
$attrs = $this->normalizeIndex($this->getAttributes());
$types = $this->normalizeIndex($this->getColumnTypes());
$schemas = $this->normalizeIndex($this->getColumnSchemas());
foreach ($attrs as $c => $attr) {
switch ($types[$c]->type) {
if (!isset($schemas[$c])) {
continue;
}
switch ($schemas[$c]->type) {
case 'date':
$this->_formatters[$c] = function ($v) {
if (empty($v)) {
Expand Down Expand Up @@ -271,18 +277,20 @@ protected static function getRelatedModelInstance($model, $name)
}

/**
* @return yii\db\ColumnSchema[] the DB column types `ColumnSchema::$type`
* indexed by 0-based column index
* @return yii\db\ColumnSchema[] the DB column schemas indexed by 0-based
* column index. This only includes columns for which a DB schema exists.
*/
protected function getColumnTypes()
protected function getColumnSchemas()
{
if ($this->_columnTypes === null) {
if ($this->_columnSchemas === null) {
$model = $this->getModelInstance();
$this->_columnTypes = array_map(function ($attr) use ($model) {
return self::getType($model, $attr);
$schemas = array_map(function ($attr) use ($model) {
return self::getSchema($model, $attr);
}, $this->getAttributes());
// Filter out null values
$this->_columnSchemas = array_filter($schemas);
}
return $this->_columnTypes;
return $this->_columnSchemas;
}

/**
Expand Down Expand Up @@ -350,19 +358,21 @@ protected function toExcelTime($value)
* @param mixed $isRelation whether the name specifies a relation, in which
* case an `ActiveRecord` is returned. Default is `false`, which returns a
* `ColumnSchema`.
* @return yii\db\ColumnSchema|yii\db\ActiveRecord the type instance of the
* attribute
* @return yii\db\ColumnSchema|yii\db\ActiveRecord|null the type instance
* of the attribute or `null` if the attribute is not a DB column (e.g.
* public property or defined by getter)
*/
public static function getType($model, $attribute, $isRelation = false)
public static function getSchema($model, $attribute, $isRelation = false)
{
if (($pos = strrpos($attribute, '.')) !== false) {
$model = self::getType($model, substr($attribute, 0, $pos), true);
$model = self::getSchema($model, substr($attribute, 0, $pos), true);
$attribute = substr($attribute, $pos + 1);
}
if ($isRelation) {
return self::getRelatedModelInstance($model, $attribute);
} else {
return $model->getTableSchema()->columns[$attribute];
$columnSchemas = $model->getTableSchema()->columns;
return isset($columnSchemas[$attribute]) ? $columnSchemas[$attribute] : null;
}
}
}