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

fix for employeehours (remove) and refresh active offers / projects

Browse Source
This commit is contained in:
theo
2019-04-13 10:39:58 +02:00
parent a71a7096d6
commit 0a891af5ec
6 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/projects/EmployeeHoursController.php
+11 -3
View File
@@ -51,7 +51,7 @@ class EmployeeHoursController extends MY_Controller {
unset( $data['id'] );
unset( $data['hourType'] );
unset( $data['project_id'] );
if( $hourType == 'OFFERS' ) $data['offer_id'] = $projectID;
if ( $hourType == 'OFFERS' ) $data['offer_id'] = $projectID;
$data['hourdate'] = date2mysql( $data['hourdate'] );
@@ -85,10 +85,18 @@ class EmployeeHoursController extends MY_Controller {
$this->json( ['employeehourID' => $employeehourID] );
}
public function removeEmployeehour( $employeehourID )
public function removeEmployeehour( $employeehourID, $hourType )
{
//TODO:check op delete
Employeehour::whereId( $employeehourID )->delete();
if ( $hourType == 'OVERHEAD' )
{
Employeehour::whereId( $employeehourID )->delete();
}
else
{
Projecthour::whereId( $employeehourID )->delete();
}
$this->json( ['result' => TRUE] );
}