Overigen/dbois
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debug 8

Browse Source
This commit is contained in:
theo
2018-07-31 15:55:44 +02:00
parent 26f16ee088
commit 154d793ca5
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/eloquent/queries/EmployeehoursMonthly.php
+1 -1
View File
@@ -30,7 +30,7 @@ class EmployeehoursMonthly {
$sql.=" $sql.="
UNION UNION
SELECT CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname, 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, PRH.id,
USR.id AS employee_id, USR.id AS employee_id,
hours, hours,
public/js/lib/modules/projects/employeehoursModule.js
+1 -3
View File
@@ -9,7 +9,7 @@
dbo.employeehoursInit = function () { dbo.employeehoursInit = function () {
if ( dbo.employeehoursModel !== undefined ) { if ( dbo.employeehoursModel !== undefined ) {
dbo.employeehoursModel.init(); dbo.employeehoursModel.refreshEmployeehours();
} else { } else {
dbo.employeehoursModel = { dbo.employeehoursModel = {
@@ -40,8 +40,6 @@ dbo.employeehoursInit = function () {
vm.hourtypes( data ); vm.hourtypes( data );
dbo.offerDataService.getOffersWithoutProject( function ( data ) { dbo.offerDataService.getOffersWithoutProject( function ( data ) {
vm.offersWithoutProject( data ); vm.offersWithoutProject( data );
console.log( data );
console.log( vm.offersWithoutProject() );
dbo.userDataService.getUserWithprojects( function ( data ) { dbo.userDataService.getUserWithprojects( function ( data ) {
vm.employees.removeAll(); vm.employees.removeAll();
_.each( data, function ( p ) { _.each( data, function ( p ) {