Use course info: updateTeachers.

pull/2487/head
jmontoyaa 9 years ago
parent dde57552d3
commit d0ba09f2fc
  1. 4
      main/admin/course_edit.php
  2. 6
      main/cron/import_csv.php
  3. 10
      main/inc/lib/course.lib.php
  4. 6
      main/inc/lib/sessionmanager.lib.php

@ -344,10 +344,10 @@ if ($form->validate()) {
}
}
CourseManager::updateTeachers($courseId, $teachers, true, true, false);
CourseManager::updateTeachers($courseInfo, $teachers, true, true, false);
} else {
// Normal behaviour
CourseManager::updateTeachers($courseId, $teachers, true, false);
CourseManager::updateTeachers($courseInfo, $teachers, true, false);
// Updating session coaches
$sessionCoaches = $course['session_coaches'];

@ -332,12 +332,14 @@ class ImportCsv
$row['teachers'] = array();
if (isset($row['Teacher']) && !empty($row['Teacher'])) {
$this->logger->addInfo("Teacher list found: ".$row['Teacher']);
$teachers = explode(',', $row['Teacher']);
if (!empty($teachers)) {
foreach ($teachers as $teacherUserName) {
$teacherUserName = trim($teacherUserName);
$userInfo = api_get_user_info_from_username($teacherUserName);
if (!empty($userInfo)) {
$this->logger->addInfo("Username found: $teacherUserName");
$row['teachers'][] = $userInfo['user_id'];
}
}
@ -1104,7 +1106,7 @@ class ImportCsv
if ($addTeacherToSession) {
CourseManager::updateTeachers(
$courseInfo['id'],
$courseInfo,
$row['teachers'],
false,
true,
@ -1113,7 +1115,7 @@ class ImportCsv
);
} else {
CourseManager::updateTeachers(
$courseInfo['id'],
$courseInfo,
$row['teachers'],
false,
false,

@ -5061,7 +5061,7 @@ class CourseManager
}
/**
* @param int $courseId
* @param array $courseInfo
* @param array $teachers
* @param bool $deleteTeachersNotInList
* @param bool $editTeacherInSessions
@ -5069,7 +5069,7 @@ class CourseManager
* @return false|null
*/
public static function updateTeachers(
$courseId,
$courseInfo,
$teachers,
$deleteTeachersNotInList = true,
$editTeacherInSessions = false,
@ -5083,12 +5083,12 @@ class CourseManager
if (!is_array($teachers)) {
$teachers = array($teachers);
}
$courseId = intval($courseId);
$courseInfo = api_get_course_info_by_id($courseId);
if (empty($courseInfo)) {
if (empty($courseInfo) || !isset($courseInfo['real_id'])) {
return false;
}
$courseId = $courseInfo['real_id'];
$course_code = $courseInfo['code'];
$course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);

@ -5350,7 +5350,11 @@ class SessionManager
$courseInfo = api_get_course_info_by_id($courseId);
foreach ($coachesPerSession as $sessionId => $coachList) {
CourseManager::updateTeachers(
$courseInfo['real_id'], $coachList, false, false, false
$courseInfo,
$coachList,
false,
false,
false
);
$result[$courseInfo['code']][$sessionId] = $coachList;
}

Loading…
Cancel
Save