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

invoice report

Browse Source
This commit is contained in:
theo
2018-03-02 17:06:41 +01:00
parent fad71498dd
commit f540bab261
8 changed files with 285 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/eloquent/queries/QEmployeeHours.php
+7 -5
View File
@@ -30,8 +30,9 @@ class QEmployeeHours {
0 AS revenues,
SUM(hours) AS nonprojecthours
FROM employeehours
WHERE YEAR(hourdate) = '{$year}'
AND MONTH(hourdate) = '$month'
WHERE YEAR(hourdate) = '{$year}' ";
if( $month != 0 ) $sql .= "AND MONTH(hourdate) = '$month' ";
$sql .= "
GROUP BY employee_id, MONTH(hourdate)
UNION
SELECT PEM.user_id,
@@ -44,13 +45,14 @@ class QEmployeeHours {
FROM projecthours PH
JOIN projectemployees PEM
ON PEM.id = PH.projectemployee_id
WHERE YEAR(hourdate) = '{$year}'
AND MONTH(hourdate) = '$month'
WHERE YEAR(hourdate) = '{$year}' ";
if( $month != 0 ) $sql .= "AND MONTH(hourdate) = '$month' ";
$sql .= "
GROUP BY PEM.user_id, MONTH(hourdate)
) AS Q1
JOIN users AS USR
ON USR.id = Q1.user_id
GROUP BY monthID, user_id ";
GROUP BY user_id ";
return $sql;
}