Diverse aanpassing nav mail Peter

application/libraries/reports/Recapprojects.php

@@ -10,6 +10,7 @@ class Recapprojects {
 
     private $ci;
     private $index;
+    private $archive;
     private $project;
     private $projects;
     private $employeeHours;
@@ -22,10 +23,12 @@ class Recapprojects {
     private $projectEmployeeDetail;
     private $projectEmployeeDetails;
 
-    public function __construct()
+    public function __construct( $archive )
     {
         $this->ci =& get_instance();
 
+        $this->archive = $archive;
+
         $this->ci->load->Model( 'projects/Invoices_model' );
 
         $this->handle();
@@ -51,7 +54,7 @@ class Recapprojects {
 
     private function setProjects()
     {
-        $this->projects = Project::getActiveProjects()->toArray();
+        $this->projects = Project::getActiveProjects( $this->archive )->toArray();
     }
 
     private function setUniqueEmployees()
@@ -222,8 +225,8 @@ class Recapprojects {
             $this->projects[ $this->index ]['projectcosts'] -
             $this->projects[ $this->index ]['totalInvoiced'];
 
-        if( $this->projects[ $this->index ]['workInProgress']  < 0 )
-            $this->projects[ $this->index ]['workInProgress']  = 0;
+        if ( $this->projects[ $this->index ]['workInProgress'] < 0 )
+            $this->projects[ $this->index ]['workInProgress'] = 0;
     }
 
     private function setCurrentFinancialYear()