strat projects

2018-01-15 09:27:58 +01:00
parent 73f2866020
commit 97f1b988bc
13 changed files with 450 additions and 26 deletions
@@ -10,17 +10,24 @@ $( function () {
        id               : null,
        projects         : ko.observableArray( [] ),
        customers        : ko.observableArray( [] ),
+        users            : ko.observableArray( [] ),
        startdate        : ko.observable(),
        acceptance_chance: ko.observable(),
        accepteddate     : ko.observable(),
        rejectdate       : ko.observable(),
        customer_id      : ko.observable(),
        project_id       : ko.observable(),
+        offernumber      : ko.observable(),
+        offerleader_id   : ko.observable(),
+        own_revenue      : ko.observable(),
+        other_revenue    : ko.observable(),

        init: function () {
            var vm = dbo.editOfferModal;

            dbo.editOfferModal.refreshCustomers();
+
+            dbo.editOfferModal.refreshUsers();
        },

        newEditOffer: function ( offer, callback ) {
@@ -45,6 +52,10 @@ $( function () {
                id               : vm.id,
                project_id       : vm.project_id(),
                customer_id      : vm.customer_id(),
+                offerleader_id   : vm.offerleader_id(),
+                offernumber      : vm.offernumber(),
+                own_revenue      : vm.own_revenue(),
+                other_revenue    : vm.other_revenue(),
                startdate        : vm.startdate(),
                acceptance_chance: vm.acceptance_chance(),
                accepteddate     : vm.accepteddate(),
@@ -87,10 +98,14 @@ $( function () {
            vm.id = offer.id || 0;
            vm.customer_id( offer.customer_id || null );
            vm.project_id( offer.project_id || null );
+            vm.offerleader_id( offer.offerleader_id || null );
+            vm.offernumber( offer.offernumber || null );
            vm.startdate( offer.startdate || null );
            vm.acceptance_chance( offer.acceptance_chance || 0 );
            vm.accepteddate( offer.accepteddate || null );
            vm.rejectdate( offer.rejectdate || null );
+            vm.own_revenue( offer.own_revenue || 0 );
+            vm.other_revenue( offer.other_revenue || 0 )
        },

        showOfferModal: function () {
@@ -113,6 +128,14 @@ $( function () {
            } );
        },

+        addUser:function(){
+            var vm = dbo.editOfferModal;
+            dbo.editUserModal.newEditUser( false, function () {
+                vm.refreshUsers();
+            } );
+
+        },
+
        refreshCustomers: function () {
            var vm = dbo.editOfferModal;
            dbo.customerDataService.getAllCustomers( 'F', function ( data ) {
@@ -120,6 +143,13 @@ $( function () {
            } );
        },

+        refreshUsers: function () {
+            var vm = dbo.editOfferModal;
+            dbo.userDataService.getAllUsers( 'F', function ( data ) {
+                vm.users( data );
+            } );
+        },
+
        resetDate: function ( field ) {
            var vm = dbo.editOfferModal;

@@ -142,7 +172,9 @@ $( function () {
    }, dbo.editOfferModal );

    dbo.editOfferModal.formValid = ko.pureComputed( function () {
+        if ( !this.offernumber() ) return false;
        if ( !this.customer_id() ) return false;
+        if ( !this.offerleader_id() ) return false;
        if ( !this.offerDateValid() ) return false;

        return true;