diversen uren en dashboard

This commit is contained in:
2022-01-17 16:40:03 +01:00
parent fef464dc4f
commit 32fb520739
3 changed files with 13 additions and 17 deletions
@@ -133,7 +133,7 @@ class DashboardController extends MY_Controller {
{ {
$totalChance += $totalChance +=
ROUND( ROUND(
( $offer->own_revenue + $offer->other_revenue ) * ( $offer->own_revenue ) * // + $offer->other_revenue mail 17-01-2022
( $offer->acceptance_chance / 100 ), 0 ); ( $offer->acceptance_chance / 100 ), 0 );
} }
+1 -1
View File
@@ -16,7 +16,7 @@ class MY_Controller extends CI_Controller {
{ {
parent::__construct(); parent::__construct();
$this->version = '1.00.7'; $this->version = '1.00.8';
$this->load->library( 'beheer/session/RetrieveUserSession' ); $this->load->library( 'beheer/session/RetrieveUserSession' );
@@ -92,19 +92,10 @@ dbo.employeehoursInit = function () {
saveDelayedEmployeehours: function () { saveDelayedEmployeehours: function () {
var vm = dbo.employeehoursModel; var vm = dbo.employeehoursModel;
var self = this; vm.saveEmployeehours( this );
self.dirty( true );
if ( timeout ) {
clearTimeout( timeout );
timeout = null;
}
timeout = setTimeout( function () {
vm.saveEmployeehours( self );
}, 300 );
}, },
saveEmployeehours: function ( self = false ) { saveEmployeehours: function ( self = false ) {
console.log( 'inside' );
self.dirty( true ); self.dirty( true );
if ( !self ) self = this; if ( !self ) self = this;
@@ -124,11 +115,16 @@ dbo.employeehoursInit = function () {
hourType : self.hourType(), hourType : self.hourType(),
project_id : self.projectID() project_id : self.projectID()
}; };
if(timeout) {
clearTimeout(timeout);
timeout = null;
}
timeout = setTimeout(function(){
dbo.employeehoursDataService.saveEmployeehour( submitDATA, function ( data ) { dbo.employeehoursDataService.saveEmployeehour( submitDATA, function ( data ) {
self.id( data.employeehourID ); self.id( data.employeehourID );
self.dirty( false ); self.dirty( false );
} ); } );
},200);
}, },
editEmployeehour: function () { editEmployeehour: function () {