s452108/atcheck
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

favicon added, room name display fixed

Browse Source
This commit is contained in:
s416422 2019-12-09 12:54:57 +01:00
parent d15054c069
commit 0c29866387
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/User/UserClassesController.php
View File

@ -82,7 +82,7 @@ class UserClassesController extends Controller
$subject = Subject::find($classes->subject_id); $subject = Subject::find($classes->subject_id);
$room_arrangement = Room::find($subject->room_id)->arrangement; $room_arrangement = Room::find($subject->room_id)->arrangement;
if(!$room_arrangement) { if(!$room_arrangement) {
$room_arrangement = Room::where('name', 'Inna sala')->get()->arrangement; $room_arrangement = Room::where('name', 'Inna sala')->first()->arrangement;
} }
return view('map.seat_map', ['student_name' => $student_name, 'student_surname' => $student_surname, 'student_id_number' => $student_id_number, 'classes_id' => $classes->id, 'seat_numbers' => $seat_numbers, 'room_arrangement' => $room_arrangement]); return view('map.seat_map', ['student_name' => $student_name, 'student_surname' => $student_surname, 'student_id_number' => $student_id_number, 'classes_id' => $classes->id, 'seat_numbers' => $seat_numbers, 'room_arrangement' => $room_arrangement]);
} }

BIN
public/img/favicon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 968 B

4
resources/views/map/seat_map.blade.php
View File

@ -13,7 +13,9 @@
<div class="seat-chart-wrapper"> <div class="seat-chart-wrapper">
<div id="seat-map"> <div id="seat-map">
<div class="front-indicator">{{ App\Subject::find(App\Classes::find($classes_id)->subject_id)->name }}, <div class="front-indicator">{{ App\Subject::find(App\Classes::find($classes_id)->subject_id)->name }},
{{ App\Subject::find(App\Classes::find($classes_id)->subject_id)->weekday }} {{ App\Classes::find($classes_id)->date }} {{ App\Subject::find(App\Classes::find($classes_id)->subject_id)->time }}</div> {{ App\Subject::find(App\Classes::find($classes_id)->subject_id)->weekday }}
{{ App\Classes::find($classes_id)->date }} {{ App\Subject::find(App\Classes::find($classes_id)->subject_id)->time }},
<b>sala {{ App\Room::find(App\Subject::find(App\Classes::find($classes_id)->subject_id)->room_id)->name }}</b></div>
</div> </div>
</div> </div>
<br/> <br/>