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/reports/ReportsController.php
+7 -7
View File
@@ -27,9 +27,9 @@ class ReportsController extends MY_Controller {
}
public function recapProjects()
public function recapProjects( $archive )
{
$recapprojects = new Recapprojects();
$recapprojects = new Recapprojects( $archive );
$projects = $recapprojects->getProjects();
@@ -51,17 +51,17 @@ class ReportsController extends MY_Controller {
$result = $query->result();
foreach($result as $user)
foreach ( $result as $user )
{
$user->targethours = Employeetarget::getTargetHoursPerEmployee( $user->user_id, $year, $month);
$user->targethours = Employeetarget::getTargetHoursPerEmployee( $user->user_id, $year, $month );
}
$this->json( $result );
}
public function getInvoiceOverview( $year = FALSE )
public function getInvoiceOverview( $year = FALSE, $orderType, $orderDirection, $archive )
{
$invoices = new Invoices( $year );
$invoices = new Invoices( $year, $orderType, $orderDirection, $archive );
$invoiceReport = $invoices->getInvoiceReport();
@@ -74,7 +74,7 @@ class ReportsController extends MY_Controller {
$invoiceReport = $invoices->getInvoiceReport();
new InvoiceSpreadsheet($invoiceReport);
new InvoiceSpreadsheet( $invoiceReport );
}
public function saveCurrentFinnacialYear( $projectID )