diff --git a/application/models/eloquent/queries/QinvoiceMonthOverview.php b/application/models/eloquent/queries/QinvoiceMonthOverview.php index 569dca9..1816b7d 100644 --- a/application/models/eloquent/queries/QinvoiceMonthOverview.php +++ b/application/models/eloquent/queries/QinvoiceMonthOverview.php @@ -33,7 +33,7 @@ class QinvoiceMonthOverview { GROUP BY month_id ) AS PAY ON MNT.id = PAY.month_id - JOIN projects PRJ + LEFT JOIN projects PRJ GROUP BY MNT.id ORDER BY MNT.id "; diff --git a/application/views/modals/partials/_forecasts.php b/application/views/modals/partials/_forecasts.php index 88fe6e7..e626fac 100644 --- a/application/views/modals/partials/_forecasts.php +++ b/application/views/modals/partials/_forecasts.php @@ -1,7 +1,7 @@

- prognoses + prognoses (incl.btw)

diff --git a/application/views/modals/partials/_invoices.php b/application/views/modals/partials/_invoices.php index dd5e189..5ca8891 100644 --- a/application/views/modals/partials/_invoices.php +++ b/application/views/modals/partials/_invoices.php @@ -1,7 +1,7 @@

- uitgaande facturen + uitgaande facturen (incl btw)

diff --git a/application/views/modals/partials/_reservations.php b/application/views/modals/partials/_reservations.php index 15fe9bd..67b3c16 100644 --- a/application/views/modals/partials/_reservations.php +++ b/application/views/modals/partials/_reservations.php @@ -1,7 +1,7 @@

- Reserveringen + Reserveringen (incl. btw)

diff --git a/application/views/pages/projects_view.php b/application/views/pages/projects_view.php index 34d674c..66f7a17 100644 --- a/application/views/pages/projects_view.php +++ b/application/views/pages/projects_view.php @@ -5,9 +5,10 @@ projectleider klant start - eind eigen omzet overige omzet + kosten + totaal   @@ -25,15 +26,18 @@ - - - + + + + + + @@ -51,7 +55,7 @@ - + diff --git a/public/css/main.css b/public/css/main.css index d5d26bf..e946297 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -385,4 +385,11 @@ th.focus-green{ #project-scroller { overflow: auto; } +.nav-item{ + margin-top:10px; +} +.nav-item .active{ + background-color :#188477 !important; + color:#fff !important; +} diff --git a/public/js/lib/modules/projects/projectsModule.js b/public/js/lib/modules/projects/projectsModule.js index 0f16f5d..48581e9 100644 --- a/public/js/lib/modules/projects/projectsModule.js +++ b/public/js/lib/modules/projects/projectsModule.js @@ -126,6 +126,8 @@ dbo.projectsInit = function () { self.totalOwnrevenue = Number( data.offer.own_revenue ); self.totalOtherrevenue = Number( data.offer.other_revenue ); + self.costs = Number( data.offer.costs ); + self.total = Number( data.offer.own_revenue ) + Number( data.offer.other_revenue ) + Number( data.offer.costs ); }, Revenue: function ( data ) {