diff --git a/application/models/eloquent/Projectemployee.php b/application/models/eloquent/Projectemployee.php index 4053cfc..e9c150e 100644 --- a/application/models/eloquent/Projectemployee.php +++ b/application/models/eloquent/Projectemployee.php @@ -63,15 +63,16 @@ class Projectemployee extends BaseModel { 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( 'projecthours AS PRH', 'PRH.projectemployee_id', '=', 'projectemployees.id' ) ->where( 'projectemployees.project_id', '=', $projectID ) ->where( 'PRH.hourtype_id', '=', 1 ) - ->where( 'budget', '!=', 0 ) +// ->where( 'budget', '!=', 0 ) ->groupBy( 'projectemployees.id' ) - ->havingRaw( 'ROUND(SUM(hours), 0) > 0' ) - ->get(); + ->havingRaw( 'ROUND(SUM(hours), 0) > 0' ); + $details = $details->get(); return $details; }