diff --git a/app/Http/Controllers/ScheduleController.php b/app/Http/Controllers/ScheduleController.php index 0b48ece..a686e4d 100644 --- a/app/Http/Controllers/ScheduleController.php +++ b/app/Http/Controllers/ScheduleController.php @@ -45,13 +45,47 @@ class ScheduleController extends Controller '01/12/2021' => array( 1 => array( - 'text'=>'item2' + 'text'=>'item2', + 'type'=>'rnd' ), 2 => array( - 'text'=>'item3' + 'text'=>'item3', + 'type'=>'support' ), ), - ) + ), + 7 => + array( + //day + '03/12/2021'=> + array( + //slot + 0 => array( + //elements + 'text'=>'item1', + 'type'=>'projects' + ), + 1 => array( + 'text'=>'item2', + 'type'=>'projects' + ), + 3 => array( + 'text'=>'item3', + 'type'=>'dev' + ), + ), + '06/12/2021' => + array( + 1 => array( + 'text'=>'item2', + 'type'=>'support' + ), + 2 => array( + 'text'=>'item3', + 'type'=>'projects' + ), + ), + ), ); diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index e795128..b5be80f 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -34,6 +34,10 @@ class AppServiceProvider extends ServiceProvider URL::forceScheme('https'); } + if (config('app.env') === 'local') { + setlocale(LC_TIME, strtoupper(config('app.locale')) . "_" . config('app.locale') . '.utf8'); + } + $appInfos = json_decode(File::get(\app_path('../composer.json'))); View::share('name', $appInfos->name); diff --git a/resources/views/schedule/index.blade.php b/resources/views/schedule/index.blade.php index c386ace..b2d48a8 100644 --- a/resources/views/schedule/index.blade.php +++ b/resources/views/schedule/index.blade.php @@ -4,22 +4,35 @@ @@ -67,18 +80,26 @@ ←
- +
- @for ($i = 0; $i < ($nbweek*5); $i++) -
{{$date->addDays($i)->format('d/m/Y')}}
+ @for ($i = 0; $i < $nbweek; $i++) +
+ S{{$date->addDays($i*7)->weekOfYear}} - {{$date->addDays($i*7)->shortLocaleMonth}} {{$date->addDays($i*7)->format('Y')}} +
+ @endfor + + @for ($i = 0; $i < ($nbweek*7); $i++) +
+ {{$date->addDays($i)->shortLocaleDayOfWeek}} {{$date->addDays($i)->format('d')}} +
@endfor @foreach($users as $user)
{{$user->name}}
@for ($k=0; $k < 4; $k++) - @for ($i = 0; $i < ($nbweek*5); $i++) -
+ @for ($i = 0; $i < ($nbweek*7); $i++) +
{{$schedules[$user->id][$date->addDays($i)->format('d/m/Y')][$k]['text'] ?? ''}}
@endfor