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

visibility offres at timewriting

Browse Source
This commit is contained in:
theo
2019-04-15 14:26:05 +02:00
parent 0a891af5ec
commit d3dd500248
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/eloquent/Offer.php
+2 -2
View File
@@ -47,8 +47,8 @@ class Offer extends BaseModel {
public static function getOffersWithoutProject( ) public static function getOffersWithoutProject( )
{ {
$offersWithoutProject = Offer::orderBy('startdate') $offersWithoutProject = Offer::orderBy('startdate')
->whereNull('rejectdate') // ->whereNull('rejectdate')
->whereNull('project_id') // ->whereNull('project_id')
->whereArchive('F') ->whereArchive('F')
->get(); ->get();
application/models/eloquent/queries/EmployeehoursMonthly.php
+2 -1
View File
@@ -25,7 +25,8 @@ class EmployeehoursMonthly {
JOIN users USR JOIN users USR
ON USR.id = EMH.employee_id ON USR.id = EMH.employee_id
WHERE MONTH(hourdate) = {$month} WHERE MONTH(hourdate) = {$month}
AND YEAR(hourdate) = {$year} "; AND YEAR(hourdate) = {$year}
AND reportable = 'T' ";
if( $employeeID != 0 ) $sql.="AND USR.id = {$employeeID} "; if( $employeeID != 0 ) $sql.="AND USR.id = {$employeeID} ";
$sql.=" $sql.="
UNION UNION