From 0a891af5ec2b834c85b1b76290594df548faa91a Mon Sep 17 00:00:00 2001
From: Theo Weijmer <t.weijmer@pensare.nl>
Date: Sat, 13 Apr 2019 10:39:58 +0200
Subject: [PATCH] fix for employeehours (remove) and refresh active offers /
 projects

---
 .../projects/EmployeeHoursController.php           | 14 +++++++++++---
 application/core/MY_Controller.php                 |  2 +-
 application/models/eloquent/Offer.php              |  1 +
 .../lib/dataservices/employeehoursDataService.js   |  4 ++--
 public/js/lib/modules/menuModule.js                |  2 --
 .../js/lib/modules/projects/employeehoursModule.js |  4 ++--
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/application/controllers/projects/EmployeeHoursController.php b/application/controllers/projects/EmployeeHoursController.php
index 6424515..052aac8 100644
--- a/application/controllers/projects/EmployeeHoursController.php
+++ b/application/controllers/projects/EmployeeHoursController.php
@@ -51,7 +51,7 @@ class EmployeeHoursController extends MY_Controller {
         unset( $data['id'] );
         unset( $data['hourType'] );
         unset( $data['project_id'] );
-        if( $hourType == 'OFFERS' ) $data['offer_id'] = $projectID;
+        if ( $hourType == 'OFFERS' ) $data['offer_id'] = $projectID;
 
         $data['hourdate'] = date2mysql( $data['hourdate'] );
 
@@ -85,10 +85,18 @@ class EmployeeHoursController extends MY_Controller {
         $this->json( ['employeehourID' => $employeehourID] );
     }
 
-    public function removeEmployeehour( $employeehourID )
+    public function removeEmployeehour( $employeehourID, $hourType )
     {
         //TODO:check op delete
-        Employeehour::whereId( $employeehourID )->delete();
+        if ( $hourType == 'OVERHEAD' )
+        {
+            Employeehour::whereId( $employeehourID )->delete();
+        }
+        else
+        {
+            Projecthour::whereId( $employeehourID )->delete();
+        }
+
 
         $this->json( ['result' => TRUE] );
     }
diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php
index dfb289d..5d8356f 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.03';
+        $this->version = '1.00.04';
 
         $this->load->library( 'beheer/session/RetrieveUserSession' );
 
diff --git a/application/models/eloquent/Offer.php b/application/models/eloquent/Offer.php
index f247f76..a391fe6 100644
--- a/application/models/eloquent/Offer.php
+++ b/application/models/eloquent/Offer.php
@@ -49,6 +49,7 @@ class Offer extends BaseModel {
         $offersWithoutProject = Offer::orderBy('startdate')
             ->whereNull('rejectdate')
             ->whereNull('project_id')
+            ->whereArchive('F')
             ->get();
 
         return $offersWithoutProject;
diff --git a/public/js/lib/dataservices/employeehoursDataService.js b/public/js/lib/dataservices/employeehoursDataService.js
index c805bec..d039312 100644
--- a/public/js/lib/dataservices/employeehoursDataService.js
+++ b/public/js/lib/dataservices/employeehoursDataService.js
@@ -35,8 +35,8 @@ dbo.employeehoursDataService = {
             } );
     },
 
-    removeEmployeehour: function ( employeehourID, callback ) {
-        $.getJSON( 'index.php/projects/employeeHoursController/removeEmployeehour/' + employeehourID )
+    removeEmployeehour: function ( employeehourID, hourType, callback ) {
+        $.getJSON( 'index.php/projects/employeeHoursController/removeEmployeehour/' + employeehourID + '/' + hourType )
             .done( function ( data ) {
                 callback( data );
             } )
diff --git a/public/js/lib/modules/menuModule.js b/public/js/lib/modules/menuModule.js
index dc8895f..f573075 100644
--- a/public/js/lib/modules/menuModule.js
+++ b/public/js/lib/modules/menuModule.js
@@ -48,8 +48,6 @@ $( function () {
             vm[page]( true );
 
             var func = page.toLowerCase() + 'Init';
-console.log( func );
-
 
             window.dbo[func]();
         },
diff --git a/public/js/lib/modules/projects/employeehoursModule.js b/public/js/lib/modules/projects/employeehoursModule.js
index b07e27d..9320cc6 100644
--- a/public/js/lib/modules/projects/employeehoursModule.js
+++ b/public/js/lib/modules/projects/employeehoursModule.js
@@ -9,7 +9,7 @@
 dbo.employeehoursInit = function () {
 
     if ( dbo.employeehoursModel !== undefined ) {
-        dbo.employeehoursModel.refreshEmployeehours();
+        dbo.employeehoursModel.init();
     } else {
         dbo.employeehoursModel = {
 
@@ -138,7 +138,7 @@ dbo.employeehoursInit = function () {
                     modalClass: 'modal-warning'
                 }, function ( response ) {
                     if ( response ) {
-                        dbo.employeehoursDataService.removeEmployeehour( self.id(), function ( data ) {
+                        dbo.employeehoursDataService.removeEmployeehour( self.id(), self.hourType(), function ( data ) {
                             if ( data.result ) {
                                 vm.refreshEmployeehours();
                             } else {