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

Diversen nav opmerkingen

Browse Source
This commit is contained in:
theo
2018-05-03 19:54:32 +02:00
parent 6bc0b37f06
commit 860c5db95a
18 changed files with 405 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/pages/employeehoursreport_view.php
+3 -5
View File
@@ -5,10 +5,8 @@
<label>jaar</label>
</div>
<div class="col-md-2">
<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>
<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">
@@ -24,7 +22,7 @@
</ul>
<div class="tab-content">
<div class="tab-pane active">
<?php $this->load->view('reports/employeehours/employeemonthhours_view'); ?>
<?php $this->load->view( 'reports/employeehours/employeemonthhours_view' ); ?>
</div>
</div>
</div>
application/views/pages/outgoinginvoices_view.php
+4 -8
View File
@@ -1,15 +1,11 @@
<div id="OUTGOINGINVOICES">
<div class="row">
<div class="col-xl-1">
<div class="col-md-1">
<label>jaar</label>
</div>
<div class="col-xl-3">
<select class="form-control form-control-sm"
data-bind="options:years,
optionsText:'year',
optionsValue: 'id',
value:selectedYear,
event:{change:refreshInvoiceDetails}"></select>
<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">
application/views/pages/reservations_view.php
+42 -2
View File
@@ -1,14 +1,18 @@
<div id="RESERVATIONS">
<div class="row">
<div class="col-md-6">
<div class="col-md-12">
<table class="table table-condensed">
<thead>
<tr>
<th width="5px">&nbsp;</th>
<th>project</th>
<th class="align-right">Budget derden</th>
<th class="align-right">gefactureerd</th>
<th class="align-right">gereserveerd</th>
<th class="align-right">betaald</th>
<th class="align-right">saldo</th>
<th class="align-right">saldo te betalen</th>
<th class="align-right">saldo reservering</th>
<th class="align-right">saldo te factureren</th>
</tr>
</thead>
<!-- ko foreach:projects -->
@@ -25,15 +29,27 @@
<th>
<span data-bind="text:projectnumber"></span>
</th>
<th class="align-right" data-bind="visible: ! showExternals()">
<span data-bind="text:otherRevenue"></span>
</th>
<th class="align-right" data-bind="visible: ! showExternals()">
<span data-bind="text:costs"></span>
</th>
<th class="align-right" data-bind="visible: ! showExternals()">
<span data-bind="text:reservation"></span>
</th>
<th class="align-right" data-bind="visible: ! showExternals()">
<span data-bind="text:payed"></span>
</th>
<th class="align-right" data-bind="visible: ! showExternals()">
<span data-bind="text:saldoToPay"></span>
</th>
<th class="align-right" data-bind="visible: ! showExternals()">
<span data-bind="text:saldo"></span>
</th>
<th class="align-right" data-bind="visible: ! showExternals()">
<span data-bind="text:saldoInvoices"></span>
</th>
</tr>
<!-- ko if:showExternals() -->
<!-- ko foreach: externals -->
@@ -42,30 +58,50 @@
<td>
<span data-bind="text:externalName"></span>
</td>
<td>&nbsp</td>
<td class="align-right">
<span data-bind="text:costs"></span>
</td>
<td class="align-right">
<span data-bind="text:reservation"></span>
</td>
<td class="align-right">
<span data-bind="text:payed"></span>
</td>
<td class="align-right">
<span data-bind="text:saldoToPay"></span>
</td>
<td class="align-right">
<span data-bind="text:saldo"></span>
</td>
<td>&nbsp;</td>
</tr>
<!-- /ko -->
<!-- /ko -->
<!-- ko if:showExternals() -->
<tr class="subtotal">
<th colspan="2">Totaal</th>
<th class="align-right">
<span data-bind="text:otherRevenue"></span>
</th>
<th class="align-right">
<span data-bind="text:costs"></span>
</th>
<th class="align-right">
<span data-bind="text:reservation"></span>
</th>
<th class="align-right">
<span data-bind="text:payed"></span>
</th>
<th class="align-right">
<span data-bind="text:saldoToPay"></span>
</th>
<th class="align-right">
<span data-bind="text:saldo"></span>
</th>
<th class="align-right">
<span data-bind="text:saldoInvoices"></span>
</th>
</tr>
<!-- /ko -->
</tbody>
@@ -73,9 +109,13 @@
<tfoot>
<tr class="grandtotal">
<th colspan="2">Grand totaal</th>
<th class="align-right"><span data-bind="text:otherRevenue"></span></th>
<th class="align-right"><span data-bind="text:costs"></span></th>
<th class="align-right"><span data-bind="text:reservation"></span></th>
<th class="align-right"><span data-bind="text:payed"></span></th>
<th class="align-right"><span data-bind="text:saldoToPay"></span></th>
<th class="align-right"><span data-bind="text:saldo"></span></th>
<th class="align-right"><span data-bind="text:saldoInvoices"></span></th>
</tr>
</tfoot>
</table>