From 0c29866387c62ac530e88605de4d1f585b3802b2 Mon Sep 17 00:00:00 2001
From: s416422 <joapal@st.amu.edu.pl>
Date: Mon, 9 Dec 2019 12:54:57 +0100
Subject: [PATCH] favicon added, room name display fixed

---
 .../Controllers/User/UserClassesController.php    |   2 +-
 public/img/favicon.png                            | Bin 0 -> 968 bytes
 resources/views/map/seat_map.blade.php            |   4 +++-
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 public/img/favicon.png

diff --git a/app/Http/Controllers/User/UserClassesController.php b/app/Http/Controllers/User/UserClassesController.php
index 4e1448a..2cd9cb2 100644
--- a/app/Http/Controllers/User/UserClassesController.php
+++ b/app/Http/Controllers/User/UserClassesController.php
@@ -82,7 +82,7 @@ class UserClassesController extends Controller
         $subject = Subject::find($classes->subject_id);
         $room_arrangement = Room::find($subject->room_id)->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]);
     }
diff --git a/public/img/favicon.png b/public/img/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad7fbcaab01d2bc84d2584e0bdf902fb591eaa37
GIT binary patch
literal 968
zcmV;(12_DMP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000AzNkl<ZSV!%b
ze@v8h9LHbJ^8m-$rAMdy5{^0i(KMi?1uok}%W_jkxgj=Sp<4|wM7NrPW&Rlb(5dSO
zb2gb-&V*LE{-IfHt+vG0GL%B+X@J~$3SOkg-Enu%)1I#Z8<}@!?EHt%zt8i0KCjRF
z`+h#p^O0byoLBfvjV8+#5~L7?(7++7YW>N^<~k{_@W(C4@{TCf{dWmfeND<OI%Sv8
zqSE<j0u9L_<rTGR_oVxOijD(}D{xl|OiqYp-kgb~CK-rPBzj$b+RokNLf1gVevSwr
z(Gth{5-STIO~4<}=)U455YR}T9EW*gEWg=qvgc4I?HAl(gM<w*-D>3B+6P6!`lH>n
zw7MAdtHXt|XPKy6ozCn`6I<W6(b9T7EQqiGj0Txc-pLZh%eVi|^?tudE=w@MsNnIb
z1cMriBC)e7llc#uDcy9IE{8WHL|6bND^e&gN@vZMb~-M)nPiHgs>I5o+y{s^$OKi5
zF1wdkcAuyJMu4V$Is9~{pV!~BjSaw&U0JyL{jA&BA-X)cV>TI6jePWlo%5XoEO^As
zvri^cR&$n)O9NDwS}9nZ$Wv>77GAkigjB#7FY|4~JPtHo=FpdR@*hi}Zo>>=wx+M0
zBKPwADb&0;Z5ZI`1s2|@%w*NZwvfjV5+E(fASB&Zf05?zdnsR?M(K)F3SK^qvv=^e
z0QtEI)K$-*_|-Gmx;_6-fwW`;O?z|L_JNJ&ANr_#KAqy_DHN<bjkE9e0IQZJQC*tB
zvhrW(`}3Az|0_Z&aGz1(M8jP6f7;FA;|_-8ee1(Z9B;WM@-ACAh1!><QC54)r296{
zA~n%K;fA)cG2yX2*<88iWBr@wFvQ7x{Psgw%&{E&tcRYfKJhjzdECO0uN-&>Ro1SY
z%C3e#`257xu>sH%u34E%+2(fP`Xoyn8(+v^e$FIfVr4peJlt>x$eMXSe!t4GW~Ufd
zS{Q#CA&)?B!8AeP=<aOXo&XiwJ4ObP42mobziPTFZch-eZ)8G-k{~PqJ;|KuCiZTc
ziEmKlKw}Tzob1En9Vw)P=mROz2pd38tQ)JU*vb=g&8R9|c6u4`1c^5&;@WdnzvBAq
z&aNK~7!knG!$Y6rwB&d(ighJ)nD0)xgb5>wy8?)$K&X4i0mc=Oa*JB+(OODJ8&WK(
q_k1}WS<jV<Xf3H?DOH1FJ^ve;w4XuM%aQ8<0000<MNUMnLSTZ=SK)O4

literal 0
HcmV?d00001

diff --git a/resources/views/map/seat_map.blade.php b/resources/views/map/seat_map.blade.php
index f5b4b86..2ea4ace 100644
--- a/resources/views/map/seat_map.blade.php
+++ b/resources/views/map/seat_map.blade.php
@@ -13,7 +13,9 @@
     <div class="seat-chart-wrapper">
         <div id="seat-map">
             <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>
     <br/>