Skip to content

Commit 710cd33

Browse files
committed
use a formatted time if timegroup is daily
1 parent 44ff839 commit 710cd33

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

lib/Db/ReportItemMapper.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
6565
$selectFields[]= "date_part('year', to_timestamp(start)) as ftime";
6666
}elseif ($timegroup == 'month') {
6767
$selectFields[]= "to_char(to_timestamp(start), 'YYYY-MM') as ftime";
68-
} else if (!empty($timegroup)){
69-
$selectFields[]= "start as ftime";
68+
}elseif ($timegroup == 'day') {
69+
$selectFields[]= "to_char(to_timestamp(start), 'YYYY-MM-DD') as ftime";
7070
}
7171
} else if ($this->dbengine == 'SQLITE') {
7272
if ($timegroup == 'week') {
@@ -75,8 +75,8 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
7575
$selectFields[]= "strftime('%Y', datetime(start, 'unixepoch')) as ftime";
7676
}elseif ($timegroup == 'month') {
7777
$selectFields[]= "strftime('%Y-%m', datetime(start, 'unixepoch')) as ftime";
78-
} else if (!empty($timegroup)){
79-
$selectFields[]= "start as ftime";
78+
}elseif ($timegroup == 'day') {
79+
$selectFields[]= "strftime('%Y-%m-%d', datetime(start, 'unixepoch')) as ftime";
8080
}
8181
} else {
8282
if ($timegroup == 'week') {
@@ -85,8 +85,8 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
8585
$selectFields[]= "YEAR(FROM_UNIXTIME(start)) as ftime";
8686
}elseif ($timegroup == 'month') {
8787
$selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(start),'%Y-%m') as ftime";
88-
} else if (!empty($timegroup)){
89-
$selectFields[]= "start as ftime";
88+
}elseif ($timegroup == 'day') {
89+
$selectFields[]= "DATE(FROM_UNIXTIME(start)) as ftime";
9090
}
9191
}
9292

0 commit comments

Comments
 (0)