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

Diverse aanpassingen nav gesprek met Peter

Browse Source
This commit is contained in:
theo
2018-02-14 11:03:42 +01:00
parent 0441ba7b81
commit 957bca2e9d
12 changed files with 117 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/modals/partials/_invoices.php
+1 -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="">
facturen
uitgaande facturen
</h3>
</div>
<div class="panel-body panel-body-project">
application/views/modals/partials/_projectcosts.php
+1 -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="">
kosten
inkomende facturen
</h3>
</div>
<div class="panel-body panel-body-project">
application/views/modals/partials/_projectdashboard.php
+27 -1
View File
@@ -1,4 +1,4 @@
<div class="row" form-inline>
<div class="row form-inline">
<div class="col-md-3">
<div class="form-group row">
<label class="col-md-3 col-form-label">klant</label>
@@ -73,6 +73,32 @@
</div>
</div>
</div>
<div class="row" style="margin-top:10px;">
<div class="col-md-5">
<div class="form-group row">
<label class="col-md-3 form-control-label">omschrijving</label>
<div class="col-md-9">
<input type="text"
class="form-control form-control-sm"
data-bind="textInput:projectname, event:{keyup:saveProjectname}"/>
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group row">
<h4 class="form-control-label">eigenomzet:
<i class="icon fa-euro"> </i><span data-bind="text:ownRevenue"></span>
</h4>
</div>
</div>
<div class="col-md-3">
<div class="form-group row">
<h4 class="form-control-label">overige omzet:
<i class="icon fa-euro"> </i><span data-bind="text:otherRevenue"></span>
</h4>
</div>
</div>
</div>
<div class="row">
<div class="col-md-3">
<h3>te besteden uren :<span data-bind="text:(totalBudget() - totalHours())"></span></h3>
application/views/modals/partials/_projectemployees.php
+1 -1
View File
@@ -32,7 +32,7 @@
optionsValue:'id',
value:employeeID,
optionsCaption:'naam',
event:{change:$root.saveProjectemployee},
event:{change:$root.changeProjectemployee},
visible:inEdit"></select>
</td>
<td class="align-right">
application/views/modals/project_modal.php
+3 -3
View File
@@ -52,9 +52,9 @@
</div>
<div class="tab-pane animation-slide-top" id="financial">
<div class="row" data-bind="fadeVisible:customerID()">
<div class="col-md-5">
<?php $this->load->view( 'modals/partials/_projectoffers' ); ?>
</div>
<!-- <div class="col-md-5">-->
<!-- --><?php //$this->load->view( 'modals/partials/_projectoffers' ); ?>
<!-- </div>-->
<div class="col-md-7">
<?php $this->load->view( 'modals/partials/_projectcosts' ); ?>
</div>
application/views/modals/user_modal.php
+17
View File
@@ -111,6 +111,23 @@
</small>
</div>
</div>
<div class="form-group row">
<label class="col-xl-3 form-control-label">
uurtarief
</label>
<div class="col-xl-4">
<div class="input-group input-group-icon">
<span class="input-group-addon">
<i class="icon fa-euro"></i>
</span>
<input type="text"
placeholder="uurtarief"
class="form-control align-right"
data-bind="textInput:hourlyRate,
event:{keyup:validateNumber.bind($data, 'hourlyRate')}">
</div>
</div>
</div>
<div class="form-group row">
<div class="col-xl-3">&nbsp;</div>
<!-- ko foreach:roles -->