klein grut

This commit is contained in:
2018-04-20 07:17:25 +02:00
parent 08e51ef303
commit 7c76a668dc
3 changed files with 110 additions and 81 deletions
@@ -1,10 +1,17 @@
<div class="row form-inline">
<div class="col-md-4">
<div class="form-group row">
<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,
<div class="row">
<div class="col-md-6">
<div class="panel panel-bordered panel-primary panel-line">
<div class="panel-heading panel-heading-project">
<h3 class="">
Projectgegevens
</h3>
</div>
<div class="panel-body panel-body-project">
<div class="row">
<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',
optionsValue: 'id',
value:customerID,
@@ -12,89 +19,109 @@
optionsCaption:'selecteer klant',
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 class="form-group row">
<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,
<small class="invalid-feedback"
data-bind="style:{display: ! customerID() ? 'block' : 'none'}">
selecteer een klant
</small>
</div>
<hr class="divider">
<label class="col-md-3 col-form-label">projectleider</label>
<div class="col-md-9">
<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 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 form-control-sm"
readonly
data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
</select>
</div>
<hr class="divider">
<label class="col-md-3 col-form-label">begin project</label>
<div class="col-md-9">
<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 form-control-sm"
readonly
data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
value:startdate,
event:{change:saveProject}">
</div>
</div>
</div>
<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 form-control-sm"
readonly
data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
</div>
</div>
<hr class="divider">
<label class="col-md-3 col-form-label">eind project</label>
<div class="col-md-9">
<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 form-control-sm"
readonly
data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
value:enddate,
event:{change:saveProject}">
</div>
</div>
</div>
</div>
</div>
</div>
<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 class="form-group row">
<h4 class="form-control-label">eigen omzet:
<i class="icon fa-euro"> </i><span data-bind="text:ownRevenue"></span>
</h4>
</div>
<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 class="form-group row">
<div class="col-md-3">
<h3>te besteden uren :<span data-bind="text:(totalBudget() - totalHours())"></span></h3>
</div>
<div class="col-md-3">
<h3></h3>
</div>
</div>
</div>
</div>
<!---->
<!-- <div class="row form-inline">-->
<!-- <div class="col-md-4">-->
<!---->
<!---->
<!-- <div class="form-group row">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group row">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group row">-->
<!-- </div>-->
<!--</div>-->
<!--<div class="form-group row">-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<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 class="form-group row">-->
<!-- <h4 class="form-control-label">eigen omzet:-->
<!-- <i class="icon fa-euro"> </i><span data-bind="text:ownRevenue"></span>-->
<!-- </h4>-->
<!-- </div>-->
<!-- <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 class="form-group row">-->
<!-- <div class="col-md-3">-->
<!-- <h3>te besteden uren :<span data-bind="text:(totalBudget() - totalHours())"></span></h3>-->
<!-- </div>-->
<!-- <div class="col-md-3">-->
<!-- <h3></h3>-->
<!-- </div>-->
<!--</div>-->
<!--</div>-->
+1 -1
View File
@@ -52,7 +52,7 @@
</div>
<div class="tab-pane animation-slide-top"
id="financial"
data-bind="visible:activeTab()=='DASHBOARD'">
data-bind="visible:activeTab()=='FINANCIAL'">
<?php $this->load->view( 'modals/partials/_financials' ); ?>
</div>
<div class="tab-pane animation-slide-top"
+4 -2
View File
@@ -62,6 +62,8 @@ $( function () {
vm.refreshAvailableEmployees( function () {
vm.refreshProject();
vm.activeTab( 'DASHBOARD' );
} );
} );
} );
@@ -769,8 +771,8 @@ $( function () {
vm.busy = false;
dbo.charts.drawHoursVsBudget( 340, 230, 'hours-vs-budget' );
dbo.charts.drawInvoicesVsPayed( 36000, 24000, 11000, 'invoice-vs-payed' );
// dbo.charts.drawHoursVsBudget( 340, 230, 'hours-vs-budget' );
// dbo.charts.drawInvoicesVsPayed( 36000, 24000, 11000, 'invoice-vs-payed' );
} );
},