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

Diverse aanpassing nav mail Peter

Browse Source
This commit is contained in:
theo
2019-02-22 14:19:03 +01:00
parent d71692f320
commit 695f6c6960
23 changed files with 295 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/modals/partials/_hourTotals.php
+57
View File
@@ -0,0 +1,57 @@
<div class="panel panel-bordered panel-primary panel-line">
<div class="panel-heading panel-heading-project">
<h3 class="">
projecturen
</h3>
</div>
<div class="panel-body panel-body-project">
<table class="table table-sm">
<thead>
<th class="table-cyanish-header" width="40%">
medewerker
</th>
<th class="table-cyanish-header align-right" width="20%">
niet declarabel
</th>
<th class="table-cyanish-header align-right" width="20%">
declarabel
</th>
<th class="table-cyanish-header align-right" width="20%">
omzet
</th>
</thead>
<tbody data-bind="foreach:hourTotals">
<tr>
<td>
<span data-bind="text:fullname"></span>
</td>
<td class="align-right">
<span data-bind="text:nondeclarable"></span> uur
</td>
<td class="align-right">
<span data-bind="text:declarable"></span> uur
</td>
<td class="align-right">
<span data-bind="text:revenues"></span>
</td>
</tr>
</tbody>
<tfoot>
<tr>
<th class="table-cyanish-header">
totaal
</th>
<th class="align-right table-cyanish-header">
<span data-bind="text:totalNonDeclarable"></span> uur
</th>
<th class="align-right table-cyanish-header">
<span data-bind="text:totalDeclarable"></span> uur
</th>
<th class="align-right table-cyanish-header">
<span data-bind="text:totalRevenueHours"></span>
</th>
</tr>
</tfoot>
</table>
</div>
</div>
application/views/modals/project_modal.php
+1 -1
View File
@@ -65,7 +65,7 @@
<?php $this->load->view( 'modals/partials/_projectemployees' ); ?>
</div>
<div class="col-md-7">
<?php $this->load->view( 'modals/partials/_hours' ); ?>
<?php $this->load->view( 'modals/partials/_hourTotals' ); ?>
</div>
</div>
</div>
application/views/pages/invoicereport_view.php
+18
View File
@@ -12,6 +12,24 @@
maak spreadsheet
</button>
</div>
<div class="col-md-3">
<div class="row form-horizontal">
<label class="col-md-4 form-control-label">archief</label>
<div class="col-md-8">
<div class="onoffswitch" data-bind="click:toggleArchive">
<input type="checkbox"
name="onoffswitch"
class="onoffswitch-checkbox"
data-bind="checked:archive"
id="myonoffswitch">
<label class="onoffswitch-label" for="myonoffswitch">
<span class="onoffswitch-inner"></span>
<span class="onoffswitch-switch"></span>
</label>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
application/views/pages/monthlyemployeehours_view.php
+20
View File
@@ -8,6 +8,26 @@
<!-- <div class="invalid-feedback" data-bind="visible: ! validYear()">geen geldig jaar</div>-->
<!-- </div>-->
<!-- </div>-->
<div class="row">
<div class="col-xs-3">
<div class="row form-horizontal">
<label class="col-md-4 form-control-label">archief</label>
<div class="col-md-8">
<div class="onoffswitch" data-bind="click:toggleArchive">
<input type="checkbox"
name="onoffswitch"
class="onoffswitch-checkbox"
data-bind="checked:archive"
id="myonoffswitch">
<label class="onoffswitch-label" for="myonoffswitch">
<span class="onoffswitch-inner"></span>
<span class="onoffswitch-switch"></span>
</label>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="nav-tabs-horizontal">
application/views/pages/projects_view.php
+2 -2
View File
@@ -25,7 +25,7 @@
<th class="table-tealish-header pointer"
data-bind="click:directionOrderProjects.bind($data, 'USR.firstname')">projectleider</th>
<th class="table-tealish-header pointer"
data-bind="click:directionOrderProjects.bind($data, 'CUS.name')">klant</th>
data-bind="click:directionOrderProjects.bind($data, 'projectname')">projectnaam</th>
<th class="table-tealish-header pointer"
data-bind="click:directionOrderProjects.bind($data, 'startdate')">start</th>
<th class="table-tealish-header align-right">eigen tarief omzet</th>
@@ -44,7 +44,7 @@
<span data-bind="text:projectleader"></span>
</td>
<td data-bind="click:$root.selectPoject" class="pointer">
<span data-bind="text:customer"></span>
<span data-bind="text:projectname, attr:{title:customer}"></span>
</td>
<td data-bind="click:$root.selectPoject" class="pointer">
<span data-bind="text:startdate"></span>
application/views/reports/invoices/invoiceoverview_report.php
+9 -1
View File
@@ -1,6 +1,13 @@
<table class="table table-condensed" style="font-size:0.8em;">
<thead>
<tr>
<th class="rotate">
<div class="pointer">
<span data-bind="click:sortList.bind($data, 'projectnumber')">
projectnummer
</span>
</div>
</th>
<th class="rotate">
<div><span>project</span></div>
</th>
@@ -30,6 +37,7 @@
<tbody>
<!-- ko foreach: invoiceOverview -->
<tr>
<td><span data-bind="text:projectnumber"></span></td>
<td><span data-bind="text:projectname"></span></td>
<td><span data-bind="text:customer"></span></td>
<td class="align-right"><span data-bind="text:totalToInvoicingExcl"></span></td>
@@ -43,7 +51,7 @@
</tbody>
<tfoot>
<tr>
<th colspan="2" class="align-right">
<th colspan="3" class="align-right">
totaal
</th>
<th class="align-right">