diff --git a/app/Http/Controllers/ScheduleController.php b/app/Http/Controllers/ScheduleController.php index 525e4c9..8802cb9 100644 --- a/app/Http/Controllers/ScheduleController.php +++ b/app/Http/Controllers/ScheduleController.php @@ -8,6 +8,7 @@ use App\Models\Schedule; use App\Models\User; use Illuminate\Http\Request; use Carbon\CarbonImmutable; +use Illuminate\Database\Eloquent\Builder; /** * Alternate planner for Dev Team @@ -41,13 +42,16 @@ class ScheduleController extends Controller $users[$user->id] = ['name' => $user->name]; } - $schedules = Schedule::whereDate('date', '>=', $date) + $schedules = Schedule::whereHas('user', function(Builder $query) { + $query->where('deleted_at', NULL); + }) + ->whereDate('date', '>=', $date) ->whereDate('date', '<=', $date->addDays($nbweeks * 7 - 1)) ->orderBy('user_id') ->orderBy('slot') ->orderBy('date') ->get(); - + $arSchedules = array(); $prevUserId = null; $prevDate = null;