Internal: Fix 'name' to 'title' conversion in tracking pages

pull/5101/head
Yannick Warnier 2 years ago
parent cf401b4eea
commit 3756cf270d
  1. 12
      public/main/tracking/courseLog.php
  2. 4
      public/main/tracking/course_session_report.php
  3. 2
      public/main/tracking/exams.php
  4. 4
      public/main/tracking/question_course_report.php
  5. 6
      public/main/tracking/total_time.php

@ -307,7 +307,7 @@ if ($showReporting) {
}
//$url = $urlWebCode.'my_space/course.php?sid='.$session['id'].'&cid='.$courseId;
$url = $urlWebCode.'tracking/courseLog.php?cid='.$courseId.'&sid='.$session['id'].'&gid=0';
$table->setCellContents($row++, 0, $icon.' '.Display::url($session['name'], $url));
$table->setCellContents($row++, 0, $icon.' '.Display::url($session['title'], $url));
}
if ($row > 0) {
$html .= $table->toHtml();
@ -340,13 +340,13 @@ if ($nbStudents > 0) {
$select = $formClass->addSelect('class_id', get_lang('Class').'/'.get_lang('Group'), $groupIdList);
$groupIdList = [];
foreach ($classes as $class) {
//$groupIdList['class_'.$class['id']] = $class['name'];
$groupIdList[] = ['text' => $class['name'], 'value' => 'class_'.$class['id']];
//$groupIdList['class_'.$class['id']] = $class['title'];
$groupIdList[] = ['text' => $class['title'], 'value' => 'class_'.$class['id']];
}
$select->addOptGroup($groupIdList, get_lang('Class'));
$groupIdList = [];
foreach ($groupList as $group) {
$groupIdList[] = ['text' => $group['name'], 'value' => 'group_'.$group['iid']];
$groupIdList[] = ['text' => $group['title'], 'value' => 'group_'.$group['iid']];
}
$select->addOptGroup($groupIdList, get_lang('Group'));
$formClass->addButtonSearch(get_lang('Search'));
@ -361,7 +361,7 @@ if ($nbStudents > 0) {
$formGroup->addHidden('id_session', $sessionId);
$groupIdList = ['--'];
foreach ($groupList as $group) {
$groupIdList[$group['id']] = $group['name'];
$groupIdList[$group['id']] = $group['title'];
}
$formGroup->addSelect('group_id', get_lang('Group'), $groupIdList);
$formGroup->addButtonSearch(get_lang('Search'));*/
@ -806,7 +806,7 @@ if (!empty($groupList)) {
$row = 1;
foreach ($groupList as $groupInfo) {
$column = 0;
$groupTable->setCellContents($row, $column++, $groupInfo['name']);
$groupTable->setCellContents($row, $column++, $groupInfo['title']);
$usersInGroup = GroupManager::getStudents($groupInfo['iid']);
$time = null;

@ -31,10 +31,10 @@ if (empty($session_id)) {
$form = new FormValidator('search_simple', 'POST', '', '', null, false);
//Get session list
$session_list = SessionManager::get_sessions_list([], ['name']);
$session_list = SessionManager::get_sessions_list([], ['title']);
$my_session_list = [];
foreach ($session_list as $sesion_item) {
$my_session_list[$sesion_item['id']] = $sesion_item['name'];
$my_session_list[$sesion_item['id']] = $sesion_item['title'];
}
if (0 == count($session_list)) {
$my_session_list[0] = get_lang('none');

@ -185,7 +185,7 @@ if (!empty($courseList)) {
$newSessionList = [];
if (!empty($sessionList)) {
foreach ($sessionList as $session) {
$newSessionList[$session['id']] = $session['name'];
$newSessionList[$session['id']] = $session['title'];
}
}

@ -52,12 +52,12 @@ foreach ($temp_course_list as $temp_course_item) {
}
//Get session list
$session_list = SessionManager::get_sessions_list([], ['name']);
$session_list = SessionManager::get_sessions_list([], ['title']);
$my_session_list = [];
$my_session_list[0] = get_lang('none');
foreach ($session_list as $sesion_item) {
$my_session_list[$sesion_item['id']] = $sesion_item['name'];
$my_session_list[$sesion_item['id']] = $sesion_item['title'];
}
$form = new FormValidator('search_simple', 'POST', '', '', null, false);

@ -192,12 +192,12 @@ echo Display::toolbarAction(
[$actionsLeft, $form_search->returnForm(), $actionsRight]
);
$course_name = get_lang('Course').' '.$courseInfo['name'];
$course_name = get_lang('Course').' '.$courseInfo['title'];
if ($session_id) {
$titleSession = Display::getMdiIcon(ObjectIcon::SESSION, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Session')).' '.api_get_session_name($session_id);
$titleCourse = Display::getMdiIcon(ObjectIcon::COURSE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Course')).' '.$course_name;
} else {
$titleSession = Display::getMdiIcon(ObjectIcon::COURSE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Course')).' '.$courseInfo['name'];
$titleSession = Display::getMdiIcon(ObjectIcon::COURSE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Course')).' '.$courseInfo['title'];
}
$teacherList = CourseManager::getTeacherListFromCourseCodeToString(
$courseInfo['code'],
@ -246,7 +246,7 @@ if (api_is_platform_admin(true) ||
foreach ($sessionList as $session) {
$url = api_get_path(WEB_CODE_PATH).'my_space/course.php?sid='
.$session['id'].'&cidReq='.$courseInfo['code'];
$html .= Display::tag('li', $icon.' '.Display::url($session['name'], $url));
$html .= Display::tag('li', $icon.' '.Display::url($session['title'], $url));
}
$html .= '</ul>';
}

Loading…
Cancel
Save