chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adding course coaches in the admin/course_edit.php page see BT#6449 (available for admin only)

Browse Source
1.9.x
Julio Montoya 12 years ago
parent f339330cae
commit 599734e411
2 changed files with 176 additions and 60 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 137
      main/admin/course_edit.php
  2. 27
      main/inc/lib/sessionmanager.lib.php

137
main/admin/course_edit.php
Unescape View File

@ -3,7 +3,7 @@
/**
* @package chamilo.admin
*/
/* Initialization section */
// name of the language file that needs to be included
$language_file = 'admin';
$cidReset = true;
@ -46,21 +46,25 @@ while ($obj = Database::fetch_object($res)) {
}
// Get all possible teachers without the course teachers
if ($_configuration['multiple_access_urls']) {
if (api_is_multiple_url_enabled()) {
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql = "SELECT u.user_id,lastname,firstname FROM $table_user as u
$sql = "SELECT u.user_id,lastname,firstname
FROM $table_user as u
INNER JOIN $access_url_rel_user_table url_rel_user
ON (u.user_id=url_rel_user.user_id) WHERE url_rel_user.access_url_id=".api_get_current_access_url_id()." AND status=1".$order_clause;
ON (u.user_id=url_rel_user.user_id)
WHERE url_rel_user.access_url_id=".api_get_current_access_url_id()." AND status=1".$order_clause;
} else {
$sql = "SELECT user_id,lastname,firstname FROM $table_user WHERE status='1'".$order_clause;
$sql = "SELECT user_id, lastname, firstname
FROM $table_user WHERE status='1'".$order_clause;
}
$res = Database::query($sql);
$teachers = array();
$allTeachers = array();
$platform_teachers[0] = '-- '.get_lang('NoManager').' --';
while ($obj = Database::fetch_object($res)) {
$allTeachers[$obj->user_id] = api_get_person_name($obj->firstname, $obj->lastname);
if (!array_key_exists($obj->user_id, $course_teachers)) {
$teachers[$obj->user_id] = api_get_person_name($obj->firstname, $obj->lastname);
}
@ -93,15 +97,16 @@ $form->applyFilter('title','trim');
$element = $form->addElement('text', 'real_code', array(get_lang('CourseCode'), get_lang('ThisValueCantBeChanged')));
$element->freeze();
// visual code
// Visual code
$form->add_textfield('visual_code', array(get_lang('VisualCode'), get_lang('OnlyLettersAndNumbers'), get_lang('ThisValueIsUsedInTheCourseURL')), true, array('class' => 'span4'));
$form->applyFilter('visual_code', 'strtoupper');
$form->applyFilter('visual_code', 'html_filter');
$group=array();
$group[] = $form->createElement('select', 'platform_teachers', '', $teachers, ' id="platform_teachers" multiple=multiple size="4" style="width:300px;"');
$group[] = $form->createElement('select', 'course_teachers', '', $course_teachers, ' id="course_teachers" multiple=multiple size="4" style="width:300px;"');
$group = array(
$form->createElement('select', 'platform_teachers', '', $teachers, ' id="platform_teachers" multiple=multiple size="4" style="width:300px;"'),
$form->createElement('select', 'course_teachers', '', $course_teachers, ' id="course_teachers" multiple=multiple size="4" style="width:300px;"')
);
$element_template = <<<EOT
<div class="control-group">
@ -122,12 +127,70 @@ $renderer = $form->defaultRenderer();
$renderer->setElementTemplate($element_template, 'group');
$form->addGroup($group, 'group', get_lang('CourseTeachers'), '</td><td width="80" align="center">'.
'<input class="arrowr" style="width:30px;height:30px;padding-right:12px" type="button" onclick="moveItem(document.getElementById(\'platform_teachers\'), document.getElementById(\'course_teachers\'))"><br><br>'.
'<input class="arrowl" style="width:30px;height:30px;padding-left:13px" type="button" onclick="moveItem(document.getElementById(\'course_teachers\'), document.getElementById(\'platform_teachers\'))" ></td><td>');
'<input class="arrowl" style="width:30px;height:30px;padding-left:13px" type="button" onclick="moveItem(document.getElementById(\'course_teachers\'), document.getElementById(\'platform_teachers\'))"></td><td>'
);
if (array_key_exists('add_teachers_to_sessions_courses', $course)) {
$form->addElement('checkbox', 'add_teachers_to_sessions_courses', null, get_lang('TeachersWillBeAddedAsCoachInAllCourseSessions'));
}
$coursesInSession = SessionManager::get_session_by_course($course['code']);
if (!empty($coursesInSession)) {
foreach ($coursesInSession as $session) {
$sessionId = $session['id'];
$coaches = SessionManager::getCoachesByCourseSession($sessionId, $course['code']);
$teachers = $allTeachers;
$sessionTeachers = array();
foreach ($coaches as $coachId) {
$userInfo = api_get_user_info($coachId);
$sessionTeachers[$coachId] = $userInfo['complete_name'];
if (isset($teachers[$coachId])) {
unset($teachers[$coachId]);
}
}
$groupName = 'session_coaches['.$sessionId.']';
$platformTeacherId = 'platform_teachers_by_session_'.$sessionId;
$coachId = 'coaches_by_session_'.$sessionId;
$platformTeacherName = 'platform_teachers_by_session';
$coachName = 'coaches_by_session';
$group = array(
$form->createElement('select', $platformTeacherName, '', $teachers, ' id="'.$platformTeacherId.'" multiple=multiple size="4" style="width:300px;"'),
$form->createElement('select', $coachName, '', $sessionTeachers, ' id="'.$coachId.'" multiple=multiple size="4" style="width:300px;"')
);
$renderer = $form->defaultRenderer();
$element_template = <<<EOT
<div class="control-group">
<label>
<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->{label}
</label>
<div class="controls">
<table cellpadding="0" cellspacing="0">
<tr>
<!-- BEGIN error --><span class="form_error">{error}</span><br /><!-- END error --> <td>{element}</td>
</tr>
</table>
</div>
</div>
EOT;
$renderer->setElementTemplate($element_template, $groupName);
$form->addGroup($group, $groupName, $session['name'].' - '.get_lang('Coaches'), '</td>
<td width="80" align="center">
<input class="arrowr" style="width:30px;height:30px;padding-right:12px" type="button" onclick="moveItem(document.getElementById(\''.$platformTeacherId.'\'), document.getElementById(\''.$coachId.'\'));">
<br><br>
<input class="arrowl" style="width:30px;height:30px;padding-left:13px" type="button" onclick="moveItem(document.getElementById(\''.$coachId.'\'), document.getElementById(\''.$platformTeacherId.'\'));">
</td><td>'
);
}
}
$categories_select = $form->addElement('select', 'category_code', get_lang('CourseFaculty'), $categories, array('style'=>'width:350px','id'=>'category_code_id', 'class'=>'chzn-select'));
$categories_select->addOption('-', '');
CourseManager::select_and_sort_categories($categories_select);
@ -166,6 +229,7 @@ $form->addRule('disk_quota', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('disk_quota', get_lang('ThisFieldShouldBeNumeric'), 'numeric');
$list_course_extra_field = CourseManager::get_course_extra_field_list($course_code);
//@todo this is wrong
foreach ($list_course_extra_field as $extra_field) {
switch ($extra_field['field_type']) {
@ -173,7 +237,6 @@ foreach ($list_course_extra_field as $extra_field) {
$checked = (array_key_exists('extra_field_value', $extra_field) && $extra_field['extra_field_value'] == 1)? array('checked'=>'checked'): '';
$form->addElement('hidden', '_extra_'.$extra_field['field_variable'], 0);
$field_display_text = $extra_field['field_display_text'];
//$form->addElement('checkbox', 'extra_'.$extra_field['field_variable'], array(get_lang('SpecialCourse'), get_lang('AllUsersAreAutomaticallyRegistered')) , get_lang($extra_field['field_default_value']), $checked);
$form->addElement('checkbox', 'extra_'.$extra_field['field_variable'], array(null, get_lang('AllUsersAreAutomaticallyRegistered')), get_lang('SpecialCourse'), $checked);
break;
}
@ -184,7 +247,6 @@ $form->addElement('style_submit_button', 'button', get_lang('ModifyCourseInfo'),
$course['disk_quota'] = round(DocumentManager::get_course_quota($course_code) /1024/1024, 1);
$course['title'] = api_html_entity_decode($course['title'], ENT_QUOTES, $charset);
$course['real_code'] = $course['code'];
$course['add_teachers_to_sessions_courses'] = isset($course['add_teachers_to_sessions_courses']) ? $course['add_teachers_to_sessions_courses'] : 0;
$form->setDefaults($course);
@ -192,6 +254,7 @@ $form->setDefaults($course);
// Validate form
if ($form->validate()) {
$course = $form->getSubmitValues();
$dbName = $_POST['dbName'];
$course_code = $course['code'];
$visual_code = $course['visual_code'];
@ -211,12 +274,14 @@ if ($form->validate()) {
}
$warn = substr($warn, 0, -1);
}
// an extra field
$extras = array();
foreach ($course as $key => $value) {
if (substr($key, 0, 6) == 'extra_') {
$extras[substr($key, 6)] = $value;
}
if (substr($key, 0, 7) == '_extra_') {
if (!array_key_exists(substr($key, 7), $extras)) {
$extras[substr($key, 7)] = $value;
@ -233,16 +298,16 @@ if ($form->validate()) {
$department_name = $course['department_name'];
$department_url = $course['department_url'];
$course_language = $course['course_language'];
$course['disk_quota'] = $course['disk_quota']*1024*1024;
$disk_quota = $course['disk_quota'];
$visibility = $course['visibility'];
$subscribe = $course['subscribe'];
$unsubscribe = $course['unsubscribe'];
if (!stristr($department_url, 'http://')) {
$department_url = 'http://'.$department_url;
}
$sql = "UPDATE $course_table SET course_language='".Database::escape_string($course_language)."',
title='".Database::escape_string($title)."',
category_code='".Database::escape_string($category_code)."',
@ -266,13 +331,39 @@ if ($form->validate()) {
$addTeacherToSessionCourses = isset($course['add_teachers_to_sessions_courses']) && !empty($course['add_teachers_to_sessions_courses']) ? 1 : 0;
// Updating teachers
if ($addTeacherToSessionCourses) {
// Updating session coaches
$sessionCoaches = $course['session_coaches'];
if (!empty($sessionCoaches)) {
foreach ($sessionCoaches as $sessionId => $teacherInfo) {
$coachesToSubscribe = $teacherInfo['coaches_by_session'];
SessionManager::updateCoaches($sessionId, $course['code'], $coachesToSubscribe, true);
}
}
CourseManager::updateTeachers($course_code, $teachers, false, true, false);
} else {
// Normal behaviour
CourseManager::updateTeachers($course_code, $teachers, true, false);
// Updating session coaches
$sessionCoaches = $course['session_coaches'];
if (!empty($sessionCoaches)) {
foreach ($sessionCoaches as $sessionId => $teacherInfo) {
$coachesToSubscribe = $teacherInfo['coaches_by_session'];
SessionManager::updateCoaches($sessionId, $course['code'], $coachesToSubscribe, true);
}
}
}
$sql = "INSERT IGNORE INTO ".$course_user_table . " SET
course_code = '".Database::escape_string($course_code). "',
user_id = '".$tutor_id . "',
@ -307,7 +398,6 @@ Display::display_header($tool_name);
echo "<script>
function moveItem(origin , destination) {
for (var i = 0 ; i<origin.options.length ; i++) {
if (origin.options[i].selected) {
destination.options[destination.length] = new Option(origin.options[i].text,origin.options[i].value);
@ -317,7 +407,6 @@ function moveItem(origin , destination){
}
destination.selectedIndex = -1;
sortOptions(destination.options);
}
function sortOptions(options) {
@ -344,13 +433,19 @@ function mysort(a, b) {
}
function valide() {
var options = document.getElementById('course_teachers').options;
for (i = 0 ; i<options.length ; i++) {
options[i].selected = true;
// Checking all multiple
$('select').filter(function() {
if ($(this).attr('multiple')) {
$(this).find('option').each(function() {
$(this).attr('selected', true);
});
}
document.update_course.submit();
});
//document.update_course.submit();
}
</script>";
// Display the form
$form->display();

27
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -2236,6 +2236,7 @@ class SessionManager
if ($debug) {
$logger->addInfo("Sessions - Adding course '$course_code' to session #$session_id");
}
$course_counter++;
$pattern = "/\[(.*?)\]/";
@ -2282,9 +2283,6 @@ class SessionManager
$error_message .= get_lang('UserDoesNotExist').' : '.$course_coach.$eol;
}
}
}
$users_in_course_counter = 0;
@ -2393,4 +2391,27 @@ class SessionManager
}
return $userList;
}
/**
* @param $sessionId
* @param $coachList
* @param $deleteCoachesNotInList
*/
public static function updateCoaches($sessionId, $courseCode, $coachList, $deleteCoachesNotInList = false)
{
$currentCoaches = SessionManager::getCoachesByCourseSession($sessionId, $courseCode);
foreach ($coachList as $userId) {
SessionManager::set_coach_to_course_session($userId, $sessionId, $courseCode);
}
if ($deleteCoachesNotInList) {
$coachesToDelete = array_diff($currentCoaches, $coachList);
if (!empty($coachesToDelete)) {
foreach ($coachesToDelete as $userId) {
SessionManager::set_coach_to_course_session($userId, $sessionId, $courseCode, true);
}
}
}
}
}

Write Preview
Loading…
Cancel
Save