fix for employeehours (remove) and refresh active offers / projects

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] );
     }

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' );
 

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;

public/js/lib/dataservices/employeehoursDataService.js

@@ -35,8 +35,8 @@ dbo.employeehoursDataService = {
             } );
     },
 
-    removeEmployeehour: function ( employeehourID, callback ) {
+    removeEmployeehour: function ( employeehourID, hourType, callback ) {
-        $.getJSON( 'index.php/projects/employeeHoursController/removeEmployeehour/' + employeehourID )
+        $.getJSON( 'index.php/projects/employeeHoursController/removeEmployeehour/' + employeehourID + '/' + hourType )
             .done( function ( data ) {
                 callback( data );
             } )

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]();
         },

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 {