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

Merge branch 'master' into feature/dashboard

Browse Source 
# Conflicts:
#	application/models/eloquent/Projectemployee.php
This commit is contained in:
theo
2020-01-10 17:43:05 +01:00
parent 1295814ff4 5594865554
commit 090cc90de1
35 changed files with 6932 additions and 1991 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/lib/dataservices/reportsDataService.js
+29 -25
View File
@@ -8,32 +8,36 @@
dbo.reportsDataService = {
getUsedYears: function ( callback ) {
$.getJSON( 'index.php/reports/reportsdefaultController/getUsedYears' )
.done( function ( data ) {
callback( data );
} );
},
getUsedYears: function ( callback ) {
$.getJSON( 'index.php/reports/reportsdefaultController/getUsedYears' )
.done( function ( data ) {
callback( data );
} );
},
getRecapProjects: function(archive, callback){
$.getJSON( 'index.php/reports/reportsController/recapProjects/' + archive )
.done( function ( data ) {
callback( data );
} );
},
getRecapProjects: function ( field, direction, archive, callback ) {
var submitDATA = {
field : field,
direction: direction
};
$.post( 'index.php/reports/reportsController/recapProjects/' + archive, submitDATA )
.done( function ( data ) {
callback( data );
}, 'JSON' );
},
getEmployeeHours: function ( employeeID, year, callback ) {
$.getJSON( 'index.php/reports/reportsController/getMonthlyEmployeeHoursPerProject/' + employeeID + '/' + year )
.done( function ( data ) {
callback( data );
} );
},
getEmployeeHours: function ( employeeID, year, callback ) {
$.getJSON( 'index.php/reports/reportsController/getMonthlyEmployeeHoursPerProject/' + employeeID + '/' + year )
.done( function ( data ) {
callback( data );
} );
},
saveCurrentFinnacialYear: function(projectID, amount, callback){
$.post( 'index.php/reports/reportsController/saveCurrentFinnacialYear/' + projectID, {amount:amount} )
.done( function ( data ) {
callback( data );
}, 'json' );
}
saveCurrentFinnacialYear: function ( projectID, amount, callback ) {
$.post( 'index.php/reports/reportsController/saveCurrentFinnacialYear/' + projectID, {amount: amount} )
.done( function ( data ) {
callback( data );
}, 'json' );
}
}
}
public/js/lib/dataservices/userDataservice.js
+13 -6
View File
@@ -42,12 +42,19 @@ dbo.userDataService = {
} );
},
getUniqueProjectEmployees: function ( callback ) {
$.post( 'index.php/beheer/usersController/getUniqueprojectEmployees', 'json' )
.done( function ( data ) {
callback( data );
} );
},
getUniqueProjectEmployees: function ( callback ) {
$.post( 'index.php/beheer/usersController/getUniqueprojectEmployees', 'json' )
.done( function ( data ) {
callback( data );
} );
},
getUniqueEmployeesWithActivity: function ( archive, callback ) {
$.post( 'index.php/beheer/usersController/getUniqueEmployeesWithActivity/' + archive, 'json' )
.done( function ( data ) {
callback( data );
} );
},
checkUsername: function ( username, callback ) {
$.post( 'index.php/beheer/userController/checkUsername', 'json' )