From 321432efa2c20083aad8529255d632bef6f5493e Mon Sep 17 00:00:00 2001
From: Theo Weijmer <>
Date: Thu, 1 Apr 2021 15:06:20 +0200
Subject: [PATCH] fix voor onderhanden werkpositie uren per werknemer

---
 .../views/pages/monthlyemployeehours_view.php       |  8 ++++----
 composer.json                                       |  2 --
 .../modules/reports/monthlyEmployeeHoursModule.js   | 13 +++++++------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/application/views/pages/monthlyemployeehours_view.php b/application/views/pages/monthlyemployeehours_view.php
index 6d6be2b..f42abf0 100644
--- a/application/views/pages/monthlyemployeehours_view.php
+++ b/application/views/pages/monthlyemployeehours_view.php
@@ -40,8 +40,8 @@
                     </li>
 
                     <!-- ko foreach:uniqueEmployees -->
-                        <li class="nav-item" data-bind="click:$root.setActivetab.bind($data, slug)" style="z-index:10">
-                            <a class="nav-link" data-bind="text:fullname, css:{'active':$root.sluggy() == slug}"></a>
+                        <li class="nav-item" data-bind="click:$root.setActivetab.bind($data, id)" style="z-index:10">
+                            <a class="nav-link" data-bind="text:fullname, css:{'active':$root.sluggy() == id}"></a>
                         </li>
                     <!-- /ko -->
                 </ul>
@@ -54,7 +54,7 @@
                     </div>
 
                     <!-- ko foreach:uniqueEmployees -->
-                        <div class="tab-pane" data-bind="css:{'active':$root.sluggy() == slug}">
+                        <div class="tab-pane" data-bind="css:{'active':$root.sluggy() == id}">
                             <div style="position:relative">
                                 <div style="position:absolute;right:20px; z-index:10;">
                                     <div class="onoffswitch" data-bind="click:$root.toggleHourView">
@@ -83,4 +83,4 @@
         </div>
     </div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/composer.json b/composer.json
index 70ea60a..b0a0b95 100755
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,5 @@
 		"paragonie/random_compat": "Provides better randomness in PHP 5.x"
 	},
 	"require-dev": {
-		"mikey179/vfsStream": "1.1.*",
-		"phpunit/phpunit": "4.* || 5.*"
 	}
 }
diff --git a/public/js/lib/modules/reports/monthlyEmployeeHoursModule.js b/public/js/lib/modules/reports/monthlyEmployeeHoursModule.js
index 9217a7f..7d363d4 100644
--- a/public/js/lib/modules/reports/monthlyEmployeeHoursModule.js
+++ b/public/js/lib/modules/reports/monthlyEmployeeHoursModule.js
@@ -162,12 +162,13 @@ dbo.monthlyemployeehoursInit = function () {
 				}, 700 );
 			},
 
-			refreshTab: function () {
+			refreshTab: function (userID) {
 				var vm = dbo.monthlyEmployeeHoursModel;
 
 				if ( vm.currentTab == false ) return;
 
-				dbo.reportsDataService.getEmployeeHours( vm.currentTab.id, vm.selectedYear(), function ( data ) {
+				dbo.reportsDataService.getEmployeeHours( userID, vm.selectedYear(), function ( data ) {
+					console.log( data );
 					vm.currentTab.myData( data );
 					vm.currentTab.totalJanuari( 0 );
 					vm.currentTab.totalFebruari( 0 );
@@ -259,17 +260,17 @@ dbo.monthlyemployeehoursInit = function () {
 				dbo.monthlyEmployeeHoursModel.drawCharts( this );
 			},
 
-			setActivetab: function ( tab ) {
+			setActivetab: function ( userID ) {
 				var vm = dbo.monthlyEmployeeHoursModel;
 
 				$.each( vm.uniqueEmployees(), function ( i, p ) {
-					if ( tab == p.slug ) {
+					if ( userID == p.id ) {
 						vm.currentTab = p;
-						vm.refreshTab();
+						vm.refreshTab( userID );
+						vm.sluggy( userID );
 					}
 				} )
 
-				vm.sluggy( tab );
 			},
 
 			UniqueEmployee: function ( data ) {