|
@@ -10,11 +10,11 @@
|
|
|
<ul class="nav nav-tabs justify-content-end">
|
|
<ul class="nav nav-tabs justify-content-end">
|
|
|
<li class="nav-item">
|
|
<li class="nav-item">
|
|
|
<a class="nav-link @if($activeTab === 'week') active @endif"
|
|
<a class="nav-link @if($activeTab === 'week') active @endif"
|
|
|
- href="{{ route('schedule.index', ['week' => $weekNumber, 'tab' => 'week']) }}">Неделя</a>
|
|
|
|
|
|
|
+ href="{{ route('schedule.index', ['week' => $weekNumber, 'tab' => 'week', 'year' => $scheduleYear]) }}">Неделя</a>
|
|
|
</li>
|
|
</li>
|
|
|
<li class="nav-item">
|
|
<li class="nav-item">
|
|
|
<a class="nav-link @if($activeTab === 'month') active @endif"
|
|
<a class="nav-link @if($activeTab === 'month') active @endif"
|
|
|
- href="{{ route('schedule.index', ['month' => str_pad((string)$monthNumber, 2, '0', STR_PAD_LEFT), 'tab' => 'month']) }}">Месяц</a>
|
|
|
|
|
|
|
+ href="{{ route('schedule.index', ['month' => $monthValue, 'tab' => 'month', 'year' => $scheduleYear]) }}">Месяц</a>
|
|
|
</li>
|
|
</li>
|
|
|
</ul>
|
|
</ul>
|
|
|
</div>
|
|
</div>
|
|
@@ -26,7 +26,7 @@
|
|
|
<div class="d-flex flex-row justify-content-end">
|
|
<div class="d-flex flex-row justify-content-end">
|
|
|
<div class="p-2">
|
|
<div class="p-2">
|
|
|
<button @disabled($weekNumber == 1) class="btn btn-sm btn-primary"
|
|
<button @disabled($weekNumber == 1) class="btn btn-sm btn-primary"
|
|
|
- onclick="document.location = '{{ route('schedule.index', ['week' => $weekNumber - 1, 'tab' => 'week']) }}'">
|
|
|
|
|
|
|
+ onclick="document.location = '{{ route('schedule.index', ['week' => $weekNumber - 1, 'tab' => 'week', 'year' => $scheduleYear]) }}'">
|
|
|
<i class="bi bi-arrow-left"></i>
|
|
<i class="bi bi-arrow-left"></i>
|
|
|
</button>
|
|
</button>
|
|
|
</div>
|
|
</div>
|
|
@@ -34,15 +34,15 @@
|
|
|
<div class="p-2">
|
|
<div class="p-2">
|
|
|
<input type="number" value="{{ $weekNumber }}"
|
|
<input type="number" value="{{ $weekNumber }}"
|
|
|
class="form-control form-control-sm week-number-input" name="weekNumber"
|
|
class="form-control form-control-sm week-number-input" name="weekNumber"
|
|
|
- onchange="document.location = '{{ route('schedule.index') }}?tab=week&week='+this.value"
|
|
|
|
|
|
|
+ onchange="document.location = '{{ route('schedule.index') }}?tab=week&year={{ $scheduleYear }}&week='+this.value"
|
|
|
min="1" max="53" title="№ недели">
|
|
min="1" max="53" title="№ недели">
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<div class="p-2">
|
|
<div class="p-2">
|
|
|
- <input type="date" min="{{ year() . '-01-01' }}" max="{{ year() . '-12-31' }}"
|
|
|
|
|
|
|
+ <input type="date" min="2000-01-01" max="2100-12-31"
|
|
|
class="form-control form-control-sm" value="{{ $weekDates['mon'] }}"
|
|
class="form-control form-control-sm" value="{{ $weekDates['mon'] }}"
|
|
|
title="начало недели" name="monday" id="fromDate"
|
|
title="начало недели" name="monday" id="fromDate"
|
|
|
- onchange="document.location = '{{ route('schedule.index') }}?tab=week&week=' + getWeekNumber(this.value)">
|
|
|
|
|
|
|
+ onchange="document.location = '{{ route('schedule.index') }}?tab=week&year=' + this.value.substring(0,4) + '&week=' + getWeekNumber(this.value)">
|
|
|
</div>
|
|
</div>
|
|
|
<div class="p-2 d-none d-md-block">
|
|
<div class="p-2 d-none d-md-block">
|
|
|
<input type="date" disabled name="sunday"
|
|
<input type="date" disabled name="sunday"
|
|
@@ -52,7 +52,7 @@
|
|
|
|
|
|
|
|
<div class="p-2">
|
|
<div class="p-2">
|
|
|
<button @disabled($weekNumber > 52) class="btn btn-sm btn-primary"
|
|
<button @disabled($weekNumber > 52) class="btn btn-sm btn-primary"
|
|
|
- onclick="document.location = '{{ route('schedule.index', ['week' => $weekNumber + 1, 'tab' => 'week']) }}'">
|
|
|
|
|
|
|
+ onclick="document.location = '{{ route('schedule.index', ['week' => $weekNumber + 1, 'tab' => 'week', 'year' => $scheduleYear]) }}'">
|
|
|
<i class="bi bi-arrow-right"></i>
|
|
<i class="bi bi-arrow-right"></i>
|
|
|
</button>
|
|
</button>
|
|
|
</div>
|
|
</div>
|
|
@@ -63,6 +63,7 @@
|
|
|
<input type="hidden" name="start_date" value="{{ $weekDates['mon'] }}">
|
|
<input type="hidden" name="start_date" value="{{ $weekDates['mon'] }}">
|
|
|
<input type="hidden" name="end_date" value="{{ $weekDates['sun'] }}">
|
|
<input type="hidden" name="end_date" value="{{ $weekDates['sun'] }}">
|
|
|
<input type="hidden" name="week" value="{{ $weekNumber }}">
|
|
<input type="hidden" name="week" value="{{ $weekNumber }}">
|
|
|
|
|
+ <input type="hidden" name="year" value="{{ $scheduleYear }}">
|
|
|
<button type="submit" class="btn btn-sm btn-primary" id="exportScheduleButton">Экспорт</button>
|
|
<button type="submit" class="btn btn-sm btn-primary" id="exportScheduleButton">Экспорт</button>
|
|
|
</form>
|
|
</form>
|
|
|
</div>
|
|
</div>
|
|
@@ -120,7 +121,7 @@
|
|
|
class="align-middle">{{ $schedule?->area?->name }}</td>
|
|
class="align-middle">{{ $schedule?->area?->name }}</td>
|
|
|
<td style="background: {{ $schedule->brigadier->color }}" class="align-middle">
|
|
<td style="background: {{ $schedule->brigadier->color }}" class="align-middle">
|
|
|
@if($schedule->order_id)
|
|
@if($schedule->order_id)
|
|
|
- <a href="{{ route('order.show', $schedule->order_id) }}">{{ $schedule->object_address }}</a>
|
|
|
|
|
|
|
+ <a href="{{ route('order.show', ['order' => $schedule->order_id, 'sync_year' => 1]) }}">{{ $schedule->object_address }}</a>
|
|
|
@else
|
|
@else
|
|
|
{{ $schedule->object_address }}
|
|
{{ $schedule->object_address }}
|
|
|
@endif
|
|
@endif
|
|
@@ -177,21 +178,21 @@
|
|
|
<div class="d-flex justify-content-between align-items-center mb-3">
|
|
<div class="d-flex justify-content-between align-items-center mb-3">
|
|
|
<div class="d-flex align-items-center">
|
|
<div class="d-flex align-items-center">
|
|
|
<button class="btn btn-sm btn-primary me-2" @disabled(!$monthPrev)
|
|
<button class="btn btn-sm btn-primary me-2" @disabled(!$monthPrev)
|
|
|
- onclick="document.location = '{{ route('schedule.index', ['tab' => 'month', 'month' => $monthPrev ?? str_pad((string)$monthNumber, 2, '0', STR_PAD_LEFT)]) }}'">
|
|
|
|
|
|
|
+ onclick="document.location = '{{ route('schedule.index', ['tab' => 'month', 'month' => $monthPrev]) }}'">
|
|
|
<i class="bi bi-arrow-left"></i>
|
|
<i class="bi bi-arrow-left"></i>
|
|
|
</button>
|
|
</button>
|
|
|
<div class="h5 mb-0 text-capitalize">{{ $monthLabel }}</div>
|
|
<div class="h5 mb-0 text-capitalize">{{ $monthLabel }}</div>
|
|
|
<button class="btn btn-sm btn-primary ms-2" @disabled(!$monthNext)
|
|
<button class="btn btn-sm btn-primary ms-2" @disabled(!$monthNext)
|
|
|
- onclick="document.location = '{{ route('schedule.index', ['tab' => 'month', 'month' => $monthNext ?? str_pad((string)$monthNumber, 2, '0', STR_PAD_LEFT)]) }}'">
|
|
|
|
|
|
|
+ onclick="document.location = '{{ route('schedule.index', ['tab' => 'month', 'month' => $monthNext]) }}'">
|
|
|
<i class="bi bi-arrow-right"></i>
|
|
<i class="bi bi-arrow-right"></i>
|
|
|
</button>
|
|
</button>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="d-flex align-items-center">
|
|
<div class="d-flex align-items-center">
|
|
|
<label for="monthSelect" class="me-2 small">Месяц</label>
|
|
<label for="monthSelect" class="me-2 small">Месяц</label>
|
|
|
<input id="monthSelect" type="month" class="form-control form-control-sm"
|
|
<input id="monthSelect" type="month" class="form-control form-control-sm"
|
|
|
- min="{{ year() . '-01' }}" max="{{ year() . '-12' }}"
|
|
|
|
|
- value="{{ year() . '-' . str_pad((string)$monthNumber, 2, '0', STR_PAD_LEFT) }}"
|
|
|
|
|
- onchange="document.location='{{ route('schedule.index') }}?tab=month&month=' + this.value.substring(5,7)">
|
|
|
|
|
|
|
+ min="2000-01" max="2100-12"
|
|
|
|
|
+ value="{{ $monthValue }}"
|
|
|
|
|
+ onchange="document.location='{{ route('schedule.index') }}?tab=month&month=' + this.value">
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
@@ -213,9 +214,10 @@
|
|
|
<tr>
|
|
<tr>
|
|
|
@foreach($week as $day)
|
|
@foreach($week as $day)
|
|
|
<td class="schedule-day @if(!$day['inMonth']) schedule-outside @endif @if($day['isToday']) schedule-today @endif"
|
|
<td class="schedule-day @if(!$day['inMonth']) schedule-outside @endif @if($day['isToday']) schedule-today @endif"
|
|
|
- data-week="{{ $day['week'] }}">
|
|
|
|
|
|
|
+ data-week="{{ $day['week'] }}"
|
|
|
|
|
+ data-week-year="{{ $day['weekYear'] }}">
|
|
|
<a class="schedule-day-link"
|
|
<a class="schedule-day-link"
|
|
|
- href="{{ route('schedule.index', ['week' => $day['week'], 'tab' => 'week']) }}"
|
|
|
|
|
|
|
+ href="{{ route('schedule.index', ['week' => $day['week'], 'tab' => 'week', 'year' => $day['weekYear']]) }}"
|
|
|
title="Открыть неделю №{{ $day['week'] }}">
|
|
title="Открыть неделю №{{ $day['week'] }}">
|
|
|
{{ $day['day'] }}
|
|
{{ $day['day'] }}
|
|
|
</a>
|
|
</a>
|
|
@@ -350,8 +352,10 @@
|
|
|
<script type="module">
|
|
<script type="module">
|
|
|
$('.schedule-day').on('dblclick', function () {
|
|
$('.schedule-day').on('dblclick', function () {
|
|
|
let week = $(this).attr('data-week');
|
|
let week = $(this).attr('data-week');
|
|
|
|
|
+ let year = $(this).attr('data-week-year');
|
|
|
if (!week) return;
|
|
if (!week) return;
|
|
|
- document.location = '{{ route('schedule.index') }}?tab=week&week=' + week;
|
|
|
|
|
|
|
+ if (!year) year = '{{ $scheduleYear }}';
|
|
|
|
|
+ document.location = '{{ route('schedule.index') }}?tab=week&year=' + year + '&week=' + week;
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
@if(hasRole('admin'))
|
|
@if(hasRole('admin'))
|