Skip to content
Snippets Groups Projects
Commit 6fe2ff95 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms Committed by David Siegfried
Browse files

regard deputies and fix warnings, fixes #4601

Closes #4601

Merge request studip/studip!3413
parent c1441397
No related branches found
No related tags found
No related merge requests found
...@@ -72,10 +72,16 @@ class Settings_NotificationController extends Settings_SettingsController ...@@ -72,10 +72,16 @@ class Settings_NotificationController extends Settings_SettingsController
$groups = []; $groups = [];
$my_sem = []; $my_sem = [];
foreach ($seminars as $seminar) { foreach ($seminars as $seminar) {
$su = CourseMember::findOneBySQL( $su = CourseMember::find([$seminar->id, User::findCurrent()->id]);
'seminar_id = :course_id AND user_id = :user_id',
['course_id' => $seminar->id, 'user_id' => $GLOBALS['user']->id] if (!$su && Config::get()->DEPUTIES_ENABLE) {
); $su = Deputy::find([$seminar->id, User::findCurrent()->id]);
}
if (!$su) {
continue;
}
$my_sem[$seminar['Seminar_id']] = [ $my_sem[$seminar['Seminar_id']] = [
'obj_type' => "sem", 'obj_type' => "sem",
'sem_nr' => $seminar->veranstaltungsnummer, 'sem_nr' => $seminar->veranstaltungsnummer,
...@@ -84,7 +90,7 @@ class Settings_NotificationController extends Settings_SettingsController ...@@ -84,7 +90,7 @@ class Settings_NotificationController extends Settings_SettingsController
'gruppe' => $su->gruppe, 'gruppe' => $su->gruppe,
'sem_status' => $seminar->status, 'sem_status' => $seminar->status,
'sem_number' => Semester::getIndexById($seminar->start_semester->id), 'sem_number' => Semester::getIndexById($seminar->start_semester->id),
'sem_number_end' => Semester::getIndexById($seminar->end_semester->id ?? '') 'sem_number_end' => Semester::getIndexById($seminar->end_semester->id ?? '') ?: '-1',
]; ];
if ($group_field) { if ($group_field) {
fill_groups($groups, Semester::getIndexById($seminar->start_semester->id), [ fill_groups($groups, Semester::getIndexById($seminar->start_semester->id), [
......
...@@ -141,19 +141,12 @@ function correct_group_sem_number(&$groups, &$my_obj): bool ...@@ -141,19 +141,12 @@ function correct_group_sem_number(&$groups, &$my_obj): bool
{ {
if (is_array($groups) && is_array($my_obj)) { if (is_array($groups) && is_array($my_obj)) {
$sem_data = Semester::findAllVisible(); $sem_data = Semester::findAllVisible();
//end($sem_data);
//$max_sem = key($sem_data);
foreach ($sem_data as $sem_key => $one_sem){ foreach ($sem_data as $sem_key => $one_sem){
$current_sem = $sem_key; $current_sem = $sem_key;
if (!$one_sem['past']) { if (!$one_sem['past']) {
break; break;
} }
} }
if (isset($sem_data[$current_sem + 1])){
$max_sem = $current_sem + 1;
} else {
$max_sem = $current_sem;
}
foreach ($my_obj as $seminar_id => $values){ foreach ($my_obj as $seminar_id => $values){
if ($values['obj_type'] == 'sem' && $values['sem_number'] != $values['sem_number_end']){ if ($values['obj_type'] == 'sem' && $values['sem_number'] != $values['sem_number_end']){
if ($values['sem_number_end'] == -1 && $values['sem_number'] < $current_sem) { if ($values['sem_number_end'] == -1 && $values['sem_number'] < $current_sem) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment