Diversen nav opmerkingen
This commit is contained in:
@@ -1,16 +1,16 @@
|
||||
<div class="modal modal-fade-in-scale-up modal-primary" tabindex="-1" id="employee-target-modal">
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-dialog" role="document" style="width:700px;">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">toevoegen / wijzigen medewerker uren
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</h5>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="row">
|
||||
<div class="col-md-10 col-md-offset-1">
|
||||
<div class="col-md-12">
|
||||
<table class="table table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -19,60 +19,72 @@
|
||||
<th colspan="2"> </th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>maand</th>
|
||||
<th>jaar</th>
|
||||
<th>maand</th>
|
||||
<th>jaar</th>
|
||||
<th>target per maand</th>
|
||||
<th width="25%">maand</th>
|
||||
<th width="17%">jaar</th>
|
||||
<th width="25%">maand</th>
|
||||
<th width="17%">jaar</th>
|
||||
<th width="16%" title="target per maand">target p/m</th>
|
||||
<th> </th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<!-- ko foreach:employeeTargets -->
|
||||
<tr>
|
||||
<td>
|
||||
<select data-bind="options:years,
|
||||
<td data-bind="css:{'red-line': ! saved()}">
|
||||
<select data-bind="options:$root.months,
|
||||
optionsText:'month',
|
||||
optionsValue:'monthID',
|
||||
value:startmonth,
|
||||
disable: ! changeable(),
|
||||
event:{change:$root.setUnsaved}"
|
||||
class="form-control">
|
||||
</select>
|
||||
</td>
|
||||
<td data-bind="css:{'red-line': ! saved()}">
|
||||
<select data-bind="options:$root.years,
|
||||
optionsText:'year',
|
||||
optionsValue:'year',
|
||||
value:startyear,
|
||||
disable: ! changeable()"
|
||||
disable: ! changeable(),
|
||||
event:{change:$root.setUnsaved}"
|
||||
class="form-control">
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<select data-bind="options:months,
|
||||
<td data-bind="css:{'red-line': ! saved()}">
|
||||
<select data-bind="options:$root.months,
|
||||
optionsText:'month',
|
||||
optionsValue:'month_id',
|
||||
value:startmonth,
|
||||
disable: ! changeable()"
|
||||
optionsValue:'monthID',
|
||||
value:endmonth,
|
||||
disable: ! changeable(),
|
||||
optionsCaption:'selecteer...',
|
||||
event:{change:$root.setUnsaved}"
|
||||
class="form-control">
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<select data-bind="options:years,
|
||||
<td data-bind="css:{'red-line': ! saved()}">
|
||||
<select data-bind="options:$root.years,
|
||||
optionsText:'year',
|
||||
optionsValue:'year',
|
||||
value:endyear,
|
||||
disable: ! changeable()"
|
||||
disable: ! changeable(),
|
||||
optionsCaption:'selecteer...',
|
||||
event:{change:$root.setUnsaved}"
|
||||
class="form-control">
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<select data-bind="options:months,
|
||||
optionsText:'month',
|
||||
optionsValue:'month_id',
|
||||
value:endmonth"
|
||||
class="form-control">
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<td data-bind="css:{'red-line': ! saved()}">
|
||||
<input type="text"
|
||||
class="form-control"
|
||||
data-bind="textInput:target">
|
||||
data-bind="textInput:target,
|
||||
disable: ! changeable(),
|
||||
event:{keyup:$root.checkNumeric},
|
||||
event:{change:$root.setUnsaved}">
|
||||
</td>
|
||||
<td>
|
||||
<td data-bind="css:{'red-line': ! saved()}">
|
||||
<button class="btn btn-success"
|
||||
data-bind="disable: ! validTarget()">
|
||||
data-bind="disable: ! validTarget(),
|
||||
click:$root.saveEmployeeTarget,
|
||||
visible: changeable()">
|
||||
opslaan
|
||||
</button>
|
||||
</td>
|
||||
@@ -83,7 +95,7 @@
|
||||
<tr>
|
||||
<th colspan="6">
|
||||
<i class="icon fa-plus-square-o pull-right pointer"
|
||||
data-bind="click:addEmployeeTarget"></i>
|
||||
data-bind="click:addEmployeeTarget, visible:newTarget()"></i>
|
||||
</th>
|
||||
</tr>
|
||||
</tfoot>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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"> </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> </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> </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>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<th class="rotate"><div><span>uren niet declarabel</span></div></th>
|
||||
<th class="rotate"><div><span>uren indirect</span></div></th>
|
||||
<th class="rotate"><div><span>totaal bestede uren</span></div></th>
|
||||
<th class="rotate"><div><span>uren target(1.600 jaar)</span></div></th>
|
||||
<th class="rotate"><div><span>uren jaartarget</span></div></th>
|
||||
<th class="rotate"><div><span>aandeel uren besteed tov target</span></div></th>
|
||||
<th class="rotate"><div><span>bezettingsgraad totaal<br />aantal gewerkte uren</span></div></th>
|
||||
<th class="rotate"><div><span>bezettingsgraad t.o.v. target<br />factureerbare uren</span></div></th>
|
||||
|
||||
Reference in New Issue
Block a user