projecten

application/controllers/projects/ProjectsController.php

@@ -29,7 +29,7 @@ class ProjectsController extends MY_Controller {
 
     public function getAllProjects( $archive = 'F' )
     {
-        $projects = Project::getAllProjects( FALSE, $archive );
+        $projects = Project::getAllProjects( $archive );
 
         $this->json( $projects );
     }
@@ -66,11 +66,74 @@ class ProjectsController extends MY_Controller {
         $projectID = $project['id'];
         unset( $project['id'] );
 
+        $project['startdate'] = date2mysql( $project['startdate'] );
+        $project['enddate'] = date2mysql( $project['enddate'] );
+
         $projectID = Project::saveProject( $projectID, $project );
 
         $this->json( ['success' => TRUE, 'projectID' => $projectID] );
     }
 
+    public function saveProjectemployee()
+    {
+        $projectemployeeValidation = new ProjectemployeeValidation();
+
+        if ( ! $projectemployeeValidation->getValidationResult() )
+            return $this->json( [
+                'success' => FALSE, 'messages' => $projectemployeeValidation->getErrorMessages()] );
+
+        $projectemployee = $this->input->post();
+
+        $projectemployeeID = $projectemployee['id'];
+        unset( $projectemployee['id'] );
+
+        $projectemployee['startdate'] = date2mysql( $projectemployee['startdate'] );
+
+        Projectemployee::saveProjectemployee( $projectemployeeID, $projectemployee );
+
+        $this->json( ['success' => TRUE] );
+    }
+
+    public function savePayment()
+    {
+        $paymentValidation = new PaymentValidation();
+
+        if ( ! $paymentValidation->getValidationResult() )
+            return $this->json( [
+                'success' => FALSE, 'messages' => $paymentValidation->getErrorMessages()] );
+
+        $payment = $this->input->post();
+
+        $paymentID = $payment['id'];
+        unset( $payment['id'] );
+
+        $payment['paymentdate'] = date2mysql( $payment['paymentdate'] );
+
+        $paymentID = Payment::savePayment( $paymentID, $payment );
+
+        $this->json( ['success' => TRUE, 'paymentID'=> $paymentID ] );
+    }
+
+    public function saveProjecthour()
+    {
+        $projecthourValidation = new ProjecthourValidation();
+
+        if ( ! $projecthourValidation->getValidationResult() )
+            return $this->json( [
+                'success' => FALSE, 'messages' => $projecthourValidation->getErrorMessages()] );
+
+        $projecthour = $this->input->post();
+
+        $projecthourID = $projecthour['id'];
+        unset( $projecthour['id'] );
+
+        $projecthour['hourdate'] = date2mysql( $projecthour['hourdate'] );
+
+        $paymentID = Projecthour::saveProjecthour( $projecthourID, $projecthour );
+
+        $this->json( ['success' => TRUE, 'projecthourID'=> $paymentID ] );
+    }
+
     public function archiveProject( $projectID, $status )
     {
         Project::whereId( $projectID )->update( ['archive' => $status] );
@@ -87,4 +150,37 @@ class ProjectsController extends MY_Controller {
         $this->json( ['result' => TRUE] );
     }
 
+    public function removeProjectemployee( $projectemployeeID )
+    {
+        $removeProjectemployee = new RemoveProjectemployee( $projectemployeeID );
+
+        if ( $removeProjectemployee->getAllowDelete() === FALSE ) return $this->json( ['result' => FALSE] );
+
+        Projectemployee::removeProjectemployee( $projectemployeeID );
+
+        $this->json( ['result' => TRUE] );
+    }
+
+    public function removePayment( $paymentID )
+    {
+        $removePayment = new RemovePayment( $paymentID );
+
+        if ( $removePayment->getAllowDelete() === FALSE ) return $this->json( ['result' => FALSE] );
+
+        Payment::removePayment( $paymentID );
+
+        $this->json( ['result' => TRUE] );
+    }
+
+    public function removeProjecthour( $projecthourID )
+    {
+        $removeProjecthour = new RemoveProjecthour( $projecthourID );
+
+        if ( $removeProjecthour->getAllowDelete() === FALSE ) return $this->json( ['result' => FALSE] );
+
+        Projecthour::removeProjecthour( $projecthourID );
+
+        $this->json( ['result' => TRUE] );
+    }
+
 }

application/libraries/projects/RemovePayment.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 27/12/2017
+ * Time: 17:45
+ */
+
+class RemovePayment {
+
+    private $paymentID;
+    private $allowDelete = TRUE;
+
+    public function __construct( $paymentID )
+    {
+        $this->setPaymentID( $paymentID );
+
+        $this->handle();
+    }
+
+    public function getAllowDelete()
+    {
+        return $this->allowDelete;
+    }
+
+    private function setPaymentID( $paymentID )
+    {
+        $this->paymentID = $paymentID;
+    }
+
+    private function handle()
+    {
+
+    }
+
+}

application/libraries/projects/RemoveProjectemployee.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 27/12/2017
+ * Time: 17:45
+ */
+
+class RemoveProjectemployee {
+
+    private $projectemployeeID;
+    private $allowDelete = TRUE;
+
+    public function __construct( $projectemployeeID )
+    {
+        $this->setProjectemployeeID( $projectemployeeID );
+
+        $this->handle();
+    }
+
+    public function getAllowDelete()
+    {
+        return $this->allowDelete;
+    }
+
+    private function setProjectemployeeID( $projectemployeeID )
+    {
+        $this->projectemployeeID = $projectemployeeID;
+    }
+
+    private function handle()
+    {
+
+    }
+
+}

application/libraries/projects/RemoveProjecthour.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 27/12/2017
+ * Time: 17:45
+ */
+
+class RemoveProjecthour {
+
+    private $projecthourID;
+    private $allowDelete = TRUE;
+
+    public function __construct( $projecthourID )
+    {
+        $this->setProjecthourID( $projecthourID );
+
+        $this->handle();
+    }
+
+    public function getAllowDelete()
+    {
+        return $this->allowDelete;
+    }
+
+    private function setProjecthourID( $projecthourID )
+    {
+        $this->projecthourID = $projecthourID;
+    }
+
+    private function handle()
+    {
+
+    }
+
+}

application/libraries/validation/inputValidations/PaymentValidation.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'libraries/validation/inputValidations/BaseValidation.php' );
+
+class PaymentValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'offer_id'      => [
+            'validations' => 'required|integer',
+            'fieldname'   => 'offerte'
+        ],
+        'paymentdate'   => [
+            'validations' => 'date',
+            'fieldname'   => 'betaaldatum'
+        ],
+        'paymentamount' => [
+            'validations' => 'number',
+            'fieldname'   => 'bedrag'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->ci =& get_instance();
+    }
+}

