From 828491c0597b1bf15814e061df655f01b3b23511 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 17 Dec 2013 23:09:24 +0100 Subject: [PATCH] Changing label CleanAndUpdateCourseCoaches see BT#7116 --- main/admin/session_import.php | 2 +- main/inc/lib/sessionmanager.lib.php | 86 +++++++++++++++++++---------- 2 files changed, 58 insertions(+), 30 deletions(-) diff --git a/main/admin/session_import.php b/main/admin/session_import.php index 49a2e56e5b..7eb17f3009 100644 --- a/main/admin/session_import.php +++ b/main/admin/session_import.php @@ -534,7 +534,7 @@ $form->addElement('radio', 'file_type', array(null, ' 0) { - $sql = "UPDATE $tbl_session_rel_course_rel_user SET status = 2 WHERE id_session = '$session_id' AND course_code = '$course_code' AND id_user = '$user_id' "; + $sql = "UPDATE $tbl_session_rel_course_rel_user SET status = 2 + WHERE id_session = '$session_id' AND course_code = '$course_code' AND id_user = '$user_id' "; Database::query($sql); - if (Database::affected_rows() > 0) return true; - else return false; + if (Database::affected_rows() > 0) { + return true; + } else { + return false; + } } else { $sql = "INSERT INTO $tbl_session_rel_course_rel_user(id_session, course_code, id_user, status) VALUES('$session_id', '$course_code', '$user_id', 2)"; Database::query($sql); @@ -2801,7 +2804,6 @@ class SessionManager $session_counter++; } else { $sessionId = null; - if (isset($extraFields) && !empty($extraFields)) { $sessionId = self::get_session_id_from_original_id($enreg['extra_'.$extraFieldId], $extraFieldId); if (empty($sessionId)) { @@ -2812,6 +2814,7 @@ class SessionManager } else { $my_session_result = self::get_session_by_name($enreg['SessionName']); } + if ($my_session_result === false) { // Creating a session. @@ -2829,16 +2832,39 @@ class SessionManager $my_session_result = SessionManager::get_session_by_name($enreg['SessionName']); $session_id = $my_session_result['id']; - if ($debug) { + if ($session_id) { + if ($session_id) { foreach ($enreg as $key => $value) { if (substr($key, 0, 6) == 'extra_') { //an extra field self::update_session_extra_field_value($session_id, substr($key, 6), $value); } } - $logger->addInfo("Sessions - #$session_id created: $session_name"); + if ($debug) { + $logger->addInfo("Sessions - #$session_id created: $session_name"); + } } else { - $logger->addError("Sessions - Session NOT created: $session_name"); + if ($debug) { + $logger->addError("Sessions - Session NOT created: $session_name"); + } + } + + // Delete session-user relation only for students + $sql = "DELETE FROM $tbl_session_user + WHERE id_session = '$session_id' AND relation_type <> ".SESSION_RELATION_TYPE_RRHH; + Database::query($sql); + + $sql = "DELETE FROM $tbl_session_course WHERE id_session = '$session_id'"; + Database::query($sql); + + // Delete session-course-user relationships students and coaches. + if ($updateCourseCoaches) { + $sql = "DELETE FROM $tbl_session_course_user WHERE id_session = '$session_id' AND status in ('0', '2')"; + Database::query($sql); + } else { + // Delete session-course-user relation ships *only* for students. + $sql = "DELETE FROM $tbl_session_course_user WHERE id_session = '$session_id' AND status <> 2"; + Database::query($sql); } } } else { @@ -2872,30 +2898,32 @@ class SessionManager list($session_id) = Database::fetch_array($row); } - foreach ($enreg as $key => $value) { - if (substr($key, 0, 6) == 'extra_') { //an extra field - self::update_session_extra_field_value($session_id, substr($key, 6), $value); - } - } - - // Delete session-user relation only for students - $sql = "DELETE FROM $tbl_session_user - WHERE id_session = '$session_id' AND relation_type <> ".SESSION_RELATION_TYPE_RRHH; - Database::query($sql); + if ($session_id) { - $sql = "DELETE FROM $tbl_session_course WHERE id_session = '$session_id'"; - Database::query($sql); + foreach ($enreg as $key => $value) { + if (substr($key, 0, 6) == 'extra_') { //an extra field + self::update_session_extra_field_value($session_id, substr($key, 6), $value); + } + } - // Delete session-course-user relationships students and coaches. - if ($updateCourseCoaches) { - $sql = "DELETE FROM $tbl_session_course_user WHERE id_session = '$session_id' AND status in ('0', '2')"; + // Delete session-user relation only for students + $sql = "DELETE FROM $tbl_session_user + WHERE id_session = '$session_id' AND relation_type <> ".SESSION_RELATION_TYPE_RRHH; Database::query($sql); - } else { - // Delete session-course-user relation ships *only* for students. - $sql = "DELETE FROM $tbl_session_course_user WHERE id_session = '$session_id' AND status <> 2"; + + $sql = "DELETE FROM $tbl_session_course WHERE id_session = '$session_id'"; Database::query($sql); - } + // Delete session-course-user relationships students and coaches. + if ($updateCourseCoaches) { + $sql = "DELETE FROM $tbl_session_course_user WHERE id_session = '$session_id' AND status in ('0', '2')"; + Database::query($sql); + } else { + // Delete session-course-user relation ships *only* for students. + $sql = "DELETE FROM $tbl_session_course_user WHERE id_session = '$session_id' AND status <> 2"; + Database::query($sql); + } + } } $session_counter++; } @@ -2994,7 +3022,7 @@ class SessionManager $savedCoaches = array(); // only edit if add_teachers_to_sessions_courses is set. if ($addTeachersToSession) { - // Adding course teachers as course session teachers + // Adding course teachers as course session teachers. $alreadyAddedTeachers = CourseManager::get_teacher_list_from_course_code($course_code); if (!empty($alreadyAddedTeachers)) {