Handle user soft delete on planning

This commit is contained in:
Vincent BRIDIER 2022-08-22 15:38:36 +02:00
parent 8d8b44fe13
commit e167425f01
No known key found for this signature in database
GPG key ID: 8571BFA20420D512

View file

@ -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;