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-04-21 16:51:01 +02:00
parent 8e3649768b
commit 9187742658
18 changed files with 339 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/reports/monthlyemployeehours/_employeehour_view.php
+46 -46
View File
@@ -4,23 +4,23 @@
<table class="table table-condensed table-bordered">
<thead>
<tr class="table-info">
<th>project</th>
<th class="align-right">tarief</th>
<th class="align-right">jan</th>
<th class="align-right">feb</th>
<th class="align-right">mrt</th>
<th class="align-right">apr</th>
<th class="align-right">mei</th>
<th class="align-right">juni</th>
<th class="align-right">juli</th>
<th class="align-right">aug</th>
<th class="align-right">sep</th>
<th class="align-right">okt</th>
<th class="align-right">nov</th>
<th class="align-right">dec</th>
<th class="align-right">tot jaar</th>
<th class="align-right">tot overig</th>
<th class="align-right">grand total</th>
<th class="table-header-blue">project</th>
<th class="align-right table-header-blue">tarief</th>
<th class="align-right table-header-blue">jan</th>
<th class="align-right table-header-blue">feb</th>
<th class="align-right table-header-blue">mrt</th>
<th class="align-right table-header-blue">apr</th>
<th class="align-right table-header-blue">mei</th>
<th class="align-right table-header-blue">juni</th>
<th class="align-right table-header-blue">juli</th>
<th class="align-right table-header-blue">aug</th>
<th class="align-right table-header-blue">sep</th>
<th class="align-right table-header-blue">okt</th>
<th class="align-right table-header-blue">nov</th>
<th class="align-right table-header-blue">dec</th>
<th class="align-right table-header-blue">tot jaar</th>
<th class="align-right table-header-blue">tot overig</th>
<th class="align-right table-header-blue">grand total</th>
</tr>
</thead>
<tbody data-bind="foreach:myData">
@@ -80,51 +80,51 @@
</tbody>
<tfoot>
<tr class="table-info">
<th>totaal</th>
<th>&nbsp;</th>
<th class="align-right">
<th class="table-header-blue">totaal</th>
<th class="table-header-blue">&nbsp;</th>
<th class="align-right table-header-blue">
<span data-bind="text:totalJanuari "></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalFebruari "></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalMaart "></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalApril "></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalMei "></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalJuni "></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalJuli "></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalAugustus"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalSeptember "></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalOktober "></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalNovember "></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalDecember "></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalTotal().toFixed(1)"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalTotalOtheryears().toFixed(1)"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:(totalTotalOtheryears() + totalTotal()).toFixed(1)"></span>
</th>
</tr>
@@ -132,17 +132,17 @@
</table>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="graph-holder">
<canvas data-bind="attr:{id: 'hours-per-month-' + slug}" id="" height="300"></canvas>
</div>
</div>
<div class="col-md-6">
<div class="graph-holder">
<canvas data-bind="attr:{id: 'hours-per-project-' + slug}" id="" height="300"></canvas>
</div>
</div>
</div>
<!--<div class="row">-->
<!-- <div class="col-md-6">-->
<!-- <div class="graph-holder">-->
<!-- <canvas data-bind="attr:{id: 'hours-per-month-' + slug}" id="" height="300"></canvas>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="col-md-6">-->
<!-- <div class="graph-holder">-->
<!-- <canvas data-bind="attr:{id: 'hours-per-project-' + slug}" id="" height="300"></canvas>-->
<!-- </div>-->
<!-- </div>-->
<!--</div>-->
application/views/reports/monthlyemployeehours/_employeerevenue_view.php
+46 -46
View File
@@ -4,23 +4,23 @@
<table class="table table-condensed table-bordered">
<thead>
<tr class="table-info">
<th>project</th>
<th class="align-right">tarief</th>
<th class="align-right">jan</th>
<th class="align-right">feb</th>
<th class="align-right">mrt</th>
<th class="align-right">apr</th>
<th class="align-right">mei</th>
<th class="align-right">juni</th>
<th class="align-right">juli</th>
<th class="align-right">aug</th>
<th class="align-right">sep</th>
<th class="align-right">okt</th>
<th class="align-right">nov</th>
<th class="align-right">dec</th>
<th class="align-right">tot jaar</th>
<th class="align-right">tot overig</th>
<th class="align-right">grand total</th>
<th class="table-header-blue">project</th>
<th class="align-right table-header-blue">tarief</th>
<th class="align-right table-header-blue">jan</th>
<th class="align-right table-header-blue">feb</th>
<th class="align-right table-header-blue">mrt</th>
<th class="align-right table-header-blue">apr</th>
<th class="align-right table-header-blue">mei</th>
<th class="align-right table-header-blue">juni</th>
<th class="align-right table-header-blue">juli</th>
<th class="align-right table-header-blue">aug</th>
<th class="align-right table-header-blue">sep</th>
<th class="align-right table-header-blue">okt</th>
<th class="align-right table-header-blue">nov</th>
<th class="align-right table-header-blue">dec</th>
<th class="align-right table-header-blue">tot jaar</th>
<th class="align-right table-header-blue">tot overig</th>
<th class="align-right table-header-blue">grand total</th>
</tr>
</thead>
<tbody data-bind="foreach:myData">
@@ -80,51 +80,51 @@
</tbody>
<tfoot>
<tr class="table-info">
<th>totaal</th>
<th>&nbsp;</th>
<th class="align-right">
<th class="table-header-blue">totaal</th>
<th class="table-header-blue">&nbsp;</th>
<th class="align-right table-header-blue">
<span data-bind="text:totalJanuariRevenue().toFixed(0)"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalFebruariRevenue().toFixed(0)"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalMaartRevenue().toFixed(0)"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalAprilRevenue().toFixed(0)"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalMeiRevenue().toFixed(0)"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalJuniRevenue().toFixed(0)"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalJuliRevenue().toFixed(0)"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalAugustusRevenue().toFixed(0)"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalSeptemberRevenue().toFixed(0)"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalOktoberRevenue().toFixed(0)"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalNovemberRevenue().toFixed(0)"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalDecemberRevenue().toFixed(0)"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalTotalRevenue().toFixed(0)"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:totalTotalOtheryearsRevenue().toFixed(0)"></span>
</th>
<th class="align-right">
<th class="align-right table-header-blue">
<span data-bind="text:(totalTotalOtheryearsRevenue() + totalTotalRevenue()).toFixed(0)"></span>
</th>
</tr>
@@ -132,15 +132,15 @@
</table>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="graph-holder">
<canvas data-bind="attr:{id: 'revenue-per-month-' + slug}" height="300"></canvas>
</div>
</div>
<div class="col-md-6">
<div class="graph-holder">
<canvas data-bind="attr:{id: 'revenue-per-project-' + slug}" height="300"></canvas>
</div>
</div>
</div>
<!--<div class="row">-->
<!-- <div class="col-md-6">-->
<!-- <div class="graph-holder">-->
<!-- <canvas data-bind="attr:{id: 'revenue-per-month-' + slug}" height="300"></canvas>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="col-md-6">-->
<!-- <div class="graph-holder">-->
<!-- <canvas data-bind="attr:{id: 'revenue-per-project-' + slug}" height="300"></canvas>-->
<!-- </div>-->
<!-- </div>-->
<!--</div>-->
application/views/reports/monthlyemployeehours/euro_view.php
+25 -25
View File
@@ -73,9 +73,9 @@
<!-- <th class="align-right">-->
<!-- <span data-bind="text:saldo"></span>-->
<!-- </th>-->
<th class="align-right">
<span data-bind="text:workInProgress"></span>
</th>
<!-- <th class="align-right">-->
<!-- <span data-bind="text:workInProgress"></span>-->
<!-- </th>-->
<!-- ko foreach:invoiced -->
<th class="align-right">
<span data-bind="text:invoiced"></span>
@@ -106,9 +106,9 @@
<!-- <th class="align-right">-->
<!-- <span data-bind="text:totalSaldo"></span>-->
<!-- </th>-->
<th class="align-right">
<span data-bind="text:totalWorkInProgress"></span>
</th>
<!-- <th class="align-right">-->
<!-- <span data-bind="text:totalWorkInProgress"></span>-->
<!-- </th>-->
<!-- ko foreach:totalInvoicedYear -->
<th class="align-right">
<span data-bind="text:totalInvoiced"></span>
@@ -117,22 +117,22 @@
</tr>
</tfoot>
</table>
<div class="row">
<div class="col-md-3">
<div class="graph-holder" style="min-height:350px">
<canvas id="recap-revenues" width="300px"></canvas>
<div id="recap-revenues-legends"></div>
</div>
</div>
<div class="col-md-3">
<div class="graph-holder" style="min-height:350px">
<canvas id="recap-revenues-project" width="300px"></canvas>
<div id="recap-revenues-project-legends"></div>
</div>
</div>
<div class="col-md-6">
<div class="graph-holder" style="min-height:350px">
<canvas id="recap-owh" width="300px"></canvas>
</div>
</div>
</div>
<!--<div class="row">-->
<!-- <div class="col-md-3">-->
<!-- <div class="graph-holder" style="min-height:350px">-->
<!-- <canvas id="recap-revenues" width="300px"></canvas>-->
<!-- <div id="recap-revenues-legends"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="col-md-3">-->
<!-- <div class="graph-holder" style="min-height:350px">-->
<!-- <canvas id="recap-revenues-project" width="300px"></canvas>-->
<!-- <div id="recap-revenues-project-legends"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="col-md-6">-->
<!-- <div class="graph-holder" style="min-height:350px">-->
<!-- <canvas id="recap-owh" width="300px"></canvas>-->
<!-- </div>-->
<!-- </div>-->
<!--</div>-->