Course: remove notifications

pull/3984/head
Julio 4 years ago
parent b67b583d1f
commit bb64d4d3f4
  1. 21
      public/main/inc/ajax/course_home.ajax.php
  2. 36
      public/main/inc/lib/course.lib.php

@ -708,27 +708,6 @@ switch ($action) {
$response->records = $count; $response->records = $count;
echo json_encode($response); echo json_encode($response);
break;
case 'get_notification':
$courseId = isset($_REQUEST['course_id']) ? (int) $_REQUEST['course_id'] : 0;
$sessionId = isset($_REQUEST['session_id']) ? (int) $_REQUEST['session_id'] : 0;
$status = isset($_REQUEST['status']) ? (int) $_REQUEST['status'] : 0;
if (empty($courseId)) {
break;
}
require_once __DIR__.'/../global.inc.php';
$courseInfo = api_get_course_info_by_id($courseId);
$courseInfo['id_session'] = $sessionId;
$courseInfo['status'] = $status;
$id = 'notification_'.$courseId.'_'.$sessionId.'_'.$status;
$notificationId = Session::read($id);
if ($notificationId) {
echo Display::show_notification($courseInfo, false);
Session::erase($notificationId);
}
break; break;
default: default:
echo ''; echo '';

@ -3524,9 +3524,7 @@ class CourseManager
} else { } else {
$course_info['status'] = $courseUserInfo['status']; $course_info['status'] = $courseUserInfo['status'];
} }
$show_notification = !api_get_configuration_value('hide_course_notification')
? Display::show_notification($course_info)
: '';
$params['edit_actions'] = ''; $params['edit_actions'] = '';
$params['document'] = ''; $params['document'] = '';
if (api_is_platform_admin()) { if (api_is_platform_admin()) {
@ -3577,10 +3575,6 @@ class CourseManager
$params['image'] = $course_info['course_image_large']; $params['image'] = $course_info['course_image_large'];
} }
if (Course::CLOSED != $course_info['visibility']) {
$params['notifications'] = $show_notification;
}
$params['is_special_course'] = true; $params['is_special_course'] = true;
$courseList[] = $params; $courseList[] = $params;
} }
@ -3685,11 +3679,6 @@ class CourseManager
} }
$course_info['id_session'] = null; $course_info['id_session'] = null;
$course_info['status'] = $row['status']; $course_info['status'] = $row['status'];
// For each course, get if there is any notification icon to show
// (something that would have changed since the user's last visit).
$showNotification = !api_get_configuration_value('hide_course_notification')
? Display::show_notification($course_info)
: '';
$iconName = basename($course_info['course_image']); $iconName = basename($course_info['course_image']);
$params = []; $params = [];
@ -3793,9 +3782,6 @@ class CourseManager
); );
} }
if (Course::CLOSED != $course_info['visibility']) {
$params['notifications'] = $showNotification;
}
$courseAdded[] = $course_info['real_id']; $courseAdded[] = $course_info['real_id'];
$courseList[] = $params; $courseList[] = $params;
} }
@ -3897,15 +3883,6 @@ class CourseManager
$params['real_id'] = $course_info['real_id']; $params['real_id'] = $course_info['real_id'];
$params['visibility'] = $course_info['visibility']; $params['visibility'] = $course_info['visibility'];
// Display the "what's new" icons
$notifications = '';
if (
(Course::CLOSED != $course_visibility && Course::HIDDEN != $course_visibility) ||
!api_get_configuration_value('hide_course_notification')
) {
$notifications .= Display::show_notification($course_info);
}
$sessionCourseAvailable = false; $sessionCourseAvailable = false;
if ($session_accessible) { if ($session_accessible) {
if (Course::CLOSED != $course_visibility || if (Course::CLOSED != $course_visibility ||
@ -3927,7 +3904,7 @@ class CourseManager
if (COURSEMANAGER === $userInCourseStatus || $sessionCourseAvailable) { if (COURSEMANAGER === $userInCourseStatus || $sessionCourseAvailable) {
$session_url = $course_info['course_public_url'].'?sid='.$course_info['id_session']; $session_url = $course_info['course_public_url'].'?sid='.$course_info['id_session'];
$session_title = '<a title="'.$course_info['name'].'" href="'.$session_url.'">'. $session_title = '<a title="'.$course_info['name'].'" href="'.$session_url.'">'.
$course_info['name'].'</a>'.$notifications; $course_info['name'].'</a>';
} else { } else {
$session_title = $course_info['name']; $session_title = $course_info['name'];
} }
@ -6141,12 +6118,6 @@ class CourseManager
$course_info['id_session'] = null; $course_info['id_session'] = null;
$course_info['status'] = $course['status']; $course_info['status'] = $course['status'];
// For each course, get if there is any notification icon to show
// (something that would have changed since the user's last visit).
$show_notification = !api_get_configuration_value('hide_course_notification')
? Display::show_notification($course_info)
: '';
// New code displaying the user's status in respect to this course. // New code displaying the user's status in respect to this course.
$status_icon = Display::return_icon( $status_icon = Display::return_icon(
'blackboard.png', 'blackboard.png',
@ -6226,9 +6197,6 @@ class CourseManager
$params['icon'] = $status_icon; $params['icon'] = $status_icon;
$params['title'] = $course_title; $params['title'] = $course_title;
$params['teachers'] = $teachers; $params['teachers'] = $teachers;
if (Course::CLOSED != $course_info['visibility']) {
$params['notifications'] = $show_notification;
}
return $params; return $params;
} }

Loading…
Cancel
Save