|
|
@@ -89,7 +89,7 @@
|
|
|
<th>Кол-во позиций</th>
|
|
|
<th>Бригадир</th>
|
|
|
@if(hasRole('admin'))
|
|
|
- <th>Транспорт</th>
|
|
|
+ <th>Статус площадки/рекламации</th>
|
|
|
<th>Комментарий</th>
|
|
|
@endif
|
|
|
<th>Примечание</th>
|
|
|
@@ -151,7 +151,7 @@
|
|
|
class="align-middle">{{ $schedule->brigadier->name }}</td>
|
|
|
@if(hasRole('admin'))
|
|
|
<td style="background: {{ $schedule->brigadier->color }}"
|
|
|
- class="align-middle transport-{{ $schedule->id }}">{{ $schedule->transport }}</td>
|
|
|
+ class="align-middle">{{ $scheduleStatusMap[$schedule->id] ?? '-' }}</td>
|
|
|
<td style="background: {{ $schedule->brigadier->color }}"
|
|
|
class="align-middle admin-comment-{{ $schedule->id }}">{{ $schedule->admin_comment }}</td>
|
|
|
@endif
|
|
|
@@ -343,7 +343,6 @@
|
|
|
@include('partials.textarea', ['name' => 'mafs', 'title' => 'МАФы', 'required' => true])
|
|
|
@include('partials.input', ['name' => 'mafs_count', 'title' => 'Кол-во МАФ', 'type' => 'number', 'required' => true])
|
|
|
@include('partials.select', ['name' => 'brigadier_id', 'title' => 'Бригадир', 'options' => $brigadiers, 'required' => true, 'first_empty' => true])
|
|
|
- @include('partials.input', ['name' => 'transport', 'title' => 'Транспорт'])
|
|
|
@include('partials.textarea', ['name' => 'admin_comment', 'title' => 'Комментарий'])
|
|
|
@include('partials.textarea', ['name' => 'comment', 'title' => 'Примечание'])
|
|
|
<div class="text-center">
|
|
|
@@ -378,7 +377,6 @@
|
|
|
let scheduleBrigadier = $(this).attr('data-schedule-brigadier');
|
|
|
let scheduleAddress = $(this).attr('data-schedule-address');
|
|
|
let scheduleComment = $('.comment-' + scheduleId).text();
|
|
|
- let scheduleTransport = $('.transport-' + scheduleId).text();
|
|
|
let scheduleAdminComment = $('.admin-comment-' + scheduleId).text();
|
|
|
let scheduleMafs = $('.mafs-' + scheduleId).text();
|
|
|
let scheduleObjectType = $('.object-type-' + scheduleId).text();
|
|
|
@@ -393,7 +391,6 @@
|
|
|
$('form#scheduleEditForm select[name=area_id]').val(scheduleArea);
|
|
|
$('form#scheduleEditForm select[name=brigadier_id]').val(scheduleBrigadier);
|
|
|
$('form#scheduleEditForm textarea[name=comment]').text(scheduleComment);
|
|
|
- $('form#scheduleEditForm input[name=transport]').val(scheduleTransport);
|
|
|
$('form#scheduleEditForm textarea[name=admin_comment]').text(scheduleAdminComment);
|
|
|
$('form#scheduleEditForm textarea[name=mafs]').text(scheduleMafs);
|
|
|
$('form#scheduleEditForm input[name=mafs_count]').val(scheduleMafsCount);
|
|
|
@@ -421,7 +418,6 @@
|
|
|
$('form#scheduleEditForm select[name=area_id]').val('');
|
|
|
$('form#scheduleEditForm select[name=brigadier_id]').val('');
|
|
|
$('form#scheduleEditForm textarea[name=comment]').text('');
|
|
|
- $('form#scheduleEditForm input[name=transport]').val('');
|
|
|
$('form#scheduleEditForm textarea[name=admin_comment]').text('');
|
|
|
$('form#scheduleEditForm textarea[name=mafs]').text('');
|
|
|
$('form#scheduleEditForm input[name=mafs_count]').val('');
|