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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	app/Http/Controllers/User/UserSubjectsController.php
This commit is contained in:
barwie2@st.amu.edu.pl 2019-12-16 15:46:03 +01:00
commit 72fda159ce
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/User/UserSubjectsController.php
View File

@ -20,7 +20,11 @@ class UserSubjectsController extends Controller
$weekdays = ['Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota', 'Niedziela']; $weekdays = ['Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota', 'Niedziela'];
// $types = ['Lecture', 'Excercises', 'Labs', 'Other']; // $types = ['Lecture', 'Excercises', 'Labs', 'Other'];
$defaultTime = date("H:i"); $defaultTime = date("H:i");
$defaultWeekday = "Poniedziałek";//$weekdays[date('w') - 1]; if(date('w')-1 < 0 ) {
$defaultWeekday = $weekdays[6];
} else {
$defaultWeekday = "Poniedziałek";//$weekdays[date('w') - 1];
}
return view('user.user_subjects', ['subjects' => $subjects, 'weekdays' => $weekdays, 'subjects_grouped' => $subjects_grouped, 'grouped_by' => $groupBy, 'defaultTime' => $defaultTime, 'defaultWeekday' => $defaultWeekday, 'rooms' => $rooms]); return view('user.user_subjects', ['subjects' => $subjects, 'weekdays' => $weekdays, 'subjects_grouped' => $subjects_grouped, 'grouped_by' => $groupBy, 'defaultTime' => $defaultTime, 'defaultWeekday' => $defaultWeekday, 'rooms' => $rooms]);
} }