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

Diverse aanpassing nav mail Peter

Browse Source
This commit is contained in:
theo
2019-02-22 14:19:03 +01:00
parent d71692f320
commit 695f6c6960
23 changed files with 295 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/projects/EmployeeHoursController.php
+1
View File
@@ -70,6 +70,7 @@ class EmployeeHoursController extends MY_Controller {
}
elseif ( $hourType == 'OFFERS' )
{
$data['projectemployee_id'] = $data['employee_id'];
unset( $data['employee_id'] );
$data['hourtype_id'] = $data['hourtype_id'] - 8;
application/controllers/projects/ProjectsController.php
+5 -2
View File
@@ -27,14 +27,14 @@ class ProjectsController extends MY_Controller {
}
public function getAllProjects( )
public function getAllProjects()
{
$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 );
$projects = Project::getAllProjects( $archive, $search, $order, $direction );
$this->json( $projects );
}
@@ -46,6 +46,9 @@ class ProjectsController extends MY_Controller {
$project->invoiceDetails =
$this->Invoices_model->getOutstandingPerProject( $project->id );
$project->hourTotals =
Projecthour::getTotalHoursPerProject( $project->id );
$this->json( $project );
}