Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Fixes for task export date ranges

Browse Source
This commit is contained in:
David Bomba 2024-08-01 11:15:02 +10:00
parent 4b73672861
commit afb8065dfe
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Export/CSV/BaseExport.php
View File

@ -1258,7 +1258,7 @@ class BaseExport
$date_range = $this->input['date_range']; $date_range = $this->input['date_range'];
if (array_key_exists('date_key', $this->input) && strlen($this->input['date_key']) > 1 && ($table_name && $this->columnExists($table_name, $this->input['date_key']))) { if (array_key_exists('date_key', $this->input) && strlen($this->input['date_key'] ?? '') > 1 && ($table_name && $this->columnExists($table_name, $this->input['date_key']))) {
$this->date_key = $this->input['date_key']; $this->date_key = $this->input['date_key'];
} }
@ -1270,6 +1270,9 @@ class BaseExport
$custom_end_date = now(); $custom_end_date = now();
} }
nlog($custom_start_date->format('Y-m-d'));
nlog($custom_end_date->format('Y-m-d'));
switch ($date_range) { switch ($date_range) {
case 'all': case 'all':
$this->start_date = 'All available data'; $this->start_date = 'All available data';

2
app/Export/CSV/TaskExport.php
View File

@ -29,7 +29,7 @@ class TaskExport extends BaseExport
{ {
private $entity_transformer; private $entity_transformer;
public string $date_key = 'created_at'; public string $date_key = 'calculated_start_date';
private string $date_format = 'Y-m-d'; private string $date_format = 'Y-m-d';