verwerken diverse opmerkingen

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 ";
 

application/views/modals/partials/_forecasts.php

@@ -1,7 +1,7 @@
 <div class="panel panel-bordered panel-primary panel-line">
     <div class="panel-heading panel-heading-project">
         <h3 class="">
-            prognoses
+            prognoses (incl.btw)
         </h3>
     </div>
     <div class="panel-body panel-body-project">

application/views/modals/partials/_invoices.php

@@ -1,7 +1,7 @@
 <div class="panel panel-bordered panel-primary panel-line">
     <div class="panel-heading panel-heading-project">
         <h3 class="">
-            uitgaande facturen
+            uitgaande facturen (incl btw)
         </h3>
     </div>
     <div class="panel-body panel-body-project" style="overflow-y:scroll;">

application/views/modals/partials/_reservations.php

@@ -1,7 +1,7 @@
 <div class="panel panel-bordered panel-primary panel-line">
     <div class="panel-heading panel-heading-project">
         <h3 class="">
-            Reserveringen
+            Reserveringen (incl. btw)
         </h3>
     </div>
     <div class="panel-body panel-body-project">

application/views/pages/projects_view.php

@@ -5,9 +5,10 @@
         <th class="table-tealish-header">projectleider</th>
         <th class="table-tealish-header">klant</th>
         <th class="table-tealish-header">start</th>
-        <th class="table-tealish-header">eind</th>
         <th class="table-tealish-header align-right">eigen omzet</th>
         <th class="table-tealish-header align-right">overige omzet</th>
+        <th class="table-tealish-header align-right">kosten</th>
+        <th class="table-tealish-header align-right">totaal</th>
         <th class="table-tealish-header">&nbsp;</th>
     </tr>
     </thead>
@@ -25,15 +26,18 @@
         <td data-bind="click:$root.selectPoject" class="pointer">
             <span data-bind="text:startdate"></span>
         </td>
-        <td data-bind="click:$root.selectPoject" class="pointer">
-            <span data-bind="text:enddate"></span>
-        </td>
         <td data-bind="click:$root.selectPoject" class="pointer align-right">
             <span data-bind="text:dbo.helpers.numberWithPoints(totalOwnrevenue.toFixed(0))"></span>
         </td>
         <td data-bind="click:$root.selectPoject" class="pointer align-right">
             <span data-bind="text:dbo.helpers.numberWithPoints(totalOtherrevenue.toFixed(0))"></span>
         </td>
+        <td data-bind="click:$root.selectPoject" class="pointer align-right">
+            <span data-bind="text:dbo.helpers.numberWithPoints(costs.toFixed(0))"></span>
+        </td>
+        <td data-bind="click:$root.selectPoject" class="pointer align-right">
+            <b data-bind="text:dbo.helpers.numberWithPoints(total.toFixed(0))"></b>
+        </td>
         <td>
             <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editProject"></i>
             <!-- ko if:archive == 'F' -->
@@ -51,7 +55,7 @@
     </tbody>
     <tfoot>
     <tr>
-        <td colspan="6" class="">
+        <td colspan="5" class="">
             <!--                        <button class="btn btn-primary btn-round btn-sm" data-bind="click:newProject">-->
             <!--                            nieuw project-->
             <!--                        </button>-->

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;
+}
 

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 ) {