diff --git a/application/views/modals/partials/_dashboard.php b/application/views/modals/partials/_dashboard.php new file mode 100644 index 0000000..dcf149f --- /dev/null +++ b/application/views/modals/partials/_dashboard.php @@ -0,0 +1,5 @@ +
+
+ load->view( 'modals/partials/_projectdashboard' ); ?> +
+
\ No newline at end of file diff --git a/application/views/modals/partials/_financials.php b/application/views/modals/partials/_financials.php new file mode 100644 index 0000000..355135d --- /dev/null +++ b/application/views/modals/partials/_financials.php @@ -0,0 +1,19 @@ +
+ + load->view( 'modals/partials/_projectoffers' ); ?> + +
+ load->view( 'modals/partials/_projectcosts' ); ?> +
+
+ load->view( 'modals/partials/_reservations' ); ?> +
+
+
+
+ load->view( 'modals/partials/_invoices' ); ?> +
+
+ load->view( 'modals/partials/_forecasts' ); ?> +
+
\ No newline at end of file diff --git a/application/views/modals/partials/_projectdashboard.php b/application/views/modals/partials/_projectdashboard.php index 6fc8f27..4abc35d 100644 --- a/application/views/modals/partials/_projectdashboard.php +++ b/application/views/modals/partials/_projectdashboard.php @@ -1,25 +1,23 @@
-
+
+ optionsText:'name', + optionsValue: 'id', + value:customerID, + disable:offers().length > 0, + optionsCaption:'selecteer klant', + event:{change:saveProject}, + css:{'is-invalid': ! customerID()}"> selecteer een klant
-
-
@@ -33,8 +31,6 @@
-
-
@@ -52,8 +48,6 @@
-
-
@@ -72,8 +66,6 @@
-
-
@@ -83,39 +75,26 @@ data-bind="textInput:projectname, event:{keyup:saveProjectname}"/>
-
-

eigen omzet:

-
-

overige omzet:

- -
-
-

te besteden uren :

-
-
-

-
-
-
-
-
- + + +
+
+

te besteden uren :

+
+
+

-
-
- -
-
-
\ No newline at end of file +
+ diff --git a/application/views/modals/project_modal.php b/application/views/modals/project_modal.php index d978197..7dee70b 100644 --- a/application/views/modals/project_modal.php +++ b/application/views/modals/project_modal.php @@ -3,37 +3,35 @@
-
-
- load->view('modals/partials/_projectdashboard'); ?> -
-
-
- -load->view( 'modals/partials/_projectoffers' ); ?> - -
- load->view( 'modals/partials/_projectcosts' ); ?> -
-
- load->view( 'modals/partials/_reservations' ); ?> -
+
+ load->view( 'modals/partials/_dashboard' ); ?> +
+
+ load->view( 'modals/partials/_financials' ); ?> +
+
+
+
+ load->view( 'modals/partials/_projectemployees' ); ?>
-
-
- load->view( 'modals/partials/_invoices' ); ?> -
-
- load->view('modals/partials/_forecasts'); ?> -
-
-
-
-
-
- load->view( 'modals/partials/_projectemployees' ); ?> -
-
- load->view( 'modals/partials/_hours' ); ?> -
+
+ load->view( 'modals/partials/_hours' ); ?>
+
-
-
-
- load->view( 'modals/partials/_projectfiles' ); ?> -
-
- load->view( 'modals/partials/_projectcomments' ); ?> -
+
+
+
+ load->view( 'modals/partials/_projectfiles' ); ?> +
+
+ load->view( 'modals/partials/_projectcomments' ); ?>
+
\ No newline at end of file diff --git a/public/js/lib/modals/projectModal.js b/public/js/lib/modals/projectModal.js index c6ffbf8..16bde54 100644 --- a/public/js/lib/modals/projectModal.js +++ b/public/js/lib/modals/projectModal.js @@ -46,6 +46,7 @@ $( function () { totalForecast : ko.observable(), documents : ko.observableArray( [] ), comments : ko.observableArray( [] ), + activeTab : ko.observable(), init: function () { var vm = dbo.editProjectModal; @@ -68,6 +69,12 @@ $( function () { } ); }, + setActiveTab: function ( tab ) { + var vm = dbo.editProjectModal; + + vm.activeTab( tab ); + }, + togglePayments: function () { this.showPayments( !this.showPayments() ); @@ -487,7 +494,7 @@ $( function () { if ( !self ) self = this; if ( !self.external_id ) { - self.invalidReservation(true); + self.invalidReservation( true ); return; } @@ -500,7 +507,7 @@ $( function () { dbo.projectDataService.saveReservation( submitDATA, function ( data ) { if ( data.success ) { - self.invalidReservation(false); + self.invalidReservation( false ); self.id = data.reservationID; } } );