From 154d793ca529b7f4822be940e9cdb04fc2eb6428 Mon Sep 17 00:00:00 2001 From: Theo Weijmer Date: Tue, 31 Jul 2018 15:55:44 +0200 Subject: [PATCH] debug 8 --- application/models/eloquent/queries/EmployeehoursMonthly.php | 2 +- public/js/lib/modules/projects/employeehoursModule.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/application/models/eloquent/queries/EmployeehoursMonthly.php b/application/models/eloquent/queries/EmployeehoursMonthly.php index 69060fe..fc1ba10 100644 --- a/application/models/eloquent/queries/EmployeehoursMonthly.php +++ b/application/models/eloquent/queries/EmployeehoursMonthly.php @@ -30,7 +30,7 @@ class EmployeehoursMonthly { $sql.=" UNION SELECT CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname, - (SELECT id FROM hourtypes WHERE `key` = 'PROJECTS' LIMIT 1) AS hourtype_id, + (hourtype_id + 8) AS hourtype_id, PRH.id, USR.id AS employee_id, hours, diff --git a/public/js/lib/modules/projects/employeehoursModule.js b/public/js/lib/modules/projects/employeehoursModule.js index 351df42..4c54e84 100644 --- a/public/js/lib/modules/projects/employeehoursModule.js +++ b/public/js/lib/modules/projects/employeehoursModule.js @@ -9,7 +9,7 @@ dbo.employeehoursInit = function () { if ( dbo.employeehoursModel !== undefined ) { - dbo.employeehoursModel.init(); + dbo.employeehoursModel.refreshEmployeehours(); } else { dbo.employeehoursModel = { @@ -40,8 +40,6 @@ dbo.employeehoursInit = function () { vm.hourtypes( data ); dbo.offerDataService.getOffersWithoutProject( function ( data ) { vm.offersWithoutProject( data ); - console.log( data ); - console.log( vm.offersWithoutProject() ); dbo.userDataService.getUserWithprojects( function ( data ) { vm.employees.removeAll(); _.each( data, function ( p ) {