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

Wijzigingen nav opmerking Peter 24-12-2018

Browse Source
This commit is contained in:
theo
2019-01-02 16:57:41 +01:00
parent 9569522c83
commit efcd9f2c09
19 changed files with 201 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/lib/dataservices/offerDataservice.js
+2 -2
View File
@@ -7,8 +7,8 @@
dbo.offerDataService = {
getAllOffers: function ( projectID, archive = 'F', callback ) {
$.getJSON( 'index.php/projects/offersController/getAllOffers/' + projectID + '/' + archive )
getAllOffers: function ( offersObject, callback ) {
$.post( 'index.php/projects/offersController/getAllOffers', offersObject, 'json' )
.done( function ( data ) {
callback( data );
} );
public/js/lib/dataservices/projectsDataservice.js
+2 -2
View File
@@ -7,8 +7,8 @@
dbo.projectDataService = {
getAllProjects: function ( archive = 'F', callback ) {
$.getJSON( 'index.php/projects/projectsController/getAllProjects/' + archive )
getAllProjects: function ( projectsObject, callback ) {
$.post( 'index.php/projects/projectsController/getAllProjects', projectsObject, 'json' )
.done( function ( data ) {
callback( data );
} );
public/js/lib/helpers.js
+4 -4
View File
@@ -56,10 +56,10 @@ dbo.helpers = {
},
findArrayElement: function ( toFind, element, value, array ) {
// console.log( toFind ); // het element in de array
// console.log( element );
// console.log( value );
// console.log( array );
console.log( toFind ); // het element in de array
console.log( element );
console.log( value );
console.log( array );
if ( !Array.isArray( array ) ) return null;
var foundValue = null
public/js/lib/modules/projects/employeehoursModule.js
+5 -5
View File
@@ -182,12 +182,12 @@ dbo.employeehoursInit = function () {
self.projecten = ko.observableArray( [] );
_.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 ) );
if ( p.project )
self.projecten.push( new vm.Project( p ) );
} );
// _.each( vm.offersWithoutProject(), function ( p ) {
// self.projecten.push( new vm.Offer( p, self.id ) );
// } );
},
Project: function ( data ) {
public/js/lib/modules/projects/offersModule.js
+21
View File
@@ -7,6 +7,7 @@
dbo.offersInit = function () {
var timeout;
if ( dbo.offersModel !== undefined ) {
@@ -21,6 +22,9 @@ dbo.offersInit = function () {
documents : ko.observableArray( [] ),
selectedRowID: ko.observable(),
projectID : 0,
search : ko.observable(''),
order : ko.observable('offernumber'),
direction : ko.observable(),
init: function () {
var service = dbo.offersService;
@@ -29,6 +33,23 @@ dbo.offersInit = function () {
service.refreshOffers();
},
searchOffers: function () {
var service = dbo.offersService;
if ( timeout ) {
clearTimeout( timeout );
timeout = null;
}
timeout = setTimeout( function () {
service.refreshOffers();
}, 700 );
},
directionOrderOffers : function(field){
var service = dbo.offersService;
service.directionOrderOffers(field);
},
newOffer: function () {
var service = dbo.offersService;
service.vm = dbo.offersModel;
public/js/lib/modules/projects/projectsModule.js
+36 -1
View File
@@ -7,6 +7,7 @@
dbo.projectsInit = function () {
var timeout;
if ( dbo.projectsModel !== undefined ) {
dbo.projectsModel.refreshProjects();
@@ -18,6 +19,9 @@ dbo.projectsInit = function () {
archive : ko.observable( false ),
selectedRowID: ko.observable(),
busy : false,
search : ko.observable(),
order : ko.observable( 'projectnumber' ),
direction : ko.observable(),
init: function () {
var vm = dbo.projectsModel;
@@ -25,6 +29,31 @@ dbo.projectsInit = function () {
vm.refreshProjects();
},
searchProjects: function () {
var vm = dbo.projectsModel;
if ( timeout ) {
clearTimeout( timeout );
timeout = null;
}
timeout = setTimeout( function () {
vm.refreshProjects();
}, 700 );
},
directionOrderProjects: function ( field ) {
var vm = dbo.projectsModel;
if ( field == vm.order() ) {
vm.direction( !vm.direction() );
} else {
vm.direction( true );
}
vm.order( field );
vm.refreshProjects();
},
newProject: function () {
var vm = dbo.projectsModel;
dbo.editProjectModal.addProject( function () {
@@ -103,8 +132,14 @@ dbo.projectsInit = function () {
refreshProjects: function () {
var vm = dbo.projectsModel;
var projectsObject = {
archive : vm.archive() ? 'T' : 'F',
search : vm.search(),
order : vm.order(),
direction: vm.direction() ? 'ASC' : 'DESC'
}
dbo.projectDataService.getAllProjects( vm.archive() ? 'T' : 'F', function ( data ) {
dbo.projectDataService.getAllProjects( projectsObject, function ( data ) {
vm.projects.removeAll();
$.each( data, function ( i, p ) {
vm.projects.push( new vm.Project( p ) );
public/js/lib/services/offersService.js
+24 -1
View File
@@ -78,11 +78,34 @@ dbo.offersService = {
} );
},
directionOrderOffers: function ( field ) {
var vm = dbo.offersModel;
var self = dbo.offersService;
if ( field == vm.order() ) {
vm.direction( !vm.direction() );
} else {
vm.direction( true );
}
vm.order( field );
self.refreshOffers();
},
refreshOffers: function () {
var vm = dbo.offersService.vm;
var self = dbo.offersService;
dbo.offerDataService.getAllOffers( vm.projectID , vm.archive() ? 'T' : 'F', function ( data ) {
var offersObject = {
projectID: vm.projectID,
archive : vm.archive() ? 'T' : 'F',
search : vm.search(),
order : vm.order(),
direction: vm.direction() ? 'ASC' : 'DESC'
}
dbo.offerDataService.getAllOffers( offersObject, function ( data ) {
vm.offers.removeAll();
$.each( data, function ( i, p ) {
vm.offers.push( new self.Offer( p ) );