Merge pull request #32 from eporsche/working_hours_bugfix

small bugfix for working hour calc

Author: eporsche

app/Actions/RemoveTimeTracking.php

@@ -13,7 +13,7 @@ public function remove(User $user, Location $location, int $removeTimeTrackingFo
     {
         tap($location->timeTrackings()->whereKey($timeTrackingId)->first(), function ($timeTracking) use ($user, $location) {
 
-            Gate::forUser($user)->authorize('removeAbsence', [
+            Gate::forUser($user)->authorize('removeTimeTracking', [
                 TimeTracking::class,
                 $timeTracking,
                 $location

app/Traits/HasEvaluation.php

@@ -3,16 +3,20 @@
 namespace App\Traits;
 
 use App\Models\TargetHour;
+use App\Models\TimeTracking;
+use Brick\Math\BigDecimal;
 
 trait HasEvaluation
 {
     public function workingHoursForDate($date)
     {
         $working_hours = $this->timeTrackings()
             ->whereDate('starts_at',$date)
-            ->first();
+            ->get();
 
-        return optional($working_hours)->balance;
+        return $working_hours->reduce(function (BigDecimal $total, TimeTracking $timeTracking) {
+            return $total->plus($timeTracking->balance);
+        }, BigDecimal::zero());
     }
 
     public function absentHoursForDate($date)

resources/views/time_trackings/time-tracking-manager.blade.php

@@ -146,6 +146,7 @@
         :hours="$hours"
         :minutes="$minutes"
         :user="$this->user"
+        :managingTimeTrackingForId="$managingTimeTrackingForId"
         :employeeSimpleSelectOptions="$employeeSimpleSelectOptions"
         :pauseTimeForm="$pauseTimeForm"
         :timeTrackingIdBeingUpdated="$timeTrackingIdBeingUpdated"

tests/Feature/AbsenceTest.php

@@ -10,6 +10,7 @@
 use App\Models\AbsenceType;
 use App\Contracts\AddsAbsences;
 use App\Contracts\ApprovesAbsence;
+use Illuminate\Support\Facades\Bus;
 use App\Contracts\AddsVacationEntitlements;
 use App\Http\Livewire\Absence\AbsenceManager;
 
@@ -268,6 +269,8 @@ public function test_can_approve_two_week_vacation()
             'status' => 'pending'
         ]);
 
+        Bus::fake();
+
         $action = app(ApprovesAbsence::class);
 
         $action->approve(