Spreadsheet

This commit is contained in:
2018-07-29 21:26:49 +02:00
parent 30535f7048
commit b86c3fc4b9
26 changed files with 1286 additions and 432 deletions
@@ -0,0 +1,61 @@
<div id="INVOICEREPORT">
<div class="row">
<div class="col-md-1">
<label>jaar</label>
</div>
<div class="col-md-2">
<input type="text" class="form-control" data-bind="textInput:selectedYear, event:{keyup:checkYear}">
<div class="invalid-feedback" data-bind="visible: ! validYear()">geen geldig jaar</div>
</div>
<div class="col-md-2">
<button class="btn btn-success" data-bind="click:createSpreadsheet">
maak spreadsheet
</button>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="nav-tabs-horizontal">
<ul class="nav nav-tabs nav-tabs-solid">
<li class="nav-item"
data-bind="click:setActivetab.bind($data, 'invoice')" style="z-index:10">
<a class="nav-link"
data-bind="css:{'active':invoiceTab() == 'invoice'}">facturen</a>
</li>
<li class="nav-item" data-bind="click:setActivetab.bind($data, 'forecast')" style="z-index:10">
<a class="nav-link"
data-bind="css:{'active':invoiceTab() == 'forecast'}">prognoses</a>
</li>
<li class="nav-item" data-bind="click:setActivetab.bind($data, 'monthforecast')" style="z-index:10">
<a class="nav-link"
data-bind="css:{'active':invoiceTab() == 'monthforecast'}">maand prognoses</a>
</li>
<li class="nav-item" data-bind="click:setActivetab.bind($data, 'monthpayments')" style="z-index:10">
<a class="nav-link" data-bind="css:{'active':invoiceTab() == 'monthpayments'}">maand betalingen</a>
</li>
<li class="nav-item" data-bind="click:setActivetab.bind($data, 'externals')" style="z-index:10">
<a class="nav-link" data-bind="css:{'active':invoiceTab() == 'externals'}">onderaannemers</a>
</li>
</ul>
<div class="tab-content">
<div data-bind="visible:invoiceTab() == 'invoice'">
<?php $this->load->view('reports/invoices/invoiceoverview_report'); ?>
</div>
<div id="invoiceforecast" data-bind="visible:invoiceTab() == 'forecast'">
<?php $this->load->view('reports/invoices/invoiceforecast_report'); ?>
</div>
<div id="invoiceforecast" data-bind="visible:invoiceTab() == 'monthforecast'">
<?php $this->load->view('reports/invoices/monthforecast_report'); ?>
</div>
<div id="invoiceforecast" data-bind="visible:invoiceTab() == 'monthpayments'">
<?php $this->load->view('reports/invoices/monthpayment_report'); ?>
</div>
<div id="invoiceforecast" data-bind="visible:invoiceTab() == 'externals'">
<?php $this->load->view('reports/invoices/contractors_report'); ?>
</div>
</div>
</div>
</div>
</div>
</div>
@@ -1,37 +0,0 @@
<div id="OUTGOINGINVOICES">
<div class="row">
<div class="col-md-1">
<label>jaar</label>
</div>
<div class="col-md-2">
<input type="text" class="form-control" data-bind="textInput:selectedYear, event:{keyup:checkYear}">
<div class="invalid-feedback" data-bind="visible: ! validYear()">geen geldig jaar</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="nav-tabs-horizontal">
<ul class="nav nav-tabs nav-tabs-solid">
<li class="nav-item" data-bind="click:setActivetab.bind($data, 'invoice')" style="z-index:10">
<a class="nav-link" data-bind="css:{'active':invoiceTab() == 'invoice'}">facturen</a>
</li>
<li class="nav-item" data-bind="click:setActivetab.bind($data, 'forecast')" style="z-index:10">
<a class="nav-link" data-bind="css:{'active':invoiceTab() == 'forecast'}">prognoses</a>
</li>
<li class="nav-item" data-bind="click:setActivetab.bind($data, 'monthforecast')" style="z-index:10">
<a class="nav-link" data-bind="css:{'active':invoiceTab() == 'monthforecast'}">maand prognoses</a>
</li>
<li class="nav-item" data-bind="click:setActivetab.bind($data, 'monthpayments')" style="z-index:10">
<a class="nav-link" data-bind="css:{'active':invoiceTab() == 'monthpayments'}">maand betalingen</a>
</li>
<li class="nav-item" data-bind="click:setActivetab.bind($data, 'externals')" style="z-index:10">
<a class="nav-link" data-bind="css:{'active':invoiceTab() == 'externals'}">onderaannemers</a>
</li>
</ul>
<div class="tab-content">
<?php $this->load->view('reports/invoices/_invoicetable'); ?>
</div>
</div>
</div>
</div>
</div>
+1 -1
View File
@@ -44,7 +44,7 @@
<script src="js/lib/modules/projects/employeehoursModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/reports/monthlyEmployeeHoursModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/reports/employeeHours.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/reports/outgoingInvoices.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/reports/invoicereport.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/reports/reservations.js?version=<?= $this->version ?>"></script>
<!-- ***********MODALS************* -->
@@ -1,218 +0,0 @@
<table class="table table-condensed" style="font-size:0.8em;">
<thead>
<tr>
<th class="rotate">
<div><span>project</span></div>
</th>
<th class="rotate" width="150px">
<div><span>klant</span></div>
</th>
<th class="rotate" width="100px">
<div><span>status afgehandeld</span></div>
</th>
<!-- <th class="rotate">-->
<!-- <div><span>projectleider</span></div>-->
<!-- </th>-->
<!-- ko if:$root.invoiceTab() == 'invoice' -->
<th class="rotate">
<div><span>te factureren(excl btw)</span></div>
</th>
<th class="rotate">
<div><span>te factureren(incl btw)</span></div>
</th>
<th class="rotate">
<div><span>gefactureerd <br />voorgaande jaren(incl btw)</span></div>
</th>
<th class="rotate">
<div><span>gefactureerd <br />lopend jaar(incl btw)</span></div>
</th>
<th class="rotate">
<div><span>totaal gefactureerd</span></div>
</th>
<th class="rotate">
<div><span>betaald voorgaande jaren</span></div>
</th>
<th class="rotate">
<div><span>betaald lopend jaar</span></div>
</th>
<th class="rotate">
<div><span>totaal betaald</span></div>
</th>
<th class="rotate">
<div><span>nog niet betaald</span></div>
</th>
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'forecast' -->
<th class="rotate" width="100px">
<div><span>nog te factureren (incl.btw)</span></div>
</th>
<th class="rotate" width="100px">
<div><span>nog te factureren lopend jaar</span></div>
</th>
<th class="rotate" width="100px">
<div><span>nog te factureren na lopend jaar</span></div>
</th>
<th class="rotate" width="100px">
<div><span>nog te prognotiseren</span></div>
</th>
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'monthforecast' -->
<th class="rotate">
<div><span>te factureren(incl btw)</span></div>
</th>
<!-- ko foreach:months -->
<th class="rotate"><div><span data-bind="text:month"></span></div></th>
<!-- /ko -->
<th class="rotate">
<div><span>te factureren volgende jaren</span></div>
</th>
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'monthpayments' -->
<!-- ko foreach:months -->
<th class="rotate"><div><span data-bind="text:month"></span></div></th>
<!-- /ko -->
<!-- /ko -->
</tr>
</thead>
<tbody>
<!-- ko foreach: projects -->
<tr>
<td><span data-bind="text:projectnumber"></span></td>
<td><span data-bind="text:customername"></span></td>
<td><span data-bind="text:statusProject == 'CLOSED' ? 'afgesloten' : 'open'"></span></td>
<!-- <td><span data-bind="text:fullname"></span>-->
</td>
<!-- ko if:$root.invoiceTab() == 'invoice' -->
<td class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:revenues"></span>
</td>
<td class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:totalInvoice"></span>
</td>
<td class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:invoicedOtherYears"></span>
</td>
<td class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:invoicedCurentYear"></span>
</td>
<th class="align-right focus-green">
<i class="icon fa-euro"></i>
<span data-bind="text:totalInvoiced"></span>
</th>
<td class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:invoicedOtherYearsPayed"></span>
</td>
<td class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:invoicedCurentYearPayed"></span>
</td>
<th class="align-right focus-green">
<i class="icon fa-euro"></i>
<span data-bind="text:totalInvoicedPayed"></span>
</th>
<th class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:notPayed"></span>
</th>
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'forecast' -->
<td class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:toInvoice"></span>
</td>
<td class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:currentforecast"></span>
</td>
<td class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:otherforecast"></span>
</td>
<th class="align-right focus-green">
<i class="icon fa-euro"></i>
<span data-bind="text:missingForecast"></span>
</th>
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'monthforecast' -->
<td class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:toInvoice"></span>
</td>
<!-- ko foreach:months -->
<td class="align-right">
<span data-bind="text:forecastamount">
</span>
</td>
<!-- /ko -->
<td class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:toInvoiceFuture">
</span>
</td>
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'monthpayments' -->
<!-- ko foreach:months -->
<td class="align-right">
<span data-bind="text:paymentamount">
</span>
</td>
<!-- /ko -->
<!-- /ko -->
</tr>
<!-- /ko -->
</tbody>
<tfoot>
<tr>
<th colspan="3" class="align-right">
totaal
</th>
<!-- ko if:$root.invoiceTab() == 'forecast' -->
<th class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:totalToInvoice"></span>
</th>
<th class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:totalCurrentforecast"></span>
</th>
<th class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:totalOtherforecast"></span>
</th>
<th class="align-right focus-green">
<i class="icon fa-euro"></i>
<span data-bind="text:totalMissingForecast"></span>
</th>
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'monthforecast' -->
<th class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:totalToInvoice"></span>
</th>
<!-- ko foreach:months -->
<th class="align-right">
<span data-bind="text:dbo.helpers.numberWithPoints($root['forecast' + month]())">
</span>
</th>
<!-- /ko -->
<th class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:totalToInvoiceFuture"></span>
</th>
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'monthpayments' -->
<!-- ko foreach:months -->
<th class="align-right">
<span data-bind="text:dbo.helpers.numberWithPoints($root['payment' + month]())">
</span>
</th>
<!-- /ko -->
<!-- /ko -->
</tr>
</tfoot>
</table>
@@ -0,0 +1,7 @@
<?php
/**
* Created by Pensare Software.
* User: Theo Weijmer
* Date: 29/07/2018
* Time: 13:21
*/
@@ -0,0 +1,55 @@
<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><span>klant</span></div>
</th>
<th class="rotate">
<div><span>Nog te factureren<br />incl. btw</span></div>
</th>
<th class="rotate">
<div><span>Nog te factureren<br />lopend boekjaar incl. btw</span></div>
</th>
<th class="rotate">
<div><span>Nog te factureren<br /> na lopend boekjaar incl. btw</span></div>
</th>
<th class="rotate">
<div><span>Nog te prognotiseren<br />incl. btw</span></div>
</th>
</tr>
</thead>
<tbody>
<!-- ko foreach: forecasts -->
<tr>
<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>
<td class="align-right"><span data-bind="text:forecastOtherYears"></span></td>
<td class="align-right focus-green"><span data-bind="text:forecastRemaining"></span></td>
</tr>
<!-- /ko -->
</tbody>
<tfoot>
<tr>
<th colspan="2" class="align-right">
totaal
</th>
<th class="align-right">
<span data-bind="text:needInvoice"></span>
</th>
<th class="align-right">
<span data-bind="text:forecastThisYear"></span>
</th>
<th class="align-right">
<span data-bind="text:forecastOtherYears"></span>
</th>
<th class="align-right focus-green">
<span data-bind="text:forecastRemaining"></span>
</th>
</tr>
</tfoot>
</table>
@@ -0,0 +1,69 @@
<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><span>klant</span></div>
</th>
<th class="rotate">
<div><span>Totaal te factureren<br />excl. btw</span></div>
</th>
<th class="rotate">
<div><span>Totaal te factureren<br />incl. btw</span></div>
</th>
<th class="rotate">
<div><span>Gefactureerd overige jaren<br />incl. btw</span></div>
</th>
<th class="rotate">
<div><span>Gefactureerd lopende boekjaar<br />incl. btw</span></div>
</th>
<th class="rotate">
<div><span>Gefactureerd totaal<br />incl. btw</span></div>
</th>
<th class="rotate">
<div><span>Nog te factureren<br />incl. btw</span></div>
</th>
</tr>
</thead>
<tbody>
<!-- ko foreach: invoiceOverview -->
<tr>
<td><span data-bind="text:projectname"></span></td>
<td><span data-bind="text:customer"></span></td>
<td class="align-right"><span data-bind="text:totalToInvoicingExcl"></span></td>
<td class="align-right"><span data-bind="text:totalToInvoicingIncl"></span></td>
<td class="align-right"><span data-bind="text:totalInvoicedOtherYears"></span></td>
<td class="align-right"><span data-bind="text:totalInvoicedThisYear"></span></td>
<td class="align-right"><span data-bind="text:invoicesTotal"></span></td>
<td class="align-right focus-green"><span data-bind="text:needInvoice"></span></td>
</tr>
<!-- /ko -->
</tbody>
<tfoot>
<tr>
<th colspan="2" class="align-right">
totaal
</th>
<th class="align-right">
<span data-bind="text:totalToInvoicingExcl"></span>
</th>
<th class="align-right">
<span data-bind="text:totalToInvoicingIncl"></span>
</th>
<th class="align-right">
<span data-bind="text:totalInvoicedOtherYears"></span>
</th>
<th class="align-right">
<span data-bind="text:totalInvoicedThisYear"></span>
</th>
<th class="align-right">
<span data-bind="text:invoicesTotal"></span>
</th>
<th class="align-right focus-green">
<span data-bind="text:needInvoice"></span>
</th>
</tr>
</tfoot>
</table>
@@ -0,0 +1,61 @@
<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><span>klant</span></div>
</th>
<th class="rotate">
<div><span>Nog te factureren<br />incl. btw</span></div>
</th>
<!-- ko foreach:months -->
<th class="rotate">
<div><span data-bind="text:month"></span></div>
</th>
<!-- /ko -->
<th class="rotate">
<div><span>Nog te factureren<br /> na lopend boekjaar incl. btw</span></div>
</th>
<th class="rotate">
<div><span>Nog te prognotiseren<br />incl. btw</span></div>
</th>
</tr>
</thead>
<tbody>
<!-- ko foreach: monthForecasts -->
<tr>
<td><span data-bind="text:projectname"></span></td>
<td><span data-bind="text:customer"></span></td>
<td class="align-right focus-green"><span data-bind="text:needInvoice"></span></td>
<!-- ko foreach : forecastMonths -->
<td class="align-right"><span data-bind="text:forecastamount"></span></td>
<!-- /ko -->
<td class="align-right"><span data-bind="text:forecastOtherYears"></span></td>
<td class="align-right focus-green"><span data-bind="text:forecastRemaining"></span></td>
</tr>
<!-- /ko -->
</tbody>
<tfoot>
<tr>
<th colspan="2" class="align-right">
</th>
<th class="align-right focus-green">
<span data-bind="text:needInvoice"></span>
</th>
<!-- ko foreach:monthTotals -->
<th class="align-right">
<span data-bind="text:forecastamount()"></span>
</th>
<!-- /ko -->
<th class="align-right">
<span data-bind="text:forecastOtherYears"></span>
</th>
<th class="align-right focus-green">
<span data-bind="text:forecastRemaining"></span>
</th>
</tr>
</tfoot>
</table>
@@ -0,0 +1,47 @@
<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><span>klant</span></div>
</th>
<!-- ko foreach:months -->
<th class="rotate">
<div><span data-bind="text:month"></span></div>
</th>
<!-- /ko -->
<th class="rotate">
<div><span>Totaal gefactureerd<br />lopend boekjaar incl. btw</span></div>
</th>
</tr>
</thead>
<tbody>
<!-- ko foreach: monthPayments -->
<tr>
<td><span data-bind="text:projectname"></span></td>
<td><span data-bind="text:customer"></span></td>
<!-- ko foreach : paymentMonths -->
<td class="align-right"><span data-bind="text:paymentamount"></span></td>
<!-- /ko -->
<td class="align-right focus-green"><span data-bind="text:totalProjectPayments"></span></td>
</tr>
<!-- /ko -->
</tbody>
<tfoot>
<tr>
<th colspan="2" class="align-right">
totaal
</th>
<!-- ko foreach:monthPaymentTotals -->
<th class="align-right">
<span data-bind="text:paymentamount"></span>
</th>
<!-- /ko -->
<th class="align-right focus-green">
<span data-bind="text:totalProjectPayments"></span>
</th>
</tr>
</tfoot>
</table>