From 653ae0342f3d9f2a2580d2197270243222d0b2f1 Mon Sep 17 00:00:00 2001
From: Theo Weijmer <t.weijmer@pensare.nl>
Date: Fri, 21 Aug 2020 15:04:59 +0200
Subject: [PATCH] diverse verzoeken Peter

---
 .../dashboard/DashboardController.php          |  4 ++--
 .../controllers/reports/ReportsController.php  |  1 +
 application/core/MY_Controller.php             |  2 +-
 .../reports/invoice/InvoiceForecast.php        |  3 ++-
 application/views/pages/invoicereport_view.php |  2 +-
 .../invoices/invoiceforecast_report.php        | 18 +++++++++++++-----
 6 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/application/controllers/dashboard/DashboardController.php b/application/controllers/dashboard/DashboardController.php
index 23dc0fa..4b4066a 100644
--- a/application/controllers/dashboard/DashboardController.php
+++ b/application/controllers/dashboard/DashboardController.php
@@ -53,13 +53,13 @@ class DashboardController extends MY_Controller {
 			'revenuesThisYear'     => $this->getRevenuesThisYear(),
 			'currentFinancialYear' => round( $currentFinancialYear ),
 			'owpNextyear'          => round( $totalOwp - $currentFinancialYear ),
-			'revenuesNextyear'     => round( $currentFinancialYear / 0.4 ),
+			'revenuesNextyear'     => round( $totalOwp / 0.4 ),
 			'totalRevenues'        => round( $totalRevenues ),
 			'outstandings'         => $this->invoiceOverviews,
 			'costsToPay'           => $this->reservations(),
 			'invoiced'             => $this->getInvoiced(),
 			'totalChance'          => $this->getChanceRevenues(),
-			'totalPayment'         => Payment::getPaymentInYear( date( 'Y' ))
+			'totalPayment'         => round( Payment::getPaymentInYear( date( 'Y' )))
 		] );
 	}
 
diff --git a/application/controllers/reports/ReportsController.php b/application/controllers/reports/ReportsController.php
index 1dd5c0d..fced682 100644
--- a/application/controllers/reports/ReportsController.php
+++ b/application/controllers/reports/ReportsController.php
@@ -36,6 +36,7 @@ class ReportsController extends MY_Controller {
 
         $projects = $recapprojects->getProjects();
 
+
         $this->json( $projects );
     }
 
diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php
index 83a5103..00d55bf 100644
--- a/application/core/MY_Controller.php
+++ b/application/core/MY_Controller.php
@@ -16,7 +16,7 @@ class MY_Controller extends CI_Controller {
     {
         parent::__construct();
 
-        $this->version = '1.00.52';
+        $this->version = '1.00.6';
 
         $this->load->library( 'beheer/session/RetrieveUserSession' );
 
diff --git a/application/libraries/reports/invoice/InvoiceForecast.php b/application/libraries/reports/invoice/InvoiceForecast.php
index 89ad696..9a0a9f6 100644
--- a/application/libraries/reports/invoice/InvoiceForecast.php
+++ b/application/libraries/reports/invoice/InvoiceForecast.php
@@ -112,6 +112,7 @@ class InvoiceForecast {
     private function setProjectDetails()
     {
         $this->projectDetails = [
+        	'projectnumber'		   => $this->project->projectnumber,
             'projectname'          => $this->projectname,
             'customer'             => $this->customer,
             'needInvoice'          => number_format( $this->needInvoice, 0, ',', '.' ),
@@ -121,4 +122,4 @@ class InvoiceForecast {
         ];
     }
 
-}
\ No newline at end of file
+}
diff --git a/application/views/pages/invoicereport_view.php b/application/views/pages/invoicereport_view.php
index 9c27879..bf34ec7 100644
--- a/application/views/pages/invoicereport_view.php
+++ b/application/views/pages/invoicereport_view.php
@@ -62,7 +62,7 @@
                     <div data-bind="visible:invoiceTab() == 'invoice'">
                         <?php $this->load->view('reports/invoices/invoiceoverview_report'); ?>
                     </div>
-                    <div id="invoiceforecast" data-bind="visible:invoiceTab() == 'forecast'">
+                    <div id="cast" data-bind="visible:invoiceTab() == 'forecast'">
                         <?php $this->load->view('reports/invoices/invoiceforecast_report'); ?>
                     </div>
                     <div id="invoiceforecast" data-bind="visible:invoiceTab() == 'monthforecast'">
diff --git a/application/views/reports/invoices/invoiceforecast_report.php b/application/views/reports/invoices/invoiceforecast_report.php
index b8f306f..d196e11 100644
--- a/application/views/reports/invoices/invoiceforecast_report.php
+++ b/application/views/reports/invoices/invoiceforecast_report.php
@@ -1,9 +1,16 @@
 <table class="table table-condensed" style="font-size:0.8em;">
     <thead>
     <tr>
-        <th class="rotate">
-            <div><span>project</span></div>
-        </th>
+		<th class="rotate">
+			<div class="pointer">
+                <span data-bind="click:sortList.bind($data, 'projectnumber')">
+                    projectnummer
+                </span>
+			</div>
+		</th>
+		<th class="rotate">
+			<div><span>project</span></div>
+		</th>
         <th class="rotate">
             <div><span>klant</span></div>
         </th>
@@ -24,7 +31,8 @@
     <tbody>
     <!-- ko foreach: forecasts  -->
     <tr>
-        <td><span data-bind="text:projectname"></span></td>
+		<td><span data-bind="text:projectnumber"></span></td>
+		<td><span data-bind="text:projectname"></span></td>
         <td><span data-bind="text:customer"></span></td>
         <td class="align-right"><span data-bind="text:needInvoice"></span></td>
         <td class="align-right"><span data-bind="text:forecastThisYear"></span></td>
@@ -52,4 +60,4 @@
         </th>
     </tr>
     </tfoot>
-</table>
\ No newline at end of file
+</table>