From 2738f8aa78b4a73eae3cc1486eec4c05c989bf93 Mon Sep 17 00:00:00 2001
From: Theo Weijmer <t.weijmer@pensare.nl>
Date: Tue, 7 May 2019 21:20:35 +0200
Subject: [PATCH] nieuwe kolommen bij offertes / employeehours reportable

---
 application/core/MY_Controller.php            |  2 +-
 .../eloquent/queries/QEmployeeHours.php       |  7 +++-
 application/views/pages/offers_view.php       | 37 ++++++++++++-------
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php
index 58ffb96..e87d4c8 100644
--- a/application/core/MY_Controller.php
+++ b/application/core/MY_Controller.php
@@ -16,7 +16,7 @@ class MY_Controller extends CI_Controller {
     {
         parent::__construct();
 
-        $this->version = '1.00.05';
+        $this->version = '1.00.06';
 
         $this->load->library( 'beheer/session/RetrieveUserSession' );
 
diff --git a/application/models/eloquent/queries/QEmployeeHours.php b/application/models/eloquent/queries/QEmployeeHours.php
index fc2b335..3b45922 100644
--- a/application/models/eloquent/queries/QEmployeeHours.php
+++ b/application/models/eloquent/queries/QEmployeeHours.php
@@ -29,8 +29,11 @@ class QEmployeeHours {
                                     0 AS nonprofitablehours, 
                                     0 AS revenues, 
                                     SUM(hours) AS nonprojecthours
-                    FROM 			employeehours
-                    WHERE 			YEAR(hourdate) = '{$year}' ";
+                    FROM 			employeehours       EMH
+                        JOIN        hourtypes           HTY
+                        ON          HTY.id = EMH.hourtype_id
+                    WHERE 			YEAR(hourdate) = '{$year}' 
+                        AND         reportable = 'T' ";
             if( $month != 0 ) $sql .= "AND           MONTH(hourdate) = '$month' ";
         $sql .= "
                     GROUP BY 		employee_id, MONTH(hourdate)
diff --git a/application/views/pages/offers_view.php b/application/views/pages/offers_view.php
index 51882a7..c5c1c58 100644
--- a/application/views/pages/offers_view.php
+++ b/application/views/pages/offers_view.php
@@ -1,3 +1,4 @@
+
 <div class="row">
     <div class="col-xs-6">
         <div class="form-group">
@@ -20,14 +21,16 @@
 <table class="table table-sm">
     <thead>
     <tr>
-        <th class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'offernumber')">nummer</th>
-        <th class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'CUS.name')">klant</th>
-        <th class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'offername')">offertenaam</th>
-        <th class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'startdate')">datum</th>
-        <th class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'acceptance_chance')">kans</th>
-        <th class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'accepteddate')">geaccepteerd</th>
-        <th class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'rejectdate')">afgewezen</th>
-        <th class="table-tealish-header pointer">&nbsp;</th>
+        <th width="10%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'offernumber')">nummer</th>
+        <th width="25%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'CUS.name')">klant</th>
+        <th width="25%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'offername')">offertenaam</th>
+        <th width="5%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'startdate')">datum</th>
+        <th width="10%" class="table-tealish-header pointer align-right" data-bind="click:directionOrderOffers.bind($data, 'own_revenue')">(eigen) omzet</th>
+        <th width="10%" class="table-tealish-header pointer align-right" data-bind="click:directionOrderOffers.bind($data, 'acceptance_chance')">kans</th>
+        <th width="10%" class="table-tealish-header align-right">(eigen) omzet * kans</th>
+<!--        <th class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'accepteddate')">geaccepteerd</th>-->
+<!--        <th class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'rejectdate')">afgewezen</th>-->
+        <th width="5%" class="table-tealish-header pointer">&nbsp;</th>
     </tr>
     </thead>
     <tbody data-bind="foreach:offers">
@@ -44,15 +47,21 @@
         <td data-bind="click:$root.selectOffer" class="pointer">
             <span data-bind="text:startdate"></span>
         </td>
-        <td data-bind="click:$root.selectOffer" class="pointer">
+        <td data-bind="click:$root.selectOffer" class="pointer align-right">
+            € <span data-bind="text:own_revenue"></span>
+        </td>
+        <td data-bind="click:$root.selectOffer" class="pointer align-right">
             <span data-bind="text:acceptance_chance"></span> %
         </td>
-        <td data-bind="click:$root.selectOffer" class="pointer">
-            <span data-bind="text:accepteddate"></span>
-        </td>
-        <td data-bind="click:$root.selectOffer" class="pointer">
-            <span data-bind="text:rejectdate"></span>
+        <td data-bind="click:$root.selectOffer" class="pointer align-right">
+            € <span data-bind="text:Math.round((acceptance_chance * own_revenue) / 100)"></span>
         </td>
+<!--        <td data-bind="click:$root.selectOffer" class="pointer">-->
+<!--            <span data-bind="text:accepteddate"></span>-->
+<!--        </td>-->
+<!--        <td data-bind="click:$root.selectOffer" class="pointer">-->
+<!--            <span data-bind="text:rejectdate"></span>-->
+<!--        </td>-->
         <td>
             <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editOffer"></i>
             <!-- ko if:archive == 'F' -->