application/libraries/validation/inputValidations/ProjectValidation.php

@@ -13,9 +13,17 @@ class ProjectValidation extends BaseValidation {
 
 
     protected $validationFields = [
-        'name'      => [
-            'validations' => 'required|alphaNumericSpaces',
-            'fieldname'   => 'projectnaam'
+        'customer_id' => [
+            'validations' => 'required|integer',
+            'fieldname'   => 'klant'
+        ],
+        'startdate'      => [
+            'validations' => 'required|date',
+            'fieldname'   => 'start project'
+        ],
+        'enddate' => [
+            'validations' => 'date',
+            'fieldname' => 'eind project'
         ]
     ];
 

application/libraries/validation/inputValidations/ProjectemployeeValidation.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'libraries/validation/inputValidations/BaseValidation.php' );
+
+class ProjectemployeeValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'user_id' => [
+            'validations' => 'integer',
+            'fieldname'   => 'klant'
+        ],
+        'startdate'      => [
+            'validations' => 'date',
+            'fieldname'   => 'start project'
+        ],
+        'enddate' => [
+            'validations' => 'date',
+            'fieldname' => 'eind project'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->ci =& get_instance();
+    }
+}

application/libraries/validation/inputValidations/ProjecthourValidation.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'libraries/validation/inputValidations/BaseValidation.php' );
+
+class ProjecthourValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'projectemployee_id'      => [
+            'validations' => 'required|integer',
+            'fieldname'   => 'projectmedewerker'
+        ],
+        'hourdate'   => [
+            'validations' => 'date',
+            'fieldname'   => 'datum'
+        ],
+        'hours' => [
+            'validations' => 'number',
+            'fieldname'   => 'uren'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->ci =& get_instance();
+    }
+}

