Diverse wijzigingen nav word document

application/libraries/reports/Recapprojects.php

@@ -10,9 +10,11 @@ class Recapprojects {
 
     private $ci;
     private $index;
+	private $field;
     private $archive;
     private $project;
     private $projects;
+	private $direction;
     private $employeeHours;
     private $invoicedYears = [];
     private $projectTotals;
@@ -23,11 +25,13 @@ class Recapprojects {
     private $projectEmployeeDetail;
     private $projectEmployeeDetails;
 
-    public function __construct( $archive )
+    public function __construct( $archive, $field, $direction )
     {
         $this->ci =& get_instance();
 
         $this->archive = $archive;
+		$this->field = $field;
+		$this->direction = $direction;
 
         $this->ci->load->Model( 'projects/Invoices_model' );
 
@@ -54,12 +58,14 @@ class Recapprojects {
 
     private function setProjects()
     {
-        $this->projects = Project::getActiveProjects( $this->archive )->toArray();
+        $this->projects = Project::getActiveProjects(
+        	$this->archive, $this->field, $this->direction )->toArray();
     }
 
     private function setUniqueEmployees()
     {
-        $this->uniqueEmployees = Projectemployee::getUniqueProjectEmployees();
+        $this->uniqueEmployees =
+			Projectemployee::getUniqueEmployeesWithActivity();
     }
 
     private function loopProjects()
@@ -272,4 +278,4 @@ class Recapprojects {
             $this->index ++;
         }
     }
-}
+}