Merge branch 'feature/mission-7' into 'develop'

mission-7

See merge request !6

app/Models/Student.php

@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Http\Requests\JournalPostRequest;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -43,4 +42,19 @@ class Student extends Model
 
         return $query;
     }
+
+    public function getFullNameAttribute() : string
+    {
+        return $this->surname . " " . substr($this->name, 0, 1) . ". " . substr($this->patronymic, 0, 1);
+    }
+
+    public function getExelentMarksAttribute() : bool
+    {
+        return $this->subjects()->get(['marks.mark'])->pluck('mark')->min() == 5;
+    }
+
+    public function getGoodMarksAttribute() : bool
+    {
+        return $this->subjects()->get(['marks.mark'])->pluck('mark')->min() == 4;
+    }
 }

resources/views/journal/journal.blade.php

@@ -10,7 +10,15 @@
         <tbody>
         @foreach($students as $student)
             <tr>
-                <th scope="row">{{ $student->name }}</th>
+                <th scope="row"
+                    @if($student->exelent_marks)
+                        class="bg-success"
+                    @elseif($student->good_marks)
+                        class="bg-warning"
+                    @else
+                        class="bg-danger"
+                    @endif
+                >{{ $student->full_name }}</th>
                 @foreach ($subjects as $subject)
                     <th scope="row">
                         @if ($student->subjects()->get()->pluck('id')->contains($subject->id))
@@ -32,4 +40,24 @@
         </tr>
         </tbody>
     </table>
+    <div class="mt-5">
+        <ul class="list-group" style="width: 500px">
+            <li class="list-group-item active">Список отличников</li>
+            @foreach($students as $student)
+                @if($student->exelent_marks)
+                    <li>{{ $student->full_name }}</li>
+                @endif
+            @endforeach
+        </ul>
+    </div>
+    <div class="mt-5 mb-5" style="width: 500px">
+        <ul class="list-group">
+            <li class="list-group-item active">Список хорошистов</li>
+            @foreach($students as $student)
+                @if($student->good_marks)
+                    <li>{{ $student->full_name }}</li>
+                @endif
+            @endforeach
+        </ul>
+    </div>
 @endsection

resources/views/students/show.blade.php

@@ -4,7 +4,7 @@
     @foreach($students as $student)
         <div class="card">
             <div class="card-body">
-                <h5 class="card-title">{{ $student->name }} {{ $student->surname }}  {{ $student->patronymic }}</h5>
+                <h5 class="card-title">{{ $student->full_name }}</h5>
                 <p class="card-text">Группа:{{ $student->group->name }}</p>
                 <a class="card-link" href="{{ route('students.edit_form', $student->id) }}">Edit</a>
                 <a class="card-link" href={{ route('students.profile', $student->id) }}>Profile</a>