application/models/eloquent/BaseModel.php

@@ -36,6 +36,8 @@ class BaseModel extends Eloquent {
         parent::boot();
 
         static::creating( function ( $model ) {
+            static::$oldValue = '';
+
             if ( AUTHENTICATED )
             {
                 $user = User::find(USERID);
@@ -44,6 +46,8 @@ class BaseModel extends Eloquent {
             }
         } );
         static::updating( function ( $model ) {
+            static::$oldValue = json_encode($model->original);
+
             if ( AUTHENTICATED )
             {
                 $user = User::find(USERID);

application/models/eloquent/Customer.php

@@ -29,13 +29,14 @@ class Customer extends BaseModel {
         if( $customerID == 0)
         {
             $customer = Customer::create($customer);
+            $customerID = $customer['id'];
         }
         else
         {
-            $customer = Customer::whereId($customerID)->update($customer);
+            Customer::whereId($customerID)->update($customer);
         }
 
-        return $customer['id'];
+        return $customerID;
     }
 
     public static function removeCustomer($customerID)

application/models/eloquent/External.php

@@ -29,13 +29,14 @@ class External extends BaseModel {
         if( $externalID == 0)
         {
             $external = External::create($external);
+            $externalID = $external['id'];
         }
         else
         {
-            $external = External::whereId($externalID)->update($external);
+            External::whereId($externalID)->update($external);
         }
 
-        return $external['id'];
+        return $externalID;
     }
 
     public static function removeExternal($externalID)

application/models/eloquent/Payment.php

@@ -8,11 +8,33 @@
 
 class Payment extends BaseModel {
 
-    protected $table = "projects";
+    protected $table = "payments";
 
     public function offer()
     {
         return $this->belongsTo( 'Offer' );
     }
 
+    public static function savePayment( $paymentID, $payment )
+    {
+        $payment = (array) $payment;
+
+        if ( $paymentID == 0 )
+        {
+            $payment = Payment::create( $payment );
+            $paymentID = $payment['id'];
+        }
+        else
+        {
+            Payment::whereId( $paymentID )->update( $payment );
+        }
+
+        return $paymentID;
+    }
+
+    public static function removePayment( $paymentID )
+    {
+        Payment::whereId( $paymentID )->delete();
+    }
+
 }

application/models/eloquent/Project.php

@@ -68,7 +68,7 @@ class Project extends BaseModel {
                 'offers' => function ( $q ) {
                     $q->whereArchive( 'F' )
                         ->with( [
-                            'payment' => function ( $q ) {
+                            'payments' => function ( $q ) {
                                 $q->selectRaw( '*' );
                             }] );
                 }] )
@@ -76,6 +76,7 @@ class Project extends BaseModel {
                 'projectemployees.user' => function ( $q ) {
                     $q->selectRaw( "id, CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname" );
                 }] )
+            ->with( 'projectemployees.projecthours' )
             ->with( 'customer' );
 
         return $project;
@@ -83,10 +84,28 @@ class Project extends BaseModel {
 
     public static function createProject()
     {
-        $data = ['startdate'=> date('Y-m-d')];
+        $data = ['startdate' => date( 'Y-m-d' )];
 
-        $project = Project::create($data);
+        $project = Project::create( $data );
 
         return $project->id;
     }
+
+    public static function saveProject( $projectID, $project )
+    {
+        $project = (array) $project;
+
+        if ( $projectID == 0 )
+        {
+            $project = Project::create( $project );
+            $projectID = $project['id'];;
+        }
+        else
+        {
+            Project::whereId( $projectID )->update( $project );
+        }
+
+        return $projectID;
+
+    }
 }

application/models/eloquent/Projectemployee.php

@@ -18,6 +18,11 @@ class Projectemployee extends BaseModel {
         return $this->belongsTo( 'User' );
     }
 
+    public function projecthours()
+    {
+        return $this->hasMany( 'Projecthour' );
+    }
+
     public static function createProjectEmployee( $projectID )
     {
         $projectemployee = Projectemployee::create( [
@@ -27,4 +32,15 @@ class Projectemployee extends BaseModel {
         return $projectemployee->id;
     }
 
+    public static function saveProjectemployee( $projectemployeeID, $projectemployee )
+    {
+        Projectemployee::whereId( $projectemployeeID )
+            ->update( $projectemployee );
+    }
+
+    public static function removeProjectemployee( $projectemployeeID )
+    {
+        Projectemployee::whereId( $projectemployeeID )->delete();
+    }
+
 }

application/models/eloquent/Projecthour.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 19/01/2018
+ * Time: 15:51
+ */
+
+class Projecthour extends BaseModel {
+
+    protected $table = "projecthours";
+
+    public function projectemployee()
+    {
+        $this->belongsTo( 'Projectemployee' );
+    }
+
+    public static function saveProjecthour( $projecthourID, $projecthour )
+    {
+        $projecthour = (array) $projecthour;
+
+        if ( $projecthourID == 0 )
+        {
+            $projecthour = Projecthour::create( $projecthour );
+            $projecthourID = $projecthour['id'];
+        }
+        else
+        {
+            Projecthour::whereId( $projecthourID )->update( $projecthour );
+        }
+
+        return $projecthourID;
+    }
+
+    public static function removeProjecthour( $projecthourID )
+    {
+        Projecthour::whereId( $projecthourID )->delete();
+    }
+
+
+}

application/models/eloquent/User.php

@@ -53,13 +53,14 @@ class User extends BaseModel {
         if ( $userID == 0 )
         {
             $user = User::create( $user );
+            $userID = $user['id'];
         }
         else
         {
-            $user = User::whereId( $userID )->update( $user );
+            User::whereId( $userID )->update( $user );
         }
 
-        return $user['id'];
+        return $userID;
     }
 
     public static function removeUser( $userID )

application/views/modals/offer_modal.php

@@ -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>

application/views/modals/partials/_hours.php

@@ -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>

application/views/modals/partials/_payments.php

@@ -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>

application/views/modals/partials/_projectcomments.php

@@ -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>

application/views/modals/partials/_projectcosts.php

@@ -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>

application/views/modals/partials/_projectemployees.php

@@ -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>

application/views/modals/partials/_projectfiles.php

@@ -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>

application/views/modals/partials/_projectoffers.php

@@ -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>

application/views/modals/project_modal.php

@@ -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>

application/views/pages/offers_view.php

@@ -1,6 +1,6 @@
 <div class="container">
     <div class="row">
-        <div class="col-xl-8">
+        <div class="col-xl-12">
             <table class="table table-sm">
                 <thead>
                 <tr>
@@ -82,38 +82,5 @@
 
             </table>
         </div>
-        <div class="col-xl-4">
-            <div class="upload-btn-wrapper" data-bind="visible:selectedRowID()">
-                <button class="upload-btn">voeg bestand toe</button>
-                <input type="file" name="userfile" data-bind="event:{change:addDocument}" id="fileinput"/>
-            </div>
-            <ul class="list-group" data-bind="foreach:documents">
-                <li class="list-group-dividered">
-                    <span class="badge badge-info" style="width:100%; text-align:left;">
-                        <span data-bind="text:fullname"></span> |
-                        <span data-bind="text:uploaddate"></span>
-                    </span>
-                    <span data-bind="text:originalname"></span>
-                    <span style="float:right">
-                        <i class="icon fa-download pointer" data-bind="click:$root.downloadDocument"></i>
-                        <i class="icon fa-trash redish pointer" data-bind="click:$root.removeFile"></i>
-                    </span>
-                </li>
-            </ul>
-
-            <hr/>
-            <button data-bind="click:addComment, visible:selectedRowID()" 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>
     </div>
 </div>

application/views/pages/projects_view.php

@@ -38,7 +38,7 @@
                         <span data-bind="text:totalOtherrevenue.toFixed(0)"></span>
                     </td>
                     <td>
-                        <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editOffer"></i>
+                        <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editProject"></i>
                         <!-- ko if:archive == 'F' -->
                         <i class="icon fa-archive pointer" title="archiveer"
                            data-bind="click:$root.archiveProject"></i>