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

projectPage

Browse Source
This commit is contained in:
theo
2018-04-13 17:48:11 +02:00
parent dbe736d941
commit 08e51ef303
5 changed files with 103 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/modals/partials/_dashboard.php
+5
View File
@@ -0,0 +1,5 @@
<div class="tab-content">
<div class="tab-pane animation-slide-top active" id="dashboard">
<?php $this->load->view( 'modals/partials/_projectdashboard' ); ?>
</div>
</div>
application/views/modals/partials/_financials.php
+19
View File
@@ -0,0 +1,19 @@
<div class="row" data-bind="fadeVisible:customerID()">
<!-- <div class="col-md-5">-->
<!-- --><?php //$this->load->view( 'modals/partials/_projectoffers' ); ?>
<!-- </div>-->
<div class="col-md-8">
<?php $this->load->view( 'modals/partials/_projectcosts' ); ?>
</div>
<div class="col-md-4">
<?php $this->load->view( 'modals/partials/_reservations' ); ?>
</div>
</div>
<div class="row">
<div class="col-md-8">
<?php $this->load->view( 'modals/partials/_invoices' ); ?>
</div>
<div class="col-md-4">
<?php $this->load->view( 'modals/partials/_forecasts' ); ?>
</div>
</div>
application/views/modals/partials/_projectdashboard.php
+5 -26
View File
@@ -1,5 +1,5 @@
<div class="row form-inline"> <div class="row form-inline">
<div class="col-md-3"> <div class="col-md-4">
<div class="form-group row"> <div class="form-group 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">
@@ -18,8 +18,6 @@
</small> </small>
</div> </div>
</div> </div>
</div>
<div class="col-md-3">
<div class="form-group row"> <div class="form-group row">
<label class="col-md-5 col-form-label">projectleider</label> <label class="col-md-5 col-form-label">projectleider</label>
<div class="col-md-7"> <div class="col-md-7">
@@ -33,8 +31,6 @@
</select> </select>
</div> </div>
</div> </div>
</div>
<div class="col-md-3">
<div class="form-group row"> <div class="form-group row">
<label class="col-md-5 col-form-label">begin project</label> <label class="col-md-5 col-form-label">begin project</label>
<div class="col-md-7"> <div class="col-md-7">
@@ -52,8 +48,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="col-md-3">
<div class="form-group row"> <div class="form-group row">
<label class="col-md-5 col-form-label">eind project</label> <label class="col-md-5 col-form-label">eind project</label>
<div class="col-md-7"> <div class="col-md-7">
@@ -72,8 +66,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="row" style="margin-top:10px;">
<div class="col-md-5"> <div class="col-md-5">
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label">omschrijving</label> <label class="col-md-3 form-control-label">omschrijving</label>
@@ -83,39 +75,26 @@
data-bind="textInput:projectname, event:{keyup:saveProjectname}"/> data-bind="textInput:projectname, event:{keyup:saveProjectname}"/>
</div> </div>
</div> </div>
</div>
<div class="col-md-3">
<div class="form-group row"> <div class="form-group row">
<h4 class="form-control-label">eigen omzet: <h4 class="form-control-label">eigen omzet:
<i class="icon fa-euro"> </i><span data-bind="text:ownRevenue"></span> <i class="icon fa-euro"> </i><span data-bind="text:ownRevenue"></span>
</h4> </h4>
</div> </div>
</div>
<div class="col-md-3">
<div class="form-group row"> <div class="form-group row">
<h4 class="form-control-label">overige omzet: <h4 class="form-control-label">overige omzet:
<i class="icon fa-euro"> </i><span data-bind="text:otherRevenue"></span> <i class="icon fa-euro"> </i><span data-bind="text:otherRevenue"></span>
</h4> </h4>
</div> </div>
</div> </div>
</div>
<div class="row">
<div class="form-group row">
<div class="col-md-3"> <div class="col-md-3">
<h3>te besteden uren :<span data-bind="text:(totalBudget() - totalHours())"></span></h3> <h3>te besteden uren :<span data-bind="text:(totalBudget() - totalHours())"></span></h3>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<h3></h3> <h3></h3>
</div> </div>
</div>
<div class="row">
<div class="col-md-3">
<div class="graph-holder">
<canvas id="hours-vs-budget" height="300"></canvas>
</div>
</div>
<div class="col-md-4">
<div class="graph-holder">
<canvas id="invoice-vs-payed" height="300"></canvas>
</div>
</div> </div>
</div> </div>
application/views/modals/project_modal.php
+38 -50
View File
@@ -3,37 +3,35 @@
<div class="container" style="margin-top:15px;padding-top:15px;"> <div class="container" style="margin-top:15px;padding-top:15px;">
<div class="nav-tabs-horizontal nav-tabs-animate nav-tab-reverse"> <div class="nav-tabs-horizontal nav-tabs-animate nav-tab-reverse">
<ul class="nav nav-tabs nav-tabs-solid"> <ul class="nav nav-tabs nav-tabs-solid">
<li class="nav-item" role="presentation"> <li class="nav-item"
<a class="nav-link active" role="presentation"
data-toggle="tab" data-bind="css:{'active':activeTab()=='DASHBOARD'},
href="#dashboard"> click:setActiveTab.bind($data,'DASHBOARD')">
<i class="icon fa-area-chart"></i> <a>
<i class="icon fa-hacker-news"></i>
algemeen</a> algemeen</a>
</li> </li>
<li class="nav-item" role="presentation"> <li class="nav-item"
<a class="nav-link" role="presentation"
data-toggle="tab" data-bind="css:{'active':activeTab()=='FINANCIAL'},
href="#financial" click:setActiveTab.bind($data,'FINANCIAL')">
aria-control="financial" <a>
role="tab">
<i class="icon fa-euro"></i> <i class="icon fa-euro"></i>
financieel</a> financieel</a>
</li> </li>
<li class="nav-item" role="presentation"> <li class="nav-item"
<a class="nav-link" role="presentation"
data-toggle="tab" data-bind="css:{'active':activeTab()=='EMPLOYEES'},
href="#employees" click:setActiveTab.bind($data,'EMPLOYEES')">
aria-control="employees" <a>
role="tab">
<i class="icon fa-user-circle"></i> <i class="icon fa-user-circle"></i>
medewerkers</a> medewerkers</a>
</li> </li>
<li class="nav-item" role="presentation"> <li class="nav-item"
<a class="nav-link" role="presentation"
data-toggle="tab" data-bind="css:{'active':activeTab()=='FILES'},
href="#files" click:setActiveTab.bind($data,'FILES')">
aria-control="files" <a>
role="tab">
<i class="icon fa-files"></i> <i class="icon fa-files"></i>
bestanden en opmerkingen</a> bestanden en opmerkingen</a>
</li> </li>
@@ -42,36 +40,24 @@
<h3 style="position:absolute;top:-65px; right:30px; width:350px;"> <h3 style="position:absolute;top:-65px; right:30px; width:350px;">
Projectnummer: <span data-bind="text:projectnumber"></span> Projectnummer: <span data-bind="text:projectnumber"></span>
</h3> </h3>
<button class="btn btn-danger" data-bind="click:closeProject" style="position:absolute;right:0px;top:-50px"> <button class="btn btn-danger" data-bind="click:closeProject"
style="position:absolute;right:0px;top:-50px">
sluit sluit
</button> </button>
</div> </div>
<div class="tab-content"> <div class="tab-pane animation-slide-top"
<div class="tab-pane animation-slide-top active" id="dashboard"> id="dashboard"
<?php $this->load->view('modals/partials/_projectdashboard'); ?> data-bind="visible:activeTab()=='DASHBOARD'">
<?php $this->load->view( 'modals/partials/_dashboard' ); ?>
</div> </div>
<div class="tab-pane animation-slide-top" id="financial"> <div class="tab-pane animation-slide-top"
<div class="row" data-bind="fadeVisible:customerID()"> id="financial"
<!-- <div class="col-md-5">--> data-bind="visible:activeTab()=='DASHBOARD'">
<!-- --><?php //$this->load->view( 'modals/partials/_projectoffers' ); ?> <?php $this->load->view( 'modals/partials/_financials' ); ?>
<!-- </div>-->
<div class="col-md-8">
<?php $this->load->view( 'modals/partials/_projectcosts' ); ?>
</div> </div>
<div class="col-md-4"> <div class="tab-pane animation-slide-top"
<?php $this->load->view( 'modals/partials/_reservations' ); ?> id="employees"
</div> data-bind="visible:activeTab()=='EMPLOYEES'">
</div>
<div class="row">
<div class="col-md-8">
<?php $this->load->view( 'modals/partials/_invoices' ); ?>
</div>
<div class="col-md-4">
<?php $this->load->view('modals/partials/_forecasts'); ?>
</div>
</div>
</div>
<div class="tab-pane animation-slide-top" id="employees">
<div class="row" data-bind="fadeVisible:customerID()"> <div class="row" data-bind="fadeVisible:customerID()">
<div class="col-md-5" data-bind="fadeVisible:customerID()"> <div class="col-md-5" data-bind="fadeVisible:customerID()">
<?php $this->load->view( 'modals/partials/_projectemployees' ); ?> <?php $this->load->view( 'modals/partials/_projectemployees' ); ?>
@@ -82,7 +68,9 @@
</div> </div>
</div> </div>
<div class="tab-pane animation-slide-top" id="files"> <div class="tab-pane animation-slide-top"
id="files"
data-bind="visible:activeTab()=='FILES'">
<div class="row" data-bind="fadeVisible:customerID()"> <div class="row" data-bind="fadeVisible:customerID()">
<div class="col-md-4"> <div class="col-md-4">
<?php $this->load->view( 'modals/partials/_projectfiles' ); ?> <?php $this->load->view( 'modals/partials/_projectfiles' ); ?>
@@ -94,5 +82,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
public/js/lib/modals/projectModal.js
+9 -2
View File
@@ -46,6 +46,7 @@ $( function () {
totalForecast : ko.observable(), totalForecast : ko.observable(),
documents : ko.observableArray( [] ), documents : ko.observableArray( [] ),
comments : ko.observableArray( [] ), comments : ko.observableArray( [] ),
activeTab : ko.observable(),
init: function () { init: function () {
var vm = dbo.editProjectModal; var vm = dbo.editProjectModal;
@@ -68,6 +69,12 @@ $( function () {
} ); } );
}, },
setActiveTab: function ( tab ) {
var vm = dbo.editProjectModal;
vm.activeTab( tab );
},
togglePayments: function () { togglePayments: function () {
this.showPayments( !this.showPayments() ); this.showPayments( !this.showPayments() );
@@ -487,7 +494,7 @@ $( function () {
if ( !self ) self = this; if ( !self ) self = this;
if ( !self.external_id ) { if ( !self.external_id ) {
self.invalidReservation(true); self.invalidReservation( true );
return; return;
} }
@@ -500,7 +507,7 @@ $( function () {
dbo.projectDataService.saveReservation( submitDATA, function ( data ) { dbo.projectDataService.saveReservation( submitDATA, function ( data ) {
if ( data.success ) { if ( data.success ) {
self.invalidReservation(false); self.invalidReservation( false );
self.id = data.reservationID; self.id = data.reservationID;
} }
} ); } );