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

fix for hours o filter in OHWP

Browse Source
This commit is contained in:
theo
2019-10-30 15:25:54 +01:00
parent 0f5261319f
commit 776731e5b1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/eloquent/Projectemployee.php
+5 -4
View File
@@ -63,15 +63,16 @@ class Projectemployee extends BaseModel {
public static function getProjectemployeeDetailsPerProject( $projectID ) public static function getProjectemployeeDetailsPerProject( $projectID )
{ {
$details = Projectemployee::selectRaw( 'USR.id, budget, project_id, ROUND(SUM(hours), 0) AS hours, ROUND(SUM(hours * tarif), 0) AS revenues, projectemployees.id AS projectemployeeID' ) $details = Projectemployee::selectRaw( '
USR.id, budget, project_id, ROUND(SUM(hours), 0) AS hours, ROUND(SUM(hours * tarif), 0) AS revenues, projectemployees.id AS projectemployeeID' )
->join( 'users AS USR', 'USR.id', '=', 'projectemployees.user_id' ) ->join( 'users AS USR', 'USR.id', '=', 'projectemployees.user_id' )
->join( 'projecthours AS PRH', 'PRH.projectemployee_id', '=', 'projectemployees.id' ) ->join( 'projecthours AS PRH', 'PRH.projectemployee_id', '=', 'projectemployees.id' )
->where( 'projectemployees.project_id', '=', $projectID ) ->where( 'projectemployees.project_id', '=', $projectID )
->where( 'PRH.hourtype_id', '=', 1 ) ->where( 'PRH.hourtype_id', '=', 1 )
->where( 'budget', '!=', 0 ) // ->where( 'budget', '!=', 0 )
->groupBy( 'projectemployees.id' ) ->groupBy( 'projectemployees.id' )
->havingRaw( 'ROUND(SUM(hours), 0) > 0' ) ->havingRaw( 'ROUND(SUM(hours), 0) > 0' );
->get(); $details = $details->get();
return $details; return $details;
} }