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

Offrte gours

Browse Source
This commit is contained in:
theo
2018-07-30 10:45:53 +02:00
parent b86c3fc4b9
commit 708a22f734
8 changed files with 119 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/lib/dataservices/offerDataservice.js
+7
View File
@@ -14,6 +14,13 @@ dbo.offerDataService = {
} );
},
getOffersWithoutProject: function ( callback ) {
$.getJSON( 'index.php/projects/offersController/getOffersWithoutProject' )
.done( function ( data ) {
callback(data);
} );
},
getOffer: function ( userID, callback ) {
$.getJSON( 'index.php/projects/offersController/getOffer/' + userID )
.done( function ( data ) {
public/js/lib/modules/projects/employeehoursModule.js
+38 -19
View File
@@ -9,20 +9,21 @@
dbo.employeehoursInit = function () {
if ( dbo.employeehoursModel !== undefined ) {
dbo.employeehoursModel.refreshHours();
dbo.employeehoursModel.init();
} else {
dbo.employeehoursModel = {
employeehours : ko.observableArray( [] ),
archive : ko.observable( false ),
months : ko.observableArray( [] ),
years : ko.observableArray( [] ),
hourtypes : ko.observableArray( [] ),
employees : ko.observableArray( [] ),
selectedYear : ko.observable(),
selectedMonth : ko.observable(),
busy : false,
selectedEmployeeID: ko.observable(),
employeehours : ko.observableArray( [] ),
archive : ko.observable( false ),
months : ko.observableArray( [] ),
years : ko.observableArray( [] ),
hourtypes : ko.observableArray( [] ),
employees : ko.observableArray( [] ),
selectedYear : ko.observable(),
selectedMonth : ko.observable(),
busy : false,
selectedEmployeeID : ko.observable(),
offersWithoutProject: ko.observableArray( [] ),
init: function () {
var vm = dbo.employeehoursModel;
@@ -37,15 +38,20 @@ dbo.employeehoursInit = function () {
dbo.employeehoursDataService.getHourtypes( function ( data ) {
vm.hourtypes( data );
dbo.userDataService.getUserWithprojects( function ( data ) {
vm.employees.removeAll();
_.each( data, function ( p ) {
vm.employees.push( new vm.Employee( p ) );
} );
vm.selectedEmployeeID( dbo.currentUser.id )
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 ) {
vm.employees.push( new vm.Employee( p ) );
} );
vm.selectedEmployeeID( dbo.currentUser.id )
vm.busy = false;
vm.refreshEmployeehours();
vm.busy = false;
vm.refreshEmployeehours();
} );
} );
} );
},
@@ -90,6 +96,7 @@ dbo.employeehoursInit = function () {
if ( !self.hourtype_id() ) return;
if ( !self.hourdate() ) return;
if ( self.hourType() == 'PROJECTS' && !self.projectID() ) return;
if ( self.hourType() == 'OFFERS' && !self.projectID() ) return;
var submitDATA = {
id : self.id(),
@@ -179,14 +186,26 @@ dbo.employeehoursInit = function () {
_.each( data.projectemployees, function ( p ) {
self.projecten.push( new vm.Project( p ) );
} );
_.each( vm.offersWithoutProject(), function ( p ) {
console.log( p );
self.projecten.push( new vm.Offer( p, self.id ) );
} );
},
Project: function ( data ) {
this.projectEmployeeID = data.id;
this.type = 'PROJECT';
this.projectID = data.project.id;
this.project = data.project.projectnumber + ' - ' + data.project.projectname;
},
Offer: function ( data, employeeID ) {
this.projectemployeeID = employeeID;
this.type = 'OFFER';
this.projectID = data.id;
this.project = data.offernumber + ' - ' + data.offername;
},
Employeehour: function ( data ) {
var vm = dbo.employeehoursModel;
var self = this;