diff --git a/app/Http/Controllers/ScheduleController.php b/app/Http/Controllers/ScheduleController.php index dd61ad6..42e0036 100644 --- a/app/Http/Controllers/ScheduleController.php +++ b/app/Http/Controllers/ScheduleController.php @@ -2,13 +2,10 @@ namespace App\Http\Controllers; -use App\Enums\Planning\ActivityType; use App\Enums\Role; use App\Http\Requests\StoreScheduleRequest; use App\Models\Schedule; use App\Models\User; -use App\Models\WeekPlanning; -use Carbon\Carbon; use Illuminate\Http\Request; use Carbon\CarbonImmutable; @@ -23,7 +20,7 @@ class ScheduleController extends Controller public function index(Request $request) { $date = CarbonImmutable::now()->startOfWeek(); - $nbweeks = 2; + $nbweeks = config('schedules.shownWeeks'); if ($request->p) { $date = CarbonImmutable::createFromFormat('d/m/Y', $request->p)->startOfWeek(); } diff --git a/config/schedules.php b/config/schedules.php new file mode 100644 index 0000000..3930479 --- /dev/null +++ b/config/schedules.php @@ -0,0 +1,6 @@ + 2, + 'daySlots' => 8, +]; diff --git a/database/migrations/2022_03_08_101614_migrate_schedules_to_eight_slots_per_day.php b/database/migrations/2022_03_08_101614_migrate_schedules_to_eight_slots_per_day.php new file mode 100644 index 0000000..5f82835 --- /dev/null +++ b/database/migrations/2022_03_08_101614_migrate_schedules_to_eight_slots_per_day.php @@ -0,0 +1,40 @@ + 0; $i--) { + $schedules = Schedule::where('slot', $i)->get(); + + foreach ($schedules as $oneschedule) { + $newschedule = $oneschedule->replicate(); + $newschedule->slot = $i * 2; + $newschedule->save(); + $oneschedule->slot = ($i * 2) - 1; + $oneschedule->save(); + } + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + //not reversible + } +} diff --git a/resources/js/components/ScheduleComponent.vue b/resources/js/components/ScheduleComponent.vue index d8210e6..734b96a 100644 --- a/resources/js/components/ScheduleComponent.vue +++ b/resources/js/components/ScheduleComponent.vue @@ -25,11 +25,11 @@