fix for employeehours
This commit is contained in:
@@ -75,7 +75,8 @@ dbo.employeehoursInit = function () {
|
||||
project_id : employeeHour ? employeeHour.projectID() : null,
|
||||
hours : 0,
|
||||
inEdit : true,
|
||||
dirty : true
|
||||
dirty : true,
|
||||
archive : 'F'
|
||||
};
|
||||
|
||||
vm.employeehours.push( new vm.Employeehour( employeehour ) );
|
||||
@@ -103,6 +104,7 @@ dbo.employeehoursInit = function () {
|
||||
},
|
||||
|
||||
saveEmployeehours: function ( self = false ) {
|
||||
console.log( 'inside' );
|
||||
self.dirty( true );
|
||||
if ( !self ) self = this;
|
||||
|
||||
@@ -234,7 +236,10 @@ dbo.employeehoursInit = function () {
|
||||
self.hours = ko.observable( data.hours );
|
||||
self.inEdit = ko.observable( data.inEdit || false );
|
||||
self.projectID = ko.observable( data.project_id );
|
||||
self.type = ko.observable( data.type );
|
||||
self.archive = ko.observable( data.archive );
|
||||
self.dirty = ko.observable( data.dirty || false );
|
||||
self.projectname = ko.observable( data.projectname );
|
||||
self.hourType = ko.pureComputed( function () {
|
||||
return dbo.helpers.findArrayElement( 'id', 'key', this.hourtype_id(), vm.hourtypes() );
|
||||
}, this );
|
||||
@@ -256,7 +261,7 @@ dbo.employeehoursInit = function () {
|
||||
ko.applyBindings( dbo.employeehoursModel, document.getElementById( 'EMPLOYEEHOURS' ) );
|
||||
|
||||
dbo.employeehoursModel.selectedEmployeeID.subscribe( function () {
|
||||
dbo.userDataService.getUserActiveProjects( dbo.currentUser.id, function ( data ) {
|
||||
dbo.userDataService.getUserActiveProjects( dbo.employeehoursModel.selectedEmployeeID(), function ( data ) {
|
||||
dbo.employeehoursModel.projects( data );
|
||||
} );
|
||||
} );
|
||||
|
||||
Reference in New Issue
Block a user