Overigen/dbois
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for urenreport

Browse Source
This commit is contained in:
theo
2019-03-01 15:15:43 +01:00
parent 0ee4785a40
commit a65d0b7deb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/eloquent/queries/QEmployeeHours.php
+4 -2
View File
@@ -45,7 +45,8 @@ class QEmployeeHours {
FROM projecthours PH FROM projecthours PH
JOIN projectemployees PEM JOIN projectemployees PEM
ON PEM.id = PH.projectemployee_id ON PEM.id = PH.projectemployee_id
WHERE YEAR(hourdate) = '{$year}' "; WHERE YEAR(hourdate) = '{$year}'
AND hourtype_id = 2 ";
if( $month != 0 ) $sql .= "AND MONTH(hourdate) = '$month' "; if( $month != 0 ) $sql .= "AND MONTH(hourdate) = '$month' ";
$sql .= " $sql .= "
GROUP BY PEM.user_id, MONTH(hourdate) GROUP BY PEM.user_id, MONTH(hourdate)
@@ -58,7 +59,8 @@ class QEmployeeHours {
0 AS revenues, 0 AS revenues,
0 AS nonprojecthours 0 AS nonprojecthours
FROM projecthours PH FROM projecthours PH
WHERE YEAR(hourdate) = '{$year}' "; WHERE YEAR(hourdate) = '{$year}'
AND hourtype_id = 3 ";
if( $month != 0 ) $sql .= "AND MONTH(hourdate) = '$month' "; if( $month != 0 ) $sql .= "AND MONTH(hourdate) = '$month' ";
$sql .= " $sql .= "
GROUP BY PH.projectemployee_id, MONTH(hourdate) GROUP BY PH.projectemployee_id, MONTH(hourdate)