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

Diverse wijzigingen nav word document

Browse Source
This commit is contained in:
theo
2019-10-25 16:47:46 +02:00
parent 6f21ab10de
commit d0069061ba
24 changed files with 2203 additions and 2028 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/emails/requestpassword_email.php
+1 -1
View File
@@ -311,7 +311,7 @@
<table class="main" width="100%" cellpadding="0" cellspacing="0">
<tr>
<td class="alert alert-warning">
Nieuw wachtwoord DBOIS De Beleidsonderzoeker
Nieuw wachtwoord DBOIS De Beleidsonderzoekers
</td>
</tr>
<tr>
application/views/emails/welcome_email.php
+1 -1
View File
@@ -311,7 +311,7 @@
<table class="main" width="100%" cellpadding="0" cellspacing="0">
<tr>
<td class="alert alert-warning">
Wachtwoord De Beleidsonderzoeker
Wachtwoord De Beleidsonderzoekers
</td>
</tr>
<tr>
application/views/main_view.php
+1 -1
View File
@@ -7,7 +7,7 @@
<link rel="icon" href="css/images/dbo-01-80x80.png" type="image/png">
<title>** De Beleidsonderzoeker **</title>
<title>** De Beleidsonderzoekers **</title>
<?php $this->load->view( 'partials/_css' ); ?>
application/views/modals/partials/_invoices.php
+14 -4
View File
@@ -169,11 +169,21 @@
</table>
</td>
</tr>
<tr>
<th colspan="10" class="table-cyanish-header"></th>
</tr>
</tbody>
<tfoot>
<tr>
<th colspan="3" class="table-cyanish-header"></th>
<th class="align-right table-cyanish-header">
<span data-bind="text:dbo.helpers.numberWithPoints(totalInvoiceamount())"></span>
</th>
<th class="align-right table-cyanish-header">
<span data-bind="text:dbo.helpers.numberWithPoints(totalInclBtw())"></span>
</th>
<th class="align-right table-cyanish-header">
<span data-bind="text:dbo.helpers.numberWithPoints(totalOutstanding())"></span>
</th>
<th colspan="2" class="table-cyanish-header"></th>
</tr>
<tr>
<td colspan="5">
<button class="btn btn-primary btn-round btn-sm" data-bind="click:newInvoice">
@@ -184,4 +194,4 @@
</tfoot>
</table>
</div>
</div>
</div>
application/views/modals/partials/_projectcosts.php
+15 -1
View File
@@ -110,6 +110,20 @@
</tr>
</tbody>
<tfoot>
<tr>
<th colspan="3" class="table-cyanish-header"></th>
<th class="align-right table-cyanish-header">
<span data-bind="text:dbo.helpers.numberWithPoints(totalCosts())"></span>
</th>
<th class="align-right table-cyanish-header">
<span data-bind="text:dbo.helpers.numberWithPoints(totalPayed())"></span>
</th>
<th class="table-cyanish-header"></th>
<th class="align-right table-cyanish-header">
<span data-bind="text:dbo.helpers.numberWithPoints(totalToPay())"></span>
</th>
<th class="table-cyanish-header"></th>
</tr>
<tr>
<td colspan="8">
<button class="btn btn-primary btn-round btn-sm" data-bind="click:newProjectcost">
@@ -120,4 +134,4 @@
</tfoot>
</table>
</div>
</div>
</div>
application/views/modals/partials/_reservations.php
+7 -1
View File
@@ -1,7 +1,7 @@
<div class="panel panel-bordered panel-primary panel-line">
<div class="panel-heading panel-heading-project">
<h3 class="">
budget onderaannemers (incl. btw)
gereserveerd op spaarrekening (incl. btw)
</h3>
</div>
<div class="panel-body panel-body-project">
@@ -49,6 +49,12 @@
</tr>
</tbody>
<tfoot>
<tr>
<th class="align-right table-cyanish-header">
<span data-bind="text:dbo.helpers.numberWithPoints(totalReservationamount())"></span>
</th>
<th class="table-cyanish-header" colspan="2"></th>
</tr>
<tr>
<th colspan="4">
<button class="btn btn-primary btn-round btn-sm" data-bind="click:addReservation">
application/views/pages/login/login_view.php
+1 -1
View File
@@ -93,7 +93,7 @@
</div>
<footer class="page-copyright page-copyright-inverse">
<p>© 2018. De Beleidsonderzoeker.</p>
<p>© 2018. De Beleidsonderzoekers</p>
<!-- <p style="font-size:.8em">powered by: Pensare Software</p>-->
</footer>
</div>
application/views/pages/reservations_view.php
+1 -1
View File
@@ -11,7 +11,7 @@
<th width="17%">project</th>
<th width="10%" class="align-right">Kosten derden</th>
<th width="10%" class="align-right">factuur INK</th>
<th width="10%" class="align-right">budget onderaannemers</th>
<th width="10%" class="align-right">gereserveerd op<br/>spaarrekening</th>
<th width="10%" class="align-right">betaald</th>
<th width="10%" class="align-right">saldo te<br />betalen</th>
<th width="10%" class="align-right">betaald via<br />reserveringen</th>
application/views/reports/monthlyemployeehours/euro_view.php
+38 -32
View File
@@ -1,17 +1,23 @@
<table class="table" style="font-size:.8em;">
<thead>
<tr>
<th class="rotate">
<div><span>projectnummer</span></div>
<th class="rotate sorting-field">
<div data-bind="click:setSorting.bind($data, 'projectnumber')">
<span>projectnummer</span>
</div>
</th>
<th class="rotate">
<div><span>instroom</span></div>
</th>
<th class="rotate">
<div><span>naam</span></div>
<th class="rotate sorting-field">
<div data-bind="click:setSorting.bind($data, 'projectname')">
<span>naam</span>
</div>
</th>
<th class="rotate">
<div><span>opdrachtgever</span></div>
<th class="rotate sorting-field">
<div data-bind="click:setSorting.bind($data, 'CUS.name')">
<span>opdrachtgever</span>
</div>
</th>
<!-- ko foreach: uniqueEmployees -->
<th class="rotate">
@@ -43,6 +49,32 @@
<div><span>Volgende boekjaren</span></div>
</th>
</tr>
<tr>
<th class="align-right" colspan="4">totaal</th>
<!-- ko foreach: totalPerEmployee -->
<th class="align-right">
<span data-bind="text:totalRevenue"></span>
</th>
<!-- /ko -->
<th class="align-right">
<span data-bind="text:totalOwnRevenue"></span>
</th>
<th class="align-right">
<span data-bind="text:totalEmployeeRevenues"></span>
</th>
<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:totalCurrentFinancialYear"></span>
</th>
<th class="align-right">
<span data-bind="text:totalNextFinancialYear"></span>
</th>
</tr>
</thead>
<tbody data-bind="foreach:recap">
<tr>
@@ -79,32 +111,6 @@
</tr>
</tbody>
<tfoot>
<tr>
<th class="align-right" colspan="4">totaal</th>
<!-- ko foreach: totalPerEmployee -->
<th class="align-right">
<span data-bind="text:totalRevenue"></span>
</th>
<!-- /ko -->
<th class="align-right">
<span data-bind="text:totalOwnRevenue"></span>
</th>
<th class="align-right">
<span data-bind="text:totalEmployeeRevenues"></span>
</th>
<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:totalCurrentFinancialYear"></span>
</th>
<th class="align-right">
<span data-bind="text:totalNextFinancialYear"></span>
</th>
</tr>
</tfoot>
</table>
application/views/reports/monthlyemployeehours/hours_view.php
+29 -23
View File
@@ -2,7 +2,9 @@
<thead>
<tr>
<th class="rotate">
<div><span>projectnummer</span></div>
<div data-bind="click:setSorting.bind($data, 'projectnumber')">
<span>projectnummer</span>
</div>
</th>
<th class="rotate">
<div><span>instroom</span></div>
@@ -11,10 +13,14 @@
<div><span>uitstroom</span></div>
</th>
<th class="rotate">
<div><span>naam</span></div>
<div data-bind="click:setSorting.bind($data, 'projectname')">
<span>naam</span>
</div>
</th>
<th class="rotate">
<div><span>opdrachtgever</span></div>
<div data-bind="click:setSorting.bind($data, 'CUS.name')">
<span>opdrachtgever</span>
</div>
</th>
<!-- ko foreach: uniqueEmployees -->
<th class="rotate">
@@ -33,6 +39,25 @@
<div><span>totaal beschikbare uren</span></div>
</th>
</tr>
<tr>
<th class="align-right" colspan="5">totaal</th>
<!-- ko foreach: totalPerEmployee -->
<th class="align-right">
<span data-bind="text:totalHours"></span>
</th>
<!-- /ko -->
<th class="align-right">
<span data-bind="text:totalEmployeeHours"></span>
</th>
<!-- ko foreach: totalPerEmployee -->
<th class="align-right">
<span data-bind="text:totalAvailableHours"></span>
</th>
<!-- /ko -->
<th class="align-right">
<span data-bind="text:totalEmployeeAvailableHours"></span>
</th>
</tr>
</thead>
<tbody data-bind="foreach:recap">
<tr>
@@ -60,24 +85,5 @@
</tr>
</tbody>
<tfoot>
<tr>
<th class="align-right" colspan="5">totaal</th>
<!-- ko foreach: totalPerEmployee -->
<th class="align-right">
<span data-bind="text:totalHours"></span>
</th>
<!-- /ko -->
<th class="align-right">
<span data-bind="text:totalEmployeeHours"></span>
</th>
<!-- ko foreach: totalPerEmployee -->
<th class="align-right">
<span data-bind="text:totalAvailableHours"></span>
</th>
<!-- /ko -->
<th class="align-right">
<span data-bind="text:totalEmployeeAvailableHours"></span>
</th>
</tr>
</tfoot>
</table>
</table>