Merge branch 'master' into feature/dashboard

# Conflicts:
#	application/models/eloquent/Projectemployee.php

application/controllers/beheer/UsersController.php

@@ -60,12 +60,19 @@ class usersController extends MY_Controller {
 		$this->json( $userActiveProjects );
     }
 
-    public function getUniqueprojectEmployees()
-    {
-        $projectEmployees = User::getUniqueProjectUsers();
+	public function getUniqueprojectEmployees()
+	{
+		$projectEmployees = User::getUniqueProjectUsers();
 
-        $this->json( $projectEmployees );
-    }
+		$this->json( $projectEmployees );
+	}
+
+	public function getUniqueEmployeesWithActivity($archive)
+	{
+		$projectEmployees = Projectemployee::getUniqueEmployeesWithActivity($archive);
+
+		$this->json( $projectEmployees );
+	}
 
     public function saveUser()
     {

application/controllers/reports/ReportsController.php

@@ -29,7 +29,10 @@ class ReportsController extends MY_Controller {
 
     public function recapProjects( $archive )
     {
-        $recapprojects = new Recapprojects( $archive );
+    	$field = $this->input->post('field');
+    	$direction = $this->input->post('direction');
+
+        $recapprojects = new Recapprojects( $archive, $field, $direction );
 
         $projects = $recapprojects->getProjects();
 
@@ -84,4 +87,4 @@ class ReportsController extends MY_Controller {
         Project::whereId( $projectID )->update( ['current_financial_year' => $amount] );
     }
 
-}
+}

application/controllers/reports/ReservationsController.php

@@ -27,6 +27,7 @@ class ReservationsController extends MY_Controller {
             {
                 $projects[ $result->projectID ] = [
                     'projectnumber'   => $result->projectnumber,
+					'projectname'	  => $result->projectname,
                     'costs'           => 0,
                     'reservation'     => 0,
                     'payed'           => 0,