Overigen/dbois
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

diverse verzoeken Peter

Browse Source
This commit is contained in:
theo
2020-08-21 15:04:59 +02:00
parent 437d969313
commit 653ae0342f
6 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/dashboard/DashboardController.php
+2 -2
View File
@@ -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' )))
] );
}
application/controllers/reports/ReportsController.php
+1
View File
@@ -36,6 +36,7 @@ class ReportsController extends MY_Controller {
$projects = $recapprojects->getProjects();
$this->json( $projects );
}
application/core/MY_Controller.php
+1 -1
View File
@@ -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' );
application/libraries/reports/invoice/InvoiceForecast.php
+2 -1
View File
@@ -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 {
];
}
}
}
application/views/pages/invoicereport_view.php
+1 -1
View File
@@ -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'">
application/views/reports/invoices/invoiceforecast_report.php
+13 -5
View File
@@ -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>
</table>