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

klein grut

Browse Source
This commit is contained in:
theo
2018-04-20 07:17:25 +02:00
parent 08e51ef303
commit 7c76a668dc
3 changed files with 110 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/modals/partials/_projectdashboard.php
+70 -43
View File
@@ -1,6 +1,13 @@
<div class="row form-inline"> <div class="row">
<div class="col-md-4"> <div class="col-md-6">
<div class="form-group row"> <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> <label class="col-md-3 col-form-label">klant</label>
<div class="col-md-9"> <div class="col-md-9">
<select class="form-control form-control-sm" <select class="form-control form-control-sm"
@@ -17,10 +24,9 @@
selecteer een klant selecteer een klant
</small> </small>
</div> </div>
</div> <hr class="divider">
<div class="form-group row"> <label class="col-md-3 col-form-label">projectleider</label>
<label class="col-md-5 col-form-label">projectleider</label> <div class="col-md-9">
<div class="col-md-7">
<select class="form-control form-control-sm" <select class="form-control form-control-sm"
data-bind="options:users, data-bind="options:users,
optionsText:'fullname', optionsText:'fullname',
@@ -30,10 +36,9 @@
event:{change:saveProject}"> event:{change:saveProject}">
</select> </select>
</div> </div>
</div> <hr class="divider">
<div class="form-group row"> <label class="col-md-3 col-form-label">begin project</label>
<label class="col-md-5 col-form-label">begin project</label> <div class="col-md-9">
<div class="col-md-7">
<div class="input-group input-group-icon"> <div class="input-group input-group-icon">
<span class="input-group-addon"> <span class="input-group-addon">
<i class="icon fa-calendar"></i> <i class="icon fa-calendar"></i>
@@ -47,10 +52,9 @@
event:{change:saveProject}"> event:{change:saveProject}">
</div> </div>
</div> </div>
</div> <hr class="divider">
<div class="form-group row"> <label class="col-md-3 col-form-label">eind project</label>
<label class="col-md-5 col-form-label">eind project</label> <div class="col-md-9">
<div class="col-md-7">
<div class="input-group input-group-icon"> <div class="input-group input-group-icon">
<span class="input-group-addon"> <span class="input-group-addon">
<i class="icon fa-calendar"></i> <i class="icon fa-calendar"></i>
@@ -66,35 +70,58 @@
</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> </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>-->
application/views/modals/project_modal.php
+1 -1
View File
@@ -52,7 +52,7 @@
</div> </div>
<div class="tab-pane animation-slide-top" <div class="tab-pane animation-slide-top"
id="financial" id="financial"
data-bind="visible:activeTab()=='DASHBOARD'"> data-bind="visible:activeTab()=='FINANCIAL'">
<?php $this->load->view( 'modals/partials/_financials' ); ?> <?php $this->load->view( 'modals/partials/_financials' ); ?>
</div> </div>
<div class="tab-pane animation-slide-top" <div class="tab-pane animation-slide-top"
public/js/lib/modals/projectModal.js
+4 -2
View File
@@ -62,6 +62,8 @@ $( function () {
vm.refreshAvailableEmployees( function () { vm.refreshAvailableEmployees( function () {
vm.refreshProject(); vm.refreshProject();
vm.activeTab( 'DASHBOARD' );
} ); } );
} ); } );
} ); } );
@@ -769,8 +771,8 @@ $( function () {
vm.busy = false; vm.busy = false;
dbo.charts.drawHoursVsBudget( 340, 230, 'hours-vs-budget' ); // dbo.charts.drawHoursVsBudget( 340, 230, 'hours-vs-budget' );
dbo.charts.drawInvoicesVsPayed( 36000, 24000, 11000, 'invoice-vs-payed' ); // dbo.charts.drawInvoicesVsPayed( 36000, 24000, 11000, 'invoice-vs-payed' );
} ); } );
}, },