possible fix for mtierltd#55

puthre · puthre · commit 4f33b1f1ef98 · 2021-01-21T12:44:51.000Z
diff --git a/lib/Db/ReportItemMapper.php b/lib/Db/ReportItemMapper.php
@@ -77,7 +77,7 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
                     $selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(min(start)),'%Y-%m-%d') as time";
                 }
             } elseif ($timegroup == 'week') {
-                $selectFields[]= "STR_TO_DATE(CONCAT(YEARWEEK(FROM_UNIXTIME(start)),' Monday'), '%x%v %W') as time";
+                $selectFields[]= "STR_TO_DATE(CONCAT(YEARWEEK(FROM_UNIXTIME(start), 1),' Monday'), '%x%v %W') as time";
             }elseif ($timegroup == 'day') {
                 $selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(start),'%Y-%m-%d') as time";
             }elseif ($timegroup == 'year') {

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi`
`77`	`77`	`$selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(min(start)),'%Y-%m-%d') as time";`
`78`	`78`	`}`
`79`	`79`	`} elseif ($timegroup == 'week') {`
`80`		`- $selectFields[]= "STR_TO_DATE(CONCAT(YEARWEEK(FROM_UNIXTIME(start)),' Monday'), '%x%v %W') as time";`
	`80`	`+ $selectFields[]= "STR_TO_DATE(CONCAT(YEARWEEK(FROM_UNIXTIME(start), 1),' Monday'), '%x%v %W') as time";`
`81`	`81`	`}elseif ($timegroup == 'day') {`
`82`	`82`	`$selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(start),'%Y-%m-%d') as time";`
`83`	`83`	`}elseif ($timegroup == 'year') {`