projecten

This commit is contained in:
2018-01-23 08:45:44 +01:00
parent 970aa53971
commit fb19c401fd
36 changed files with 1402 additions and 184 deletions
+3
View File
@@ -54,6 +54,7 @@
<i class="icon fa-plus-square greenish pointer" data-bind="click:addUser"></i>
</div>
</div>
<!-- ko if : ! hasProject() -->
<div class="form-group row">
<label class="col-xl-3 form-control-label">
klant
@@ -66,6 +67,7 @@
optionsText:'name',
value:customer_id,
optionsCaption:'selecteer klant',
disable:hasProject,
event:{change:getCustomerProjects}"></select>
</div>
<small class="invalid-feedback"
@@ -90,6 +92,7 @@
value:project_id"></select>
</div>
</div>
<!-- /ko -->
<div class="form-group row">
</div>
@@ -0,0 +1,75 @@
<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">
medewerker
</th>
<th class="table-cyanish-header">
datum
</th>
<th class="table-cyanish-header">
uren
</th>
<th class="table-cyanish-header" width="40px">
&nbsp;
</th>
</thead>
<tbody data-bind="foreach:projecthours">
<tr>
<td>
<span data-bind="text:fullname, visible:! inEdit()"></span>
<select class="form-control form-control-sm"
data-bind="options:$root.projectEmployees,
optionsText:'fullname',
optionsValue:'id',
value:projectemployee_id,
optionsCaption:'medewerker',
visible: inEdit(),
event:{change:$root.saveProjecthour}">
</select>
</td>
<td>
<span data-bind="text:hourdate, visible:! inEdit()"></span>
<input type="text"
class="form-control form-control-sm"
placeholder="start"
data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
value:hourdate, visible:inEdit,
event:{change:$root.saveProjecthour}"/>
</td>
<td class="align-right">
<span data-bind=" visible: ! inEdit()">
<span data-bind="text:hours"></span>
uur
</span>
<input type="text"
class="form-control form-control-sm align-right"
paceholder="uren"
data-bind="textInput:hours, visible:inEdit,
event:{change:$root.saveProjecthour,keyup:$root.validateNumber.bind($data, 'hours')}"/>
</td>
<td>
<i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editProjecthour"></i>
<i class="icon fa-trash redish pointer" title="verwijder"
data-bind="click:$root.removeProjecthour"></i>
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="5">
<button class="btn btn-primary btn-round btn-sm" data-bind="click:newProjecthour">
nieuwe projecturen
</button>
</td>
</tr>
</tfoot>
</table>
</div>
</div>
@@ -0,0 +1,75 @@
<div class="panel panel-bordered panel-primary panel-line">
<div class="panel-heading panel-heading-project">
<h3 class="">
betalingen
</h3>
</div>
<div class="panel-body panel-body-project">
<table class="table table-sm">
<thead>
<th class="table-cyanish-header">
offertenummer
</th>
<th class="table-cyanish-header">
datum
</th>
<th class="table-cyanish-header">
bedrag
</th>
<th class="table-cyanish-header" width="40px">
&nbsp;
</th>
</thead>
<tbody data-bind="foreach:payments">
<tr>
<td>
<span data-bind="text:offernumber, visible:! inEdit()"></span>
<select class="form-control form-control-sm"
data-bind="options:$root.offers,
optionsText:'offernumber',
optionsValue:'id',
value:offer_id,
optionsCaption:'offerte',
visible: inEdit(),
event:{change:$root.savePayment}">
</select>
</td>
<td>
<span data-bind="text:paymentdate, visible:! inEdit()"></span>
<input type="text"
class="form-control form-control-sm"
placeholder="start"
data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
value:paymentdate, visible:inEdit,
event:{change:$root.savePayment}"/>
</td>
<td class="align-right">
<span data-bind=" visible: ! inEdit()">
<i class="icon fa-euro"></i>
<span data-bind="text:paymentamount"></span>
</span>
<input type="text"
class="form-control form-control-sm align-right"
paceholder="bedrag"
data-bind="textInput:paymentamount, visible:inEdit,
event:{change:$root.savePayment,keyup:$root.validateNumber.bind($data, 'paymentamount')}"/>
</td>
<td>
<i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editPayment"></i>
<i class="icon fa-trash redish pointer" title="verwijder"
data-bind="click:$root.removePayment"></i>
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="5">
<button class="btn btn-primary btn-round btn-sm" data-bind="click:newPayment">
nieuwe betaling
</button>
</td>
</tr>
</tfoot>
</table>
</div>
</div>
@@ -0,0 +1,43 @@
<div class="panel panel-bordered panel-primary panel-line">
<div class="panel-heading panel-heading-project">
<h3 class="">
opmerkingen
</h3>
</div>
<div class="panel-body panel-body-project">
<table class="table table-sm">
<thead>
<tr>
<td colspan="2" class="table-cyanish-header">
offerte opmerkingen
</td>
</tr>
</thead>
<tbody data-bind="foreach:projectFiles">
<td>
</td>
<td>
<i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editPayment"></i>
<i class="icon fa-trash redish pointer" title="verwijder"
data-bind="click:$root.removePayment"></i>
</td>
</tr>
</tbody>
<thead>
<tr>
<th colspan="2" class="table-cyanish-header">
project opmerkingen
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="2">
</td>
</tr>
</tfoot>
</table>
</div>
</div>
@@ -0,0 +1,89 @@
<div class="panel panel-bordered panel-primary panel-line">
<div class="panel-heading panel-heading-project">
<h3 class="">
kosten
</h3>
</div>
<div class="panel-body panel-body-project">
<table class="table table-sm">
<thead>
<th class="table-cyanish-header">
externe
</th>
<th class="table-cyanish-header">
omschrijving
</th>
<th class="table-cyanish-header">
datum
</th>
<th class="table-cyanish-header">
bedrag
</th>
<th class="table-cyanish-header" width="40px">
&nbsp;
</th>
</thead>
<tbody data-bind="foreach:projecthours">
<tr>
<td>
<span data-bind="text:fullname, visible:! inEdit()"></span>
<select class="form-control form-control-sm"
data-bind="options:$root.projectEmployees,
optionsText:'fullname',
optionsValue:'id',
value:projectemployee_id,
optionsCaption:'medewerker',
visible: inEdit(),
event:{change:$root.saveProjecthour}">
</select>
</td>
<td class="align-right">
<span data-bind=" visible: ! inEdit()">
<span data-bind="text:hours"></span>
uur
</span>
<input type="text"
class="form-control form-control-sm align-right"
paceholder="uren"
data-bind="textInput:hours, visible:inEdit,
event:{change:$root.saveProjecthour,keyup:$root.validateNumber.bind($data, 'hours')}"/>
</td>
<td>
<span data-bind="text:hourdate, visible:! inEdit()"></span>
<input type="text"
class="form-control form-control-sm"
placeholder="start"
data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
value:hourdate, visible:inEdit,
event:{change:$root.saveProjecthour}"/>
</td>
<td class="align-right">
<span data-bind=" visible: ! inEdit()">
<i class="icon fa-euro"></i>
<span data-bind="text:paymentamount"></span>
</span>
<input type="text"
class="form-control form-control-sm align-right"
paceholder="bedrag"
data-bind="textInput:paymentamount, visible:inEdit,
event:{change:$root.savePayment,keyup:$root.validateNumber.bind($data, 'paymentamount')}"/>
</td>
<td>
<i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editProjecthour"></i>
<i class="icon fa-trash redish pointer" title="verwijder"
data-bind="click:$root.removeProjecthour"></i>
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="5">
<button class="btn btn-primary btn-round btn-sm" data-bind="click:newProjecthour">
nieuwe projecturen
</button>
</td>
</tr>
</tfoot>
</table>
</div>
</div>
@@ -1,5 +1,4 @@
<div class="panel panel-bordered panel-primary panel-line panel-project">
<div class="panel panel-bordered panel-primary panel-line">
<div class="panel-heading panel-heading-project">
<h3 class="">
project medewerkers
@@ -23,36 +22,71 @@
<th class="table-cyanish-header">
eind
</th>
<th class="table-cyanish-header">
&nbsp;
<th class="table-cyanish-header" width="40px">
&nbsp;&nbsp;
</th>
</thead>
<tbody data-bind="foreach:projectEmployees">
<td>
<span data-bind="text:fullname"></span>
</td>
<td>
<span data-bind="text:tarif"></span>
</td>
<td>
<span data-bind="text:budget"></span> uur
</td>
<td>
<span data-bind="text:startdate"></span>
</td>
<td>
<span data-bind="text:enddate"></span>
</td>
<td>
<i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editOffer"></i>
<i class="icon fa-trash redish pointer" title="verwijder"
data-bind="click:$root.removeProject, css:{'whiteish':$root.selectedRowID() == id}"></i>
</td>
<tr>
<td>
<span data-bind="text:fullname, visible: ! inEdit()"></span>
<select class="form-control form-control-sm"
data-bind="
options:$root.users,
optionsText:'fullname',
optionsValue:'id',
value:employeeID,
optionsCaption:'naam',
event:{change:$root.saveProjectemployee},
visible:inEdit"></select>
</td>
<td>
<span data-bind=" visible: ! inEdit()">
<i class="icon fa-euro"></i>
<span data-bind="text:tarif"></span>
</span>
<input type="text"
class="form-control form-control-sm"
paceholder="tarief"
data-bind="textInput:tarif, visible:inEdit,
event:{change:$root.saveProjectemployee,keyup:$root.validateNumber.bind($data, 'tarif')}"/>
</td>
<td>
<span data-bind="visible: ! inEdit()"><span data-bind="text:budget"></span> uur</span>
<input type="text"
class="form-control form-control-sm"
placeholder="budget"
data-bind="textInput:budget, visible:inEdit,
event:{change:$root.saveProjectemployee,keyup:$root.validateNumber.bind($data, 'budget')}"/>
</td>
<td>
<span data-bind="text:startdate, visible: ! inEdit()"></span>
<input type="text"
class="form-control form-control-sm"
placeholder="start"
data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
value:startdate, visible:inEdit,
event:{change:$root.saveProjectemployee}"/>
</td>
<td>
<span data-bind="visible: ! inEdit()"></span>
<input type="text"
class="form-control form-control-sm"
placeholder=""
data-bind="visible:inEdit,
event:{change:$root.saveProjectemployee}"/>
</td>
<td>
<i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editProjectemployee"></i>
<i class="icon fa-trash redish pointer" title="verwijder"
data-bind="click:$root.removeProjectemployee"></i>
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="6">
<button class="btn btn-primary btn-round btn-sm" data-bind="click:addProjectEmployee">
<button class="btn btn-primary btn-round btn-sm" data-bind="click:addProjectemployee">
nieuwe project medewerker
</button>
</td>
@@ -0,0 +1,43 @@
<div class="panel panel-bordered panel-primary panel-line">
<div class="panel-heading panel-heading-project">
<h3 class="">
bestanden
</h3>
</div>
<div class="panel-body panel-body-project">
<table class="table table-sm">
<thead>
<tr>
<td colspan="2" class="table-cyanish-header">
offerte bestanden
</td>
</tr>
</thead>
<tbody data-bind="foreach:projectFiles">
<td>
</td>
<td>
<i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editPayment"></i>
<i class="icon fa-trash redish pointer" title="verwijder"
data-bind="click:$root.removePayment"></i>
</td>
</tr>
</tbody>
<thead>
<tr>
<th colspan="2" class="table-cyanish-header">
project bestanden
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="2">
</td>
</tr>
</tfoot>
</table>
</div>
</div>
@@ -1,4 +1,4 @@
<div class="panel panel-bordered panel-primary panel-line panel-project">
<div class="panel panel-bordered panel-primary panel-line">
<div class="panel-heading panel-heading-project">
<h3 class="">
offertes
@@ -40,10 +40,19 @@
<td>
<i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editOffer"></i>
<i class="icon fa-trash redish pointer" title="verwijder"
data-bind="click:$root.removeProject, css:{'whiteish':$root.selectedRowID() == id}"></i>
data-bind="click:$root.removeOffer"></i>
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="5">
<button class="btn btn-primary btn-round btn-sm" data-bind="click:newOffer">
nieuwe offerte
</button>
</td>
</tr>
</tfoot>
</table>
</div>
</div>
+69 -26
View File
@@ -1,10 +1,13 @@
<div class="project-page" id="project-modal" data-bind="fadeVisible:showProject()">
<div class="container" style="margin-top:50px;">
<div class="row">
<div class="col-md-3 form-inline">
<button class="btn btn-danger" data-bind="click:closeProject" style="position:absolute">
sluit
</button>
<div class="container" style="margin-top:15px;padding-top:15px;">
<div class="row" form-inline>
<div class="col-md-3">
<div class="form-group row">
<label class="col-xs-3 col-form-label">klant</label>
<div class="col-xs-9">
<label class="col-md-3 col-form-label">klant</label>
<div class="col-md-9">
<select class="form-control form-control-sm"
data-bind="options:customers,
optionsText:'name',
@@ -12,51 +15,72 @@
value:customerID,
disable:offers().length > 0,
optionsCaption:'selecteer klant',
event:{change:saveCustomerID}"></select>
event:{change:saveProject},
css:{'is-invalid': ! customerID()}"></select>
<small class="invalid-feedback"
data-bind="style:{display: ! customerID() ? 'block' : 'none'}">
selecteer een klant
</small>
</div>
</div>
</div>
<div class="col-md-4">
<div class="col-md-3">
<div class="form-group row">
<label class="col-xs-3 col-form-label">begin project</label>
<div class="input-group input-group-icon">
<label class="col-md-5 col-form-label">projectleider</label>
<div class="col-md-7">
<select class="form-control form-control-sm"
data-bind="options:users,
optionsText:'fullname',
optionsValue:'id',
value:projectleaderID,
optionsCaption:'projectleider',
event:{change:saveProject}">
</select>
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group row">
<label class="col-md-5 col-form-label">begin project</label>
<div class="col-md-7">
<div class="input-group input-group-icon">
<span class="input-group-addon">
<i class="icon fa-calendar"></i>
</span>
<input type="text"
placeholder="start project"
class="form-control"
readonly
data-bind="datepicker:{dateFormat: 'dd-mm-yy' }, value:startdate">
<input type="text"
placeholder="start project"
class="form-control form-control-sm"
readonly
data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
value:startdate,
event:{change:saveProject}">
</div>
</div>
</div>
</div>
<div class="col-md-4 form-inline">
<div class="col-md-3">
<div class="form-group row">
<label class="col-xs-3 col-form-label">eind project</label>
<div class="col-md-3">
<div class="form-group row">
<label class="col-md-5 col-form-label">eind project</label>
<div class="col-md-7">
<div class="input-group input-group-icon">
<span class="input-group-addon">
<i class="icon fa-calendar"></i>
</span>
<input type="text"
placeholder="eind project"
class="form-control"
class="form-control form-control-sm"
readonly
data-bind="datepicker:{dateFormat: 'dd-mm-yy' }, value:enddate">
data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
value:enddate,
event:{change:saveProject}">
</div>
</div>
</div>
</div>
<div class="col-md-1">
<button class="btn btn-danger" data-bind="click:closeProject">
sluit
</button>
</div>
</div>
<!-- <div class="container">-->
<!-- <div class="row">-->
<!-- <div class="col-xs-12">-->
<!-- <div class="col-md-12">-->
<!-- <div class="project-page-header">-->
<!-- <h3>nieuw / wijzigen project-->
<!-- <button class="btn btn-default pull-right" data-bind="click:closeProject">x</button>-->
@@ -73,6 +97,25 @@
<?php $this->load->view( 'modals/partials/_projectemployees' ); ?>
</div>
</div>
<div class="row" data-bind="fadeVisible:customerID()">
<div class="col-md-4">
<?php $this->load->view('modals/partials/_payments'); ?>
</div>
<div class="col-md-4">
<?php $this->load->view('modals/partials/_hours'); ?>
</div>
<div class="col-md-4">
<?php $this->load->view('modals/partials/_projectcosts'); ?>
</div>
</div>
<div class="row" data-bind="fadeVisible:customerID()">
<div class="col-md-4">
<?php $this->load->view('modals/partials/_projectfiles'); ?>
</div>
<div class="col-md-4">
<?php $this->load->view('modals/partials/_projectcomments'); ?>
</div>
</div>
</div>
</div>