Skip to content

Commit 3eda513

Browse files
Removed double DateTime format check
1 parent b2cd6cd commit 3eda513

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

Resources/templates/CommonAdmin/ExcelAction/ExcelBuilderAction.php.twig

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,14 @@ class ExcelController extends \{{ namespace_prefix }}\{{ bundle_name }}\Controll
184184
if ($this->validateCredentials('{{ credentials }}', ${{ builder.ModelClass }})) {
185185
{% endif %}
186186
$data = $this->getValueForCell('{{ column.getter }}', ${{ builder.ModelClass }});
187-
$formatedValue = $this->format{{ name|classify|php_name }}($data);
187+
$formattedValue = $this->format{{ name|classify|php_name }}($data);
188188
189189
// Convert DateTime object to given format
190-
if ($formatedValue instanceof \DateTime){
191-
$formatedValue = $formatedValue->format('{{ builder.dateTimeFormat }}');
190+
if ($formattedValue instanceof \DateTime){
191+
$formattedValue = $formattedValue->format('{{ builder.dateTimeFormat }}');
192192
}
193193
194-
$sheet->setCellValueByColumnAndRow($colNum, $row, $formatedValue);
194+
$sheet->setCellValueByColumnAndRow($colNum, $row, $formattedValue);
195195
{% if column.credentials is not empty and column.credentials is not same as('AdmingenAllowed') %}
196196
}
197197
{% endif %}
@@ -250,14 +250,14 @@ class ExcelController extends \{{ namespace_prefix }}\{{ bundle_name }}\Controll
250250
if ($this->validateCredentials('{{ credentials }}', ${{ builder.ModelClass }})) {
251251
{% endif %}
252252
$data = $this->getValueForCell('{{ column.getter }}', ${{ builder.ModelClass }});
253-
$formatedValue = $this->format{{ name|classify|php_name }}($data);
253+
$formattedValue = $this->format{{ name|classify|php_name }}($data);
254254
255255
// Convert DateTime object to given format
256-
if ($formatedValue instanceof \DateTime){
257-
$formatedValue = $formatedValue->format('{{ builder.dateTimeFormat(keyname) }}');
256+
if ($formattedValue instanceof \DateTime){
257+
$formattedValue = $formattedValue->format('{{ builder.dateTimeFormat(keyname) }}');
258258
}
259259
260-
$sheet->setCellValueByColumnAndRow($colNum, $row, $formatedValue);
260+
$sheet->setCellValueByColumnAndRow($colNum, $row, $formattedValue);
261261
{% if column.credentials is not empty and column.credentials is not same as('AdmingenAllowed') %}
262262
}
263263
{% endif %}
@@ -307,12 +307,7 @@ class ExcelController extends \{{ namespace_prefix }}\{{ bundle_name }}\Controll
307307
if($data !== null) {
308308
$data = $accessor->getValue($data, $field);
309309
}
310-
311-
// Convert DateTime object to given format
312-
if ($data instanceof \DateTime) {
313-
$data = $data->format('{{ builder.dateTimeFormat }}');
314-
}
315-
310+
316311
return $data;
317312
}
318313

0 commit comments

Comments
 (0)