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

Diverse wijzigingen

Browse Source
This commit is contained in:
theo
2018-05-05 13:22:14 +02:00
parent 860c5db95a
commit b589058437
13 changed files with 105 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/modals/partials/_forecasts.php
+22 -1
View File
@@ -74,7 +74,28 @@
</tr>
<tr>
<th colspan="4">
<b><h5>te prognotiseren: <span data-bind="text:toForecast"></span></h5></b>
<table class="table table-condensed">
<thead>
<tr>
<th>te factureren</th>
<th>geprognosticeerd</th>
<th>nog te prognosticeren</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<span data-bind="text:outstanding"></span>
</td>
<td>
<span data-bind="text:totalForecast"></span>
</td>
<td>
<span data-bind="text:toForecast"></span>
</td>
</tr>
</tbody>
</table>
</th>
</tr>
</tfoot>
application/views/modals/partials/_projectdashboard.php
+9 -4
View File
@@ -88,29 +88,34 @@
<div class="panel panel-bordered panel-primary panel-line">
<div class="panel-heading panel-heading-project">
<h3 class="">
Financieel
Financieel <i class="icon fa-refresh pull-right" title="ververs" data-bind="click:refreshProject"></i>
</h3>
</div>
<div class="panel-body panel-body-project">
<label class="col-md-6 col-form-label">eigen omzet</label>
<label class="col-md-6 col-form-label">eigen omzet(excl.btw)</label>
<div class="col-md-6">
<h4 class="form-control-label">
<i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:ownRevenue"></span>
</h4>
</div>
<div class="divider"></div>
<label class="col-md-6 col-form-label">overige omzet</label>
<label class="col-md-6 col-form-label">overige omzet(excl.btw)</label>
<div class="col-md-6">
<h4 class="form-control-label">
<i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:otherRevenue"></span>
</h4>
</div>
<div class="divider"></div>
<label class="col-md-6 col-form-label">Totaal omzet</label>
<label class="col-md-6 col-form-label">Totaal omzet(excl.btw)</label>
<div class="col-md-6">
<h4><i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:totalRevenues"></span></h4>
</div>
<div class="divider"></div>
<label class="col-md-6 col-form-label">Totaal omzet(incl.btw)</label>
<div class="col-md-6">
<h4><i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:totalRevenuesIncl"></span></h4>
</div>
<div class="divider"></div>
<label class="col-md-6 col-form-label">Totaal gefactureerd</label>
<div class="col-md-6">
<h4><i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:totalInvoiced"></span></h4>
application/views/reports/employeehours/employeemonthhours_view.php
+1 -1
View File
@@ -10,7 +10,7 @@
<th class="rotate"><div><span>totaal bestede uren</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>percentage declarable<br />tov totaal</span></div></th>
<th class="rotate"><div><span>bezettingsgraad t.o.v. target<br />factureerbare uren</span></div></th>
<th class="rotate"><div><span>omzet</span></div></th>
<th class="rotate"><div><span>gemiddeld tarief</span></div></th>
application/views/reports/monthlyemployeehours/euro_view.php
+6
View File
@@ -67,6 +67,9 @@
<th class="align-right">
<span data-bind="text:availableRevenue"></span>
</th>
<th class="align-right">
<span data-bind="text:owp"></span>
</th>
<!-- <td class="align-right">-->
<!-- <span data-bind="text:externCosts"></span>-->
<!-- </td>-->
@@ -100,6 +103,9 @@
<th class="align-right">
<span data-bind="text:totalAvailableRevenues"></span>
</th>
<th class="align-right">
<span data-bind="text:totalOwp"></span>
</th>
<!-- <th class="align-right">-->
<!-- <span data-bind="text:totalCosts"></span>-->
<!-- </th>-->