Explorar o código

Adjust schedule table separators

Alexander Musikhin hai 4 días
pai
achega
7dd5d41a38
Modificáronse 2 ficheiros con 30 adicións e 7 borrados
  1. 23 0
      resources/sass/app.scss
  2. 7 7
      resources/views/schedule/index.blade.php

+ 23 - 0
resources/sass/app.scss

@@ -1021,6 +1021,29 @@ td p {
   white-space: nowrap;
 }
 
+.schedule-week-table {
+  thead th {
+    border-top: 1px solid #000;
+    border-bottom: 1px solid #000;
+  }
+
+  tbody td {
+    border-bottom-color: #000;
+  }
+
+  tbody tr.schedule-week-address-separator td {
+    border-bottom-width: 1px;
+  }
+
+  tbody tr.schedule-week-day-end td {
+    border-bottom-width: 2px;
+  }
+
+  tbody td.schedule-week-day-cell {
+    border-bottom: 2px solid #000;
+  }
+}
+
 // Table sortable header styles (from reports/index.blade.php)
 .sortable-header {
   cursor: pointer;

+ 7 - 7
resources/views/schedule/index.blade.php

@@ -68,7 +68,7 @@
 
         @if($activeTab === 'week')
         <div class="table-responsive js-subtable-scroll">
-        <table class="table">
+        <table class="table schedule-week-table">
             <thead>
             <tr>
                 <th class="text-center vertical">День недели</th>
@@ -95,17 +95,17 @@
             @foreach($schedules as $dow => $schs)
                 @if($schs)
                     @foreach($schs as $schedule)
-                        <tr>
+                        <tr class="{{ $loop->last ? 'schedule-week-day-end' : 'schedule-week-address-separator' }}">
                             @if($loop->first)
                                 <td rowspan="{{ count($schs) }}"
-                                    class="vertical">{{ \App\Helpers\DateHelper::getHumanDayOfWeek($dow) }}
+                                    class="vertical schedule-week-day-cell">{{ \App\Helpers\DateHelper::getHumanDayOfWeek($dow) }}
                                     @if(hasRole('admin'))
                                         <i class="bi bi-calendar-plus text-primary ms-2 createSchedule"
                                            title="Новая запись" data-schedule-date="{{ $dow }}"></i>
                                     @endif
                                 </td>
                                 <td rowspan="{{ count($schs) }}"
-                                    class="vertical">{{ \App\Helpers\DateHelper::getHumanDate($dow) }}</td>
+                                    class="vertical schedule-week-day-cell">{{ \App\Helpers\DateHelper::getHumanDate($dow) }}</td>
                             @endif
                             <td style="background: {{ $schedule->brigadier->color }}"
                                 class="align-middle code-{{ $schedule->id }}">
@@ -179,16 +179,16 @@
                         </tr>
                     @endforeach
                 @else
-                    <tr>
+                    <tr class="schedule-week-day-end">
                         <td rowspan="1"
-                            class="vertical">{{ \App\Helpers\DateHelper::getHumanDayOfWeek($dow) }}
+                            class="vertical schedule-week-day-cell">{{ \App\Helpers\DateHelper::getHumanDayOfWeek($dow) }}
                             @if(hasRole('admin'))
                                 <i class="bi bi-calendar-plus text-primary ms-2 createSchedule"
                                    title="Новая запись" data-schedule-date="{{ $dow }}"></i>
                             @endif
                         </td>
                         <td rowspan="1"
-                            class="vertical">{{ \App\Helpers\DateHelper::getHumanDate($dow) }}</td>
+                            class="vertical schedule-week-day-cell">{{ \App\Helpers\DateHelper::getHumanDate($dow) }}</td>
                     </tr>
                 @endif
             @endforeach