nicer schedule planning

This commit is contained in:
Olivier Legat 2021-12-04 18:53:39 +01:00
parent be58906a0a
commit 4465319790
3 changed files with 73 additions and 14 deletions

View file

@ -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'
),
),
),
);

View file

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

View file

@ -4,22 +4,35 @@
<style>
.grid-1week {
display: grid;
grid-template-columns: 3fr repeat(5, 1fr);
grid-auto-rows: minmax(10px, auto);
grid-template-columns: 3fr repeat(7, 1fr);
grid-auto-rows: minmax(50px, auto);
}
.grid-2week {
display: grid;
grid-template-columns: 3fr repeat(10, 1fr);
grid-auto-rows: minmax(10px, auto);
grid-template-columns: 3fr repeat(14, 1fr);
grid-auto-rows: minmax(50px, auto);
align-items: center;
}
.grid-week div {
border: 1px solid;
border-width:0 1px 1px 0;
border-style: solid;
border-color: var(--bs-cyan);
display: flex;
justify-content: center;
align-self: stretch;
align-items: center;
}
.grid-week div.Sat, .grid-week div.Sun {
//width: 0px;
}
.empty {
grid-column: auto;
grid-row: auto /span 2;
}
.week {
grid-column: auto /span 7;
grid-row: auto;
}
.name {
grid-column: auto;
grid-row: auto /span 4;
@ -40,7 +53,7 @@
.management {
background-color: {{CellType::management()->value}};
}
.absence {
.absence, .Sat, .Sun {
background-color: {{CellType::absence()->value}};
}
</style>
@ -67,18 +80,26 @@
<a class="sticky-top btn btn-primary mt-5" href="{{route('schedule.index')}}?p={{$date->addDays(-($nbweek*7))->format('d/m/Y')}}">←</a>
</div>
<div class="col-10 grid-week grid-{{$nbweek}}week">
<!--line header-->
<!--line header 1 -->
<div class="empty"></div>
@for ($i = 0; $i < ($nbweek*5); $i++)
<div class="day">{{$date->addDays($i)->format('d/m/Y')}}</div>
@for ($i = 0; $i < $nbweek; $i++)
<div class="week">
S{{$date->addDays($i*7)->weekOfYear}} - {{$date->addDays($i*7)->shortLocaleMonth}} {{$date->addDays($i*7)->format('Y')}}
</div>
@endfor
<!--line header 2 -->
@for ($i = 0; $i < ($nbweek*7); $i++)
<div class="day {{$date->addDays($i)->shortEnglishDayOfWeek}}">
{{$date->addDays($i)->shortLocaleDayOfWeek}} {{$date->addDays($i)->format('d')}}
</div>
@endfor
@foreach($users as $user)
<!-- user $j -->
<div class="name">{{$user->name}}</div>
@for ($k=0; $k < 4; $k++)
<!--line slot $k-->
@for ($i = 0; $i < ($nbweek*5); $i++)
<div class="day {{ $schedules[$user->id][$date->addDays($i)->format('d/m/Y')][$k]['type'] ?? '' }}">
@for ($i = 0; $i < ($nbweek*7); $i++)
<div class="day {{ $schedules[$user->id][$date->addDays($i)->format('d/m/Y')][$k]['type'] ?? '' }} {{$date->addDays($i)->shortEnglishDayOfWeek}}">
{{$schedules[$user->id][$date->addDays($i)->format('d/m/Y')][$k]['text'] ?? ''}}
</div>
@endfor