Diversen nav opmerkingen

This commit is contained in:
2018-05-06 20:39:59 +02:00
parent a3d200c38b
commit c7846f9a80
16 changed files with 126 additions and 82 deletions
@@ -75,6 +75,17 @@
</div>
</div>
<div class="divider"></div>
<label class="col-md-4 col-form-label">BTW percentage</label>
<div class="col-md-3">
<select class="form-control form-control-sm"
data-bind="options:vats,
optionsText:'vatrate',
optionsValue:'id',
value:vat_id,
event:{change:$root.saveProject},
optionsCaption:'selecteer btw ...'"></select>
</div>
<div class="divider"></div>
<label class="col-md-4 col-form-label">te besteden uren</label>
<div class="col-md-8">
<h4><span data-bind="text:(totalBudget() - totalHours())"></span></h4>
@@ -7,16 +7,16 @@
<div class="panel-body panel-body-project">
<table class="table table-sm">
<thead>
<th class="table-cyanish-header">
<th class="table-cyanish-header" width="40%">
naam
</th>
<th class="table-cyanish-header align-right">
<th class="table-cyanish-header align-right" width="20%">
tarief
</th>
<th class="table-cyanish-header align-right">
<th class="table-cyanish-header align-right" width="25%">
budget
</th>
<th class="table-cyanish-header" width="40px">
<th class="table-cyanish-header" width="15%">
&nbsp;&nbsp;
</th>
</thead>
@@ -1,4 +1,4 @@
<div class="col-md-6">
<div class="col-md-8">
<table class="table table-condensed">
<thead>
<tr>
@@ -8,8 +8,8 @@
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
<tr data-bind="foreach:documents">
<tbody data-bind="foreach:documents">
<tr>
<td>
<span data-bind="text:fullname"></span>
</td>
@@ -25,6 +25,7 @@
</td>
</tr>
</tbody>
<tfoot>
<tr></tr>
</tfoot>
</table>
@@ -32,19 +33,5 @@
<button class="upload-btn">voeg bestand toe</button>
<input type="file" name="userfile" data-bind="event:{change:addDocument}" id="fileinput"/>
</div>
</div>
<div class="col-md-6">
<hr/>
<!-- <button data-bind="click:addComment" class="upload-btn">-->
<!-- voeg commentaar toe-->
<!-- </button>-->
<!-- ko foreach: comments -->
<div data-bind="click:$root.editComment" class="pointer">
<span class="badge badge-info" style="width:100%; text-align:left;">
<span data-bind="text:fullname"></span> |
<span data-bind="text:comment_date"></span>
</span>
</div>
<div data-bind="html:comment,click:$root.editComment" class="comment-text pointer"></div>
<!-- /ko -->
</div>
+25 -28
View File
@@ -45,39 +45,36 @@
sluit
</button>
</div>
<div class="tab-pane animation-slide-top"
id="dashboard"
data-bind="visible:activeTab()=='DASHBOARD'">
<?php $this->load->view( 'modals/partials/_dashboard' ); ?>
</div>
<div class="tab-pane animation-slide-top"
id="financial"
data-bind="visible:activeTab()=='FINANCIAL'">
<?php $this->load->view( 'modals/partials/_financials' ); ?>
</div>
<div class="tab-pane animation-slide-top"
id="employees"
data-bind="visible:activeTab()=='EMPLOYEES'">
<div class="row" data-bind="fadeVisible:customerID()">
<div class="col-md-5" data-bind="fadeVisible:customerID()">
<?php $this->load->view( 'modals/partials/_projectemployees' ); ?>
</div>
<div class="col-md-7">
<?php $this->load->view( 'modals/partials/_hours' ); ?>
<div id="project-scroller">
<div class="tab-pane animation-slide-top"
id="dashboard"
data-bind="visible:activeTab()=='DASHBOARD'">
<?php $this->load->view( 'modals/partials/_dashboard' ); ?>
</div>
<div class="tab-pane animation-slide-top"
id="financial"
data-bind="visible:activeTab()=='FINANCIAL'">
<?php $this->load->view( 'modals/partials/_financials' ); ?>
</div>
<div class="tab-pane animation-slide-top"
id="employees"
data-bind="visible:activeTab()=='EMPLOYEES'">
<div class="row" data-bind="fadeVisible:customerID()">
<div class="col-md-5" data-bind="fadeVisible:customerID()">
<?php $this->load->view( 'modals/partials/_projectemployees' ); ?>
</div>
<div class="col-md-7">
<?php $this->load->view( 'modals/partials/_hours' ); ?>
</div>
</div>
</div>
</div>
<div class="tab-pane animation-slide-top"
id="files"
data-bind="visible:activeTab()=='FILES'">
<div class="row" data-bind="fadeVisible:customerID()">
<div class="col-md-4">
<div class="tab-pane animation-slide-top"
id="files"
data-bind="visible:activeTab()=='FILES'">
<div class="row" data-bind="fadeVisible:customerID()">
<?php $this->load->view( 'modals/partials/_projectfiles' ); ?>
</div>
<div class="col-md-4">
<?php $this->load->view( 'modals/partials/_projectcomments' ); ?>
</div>
</div>
</div>
</div>
+8 -3
View File
@@ -1,6 +1,6 @@
<div class="VAT">
<div class="row">
<div class="col-md-4">
<div class="col-md-2">
<table class="table table-condensed">
<thead>
<tr>
@@ -11,10 +11,15 @@
<tbody data-bind="foreach:vats">
<tr>
<td>
<input type="text" data-bind="text:vatrate" />
<div class="percentage-sign-holder">
<input type="text"
class="form-control percentage-input"
data-bind="textInput:vatrate,
event:{keyup:$root.validateNumber.bind($data, 'vatrate')}">
<span class="percentage-sign">&#x25;</span>
</div>
</td>
<td width="60px">
<i class="icon fa-sellsy"></i>
<i class="icon fa-edit" data-bind="click:$root.toggleEdit"></i>
<i class="icon fa-trash redish" data-bind="$root.removeVat"></i>
</td>