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

Wijzigingen nav opmerking Peter 24-12-2018

Browse Source
This commit is contained in:
theo
2019-01-02 16:57:41 +01:00
parent 9569522c83
commit efcd9f2c09
19 changed files with 201 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/projects/EmployeeHoursController.php
+8
View File
@@ -68,11 +68,19 @@ class EmployeeHoursController extends MY_Controller {
$employeehourID = Projecthour::saveProjecthour( $employeehourID, $data );
}
elseif ( $hourType == 'OFFERS' )
{
unset( $data['employee_id'] );
$data['hourtype_id'] = $data['hourtype_id'] - 8;
$employeehourID = Projecthour::saveProjecthour( $employeehourID, $data );
}
else
{
$employeehourID = Employeehour::saveEmployeehour( $employeehourID, $data );
}
$this->json( ['employeehourID' => $employeehourID] );
}
application/controllers/projects/OffersController.php
+8 -2
View File
@@ -27,9 +27,15 @@ class OffersController extends MY_Controller {
}
public function getAllOffers( $projectID, $archive = 'F' )
public function getAllOffers()
{
$offers = Offer::getAllOffers( $projectID, $archive );
$projectID = $this->clean_input( 'projectID' );
$archive = $this->clean_input( 'archive' );
$search = $this->clean_input( 'search' );
$order = $this->clean_input( 'order' );
$direction = $this->clean_input( 'direction' );
$offers = Offer::getAllOffers( $projectID, $archive, $search, $order, $direction );
$this->json( $offers );
}
application/controllers/projects/ProjectsController.php
+10 -3
View File
@@ -27,9 +27,14 @@ class ProjectsController extends MY_Controller {
}
public function getAllProjects( $archive = 'F' )
public function getAllProjects( )
{
$projects = Project::getAllProjects( $archive );
$archive = $this->clean_input( 'archive' );
$search = $this->clean_input( 'search' );
$order = $this->clean_input( 'order' );
$direction = $this->clean_input( 'direction' );
$projects = Project::getAllProjects( $archive, $search, $order, $direction );
$this->json( $projects );
}
@@ -359,4 +364,6 @@ class ProjectsController extends MY_Controller {
$this->json( ['result' => TRUE] );
}
}
}