diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php index 265673fc8d..93ac043d9a 100755 --- a/main/admin/user_edit.php +++ b/main/admin/user_edit.php @@ -260,7 +260,6 @@ $creatorInfo = api_get_user_info($user_data['creator_id']); $date = sprintf(get_lang('CreatedByXYOnZ'), 'user_information.php?user_id='.$user_data['creator_id'], $creatorInfo['username'], $user_data['registration_date']); $form->addElement('html', '
'.$date.'
'); - if (!$user_data['platform_admin']) { // Expiration Date $form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0); @@ -274,7 +273,6 @@ if (!$user_data['platform_admin']) { $form->addElement('radio', 'active', '', get_lang('Inactive'), 0); } - // EXTRA FIELDS $return_params = UserManager::set_extra_fields_in_form($form, $extra_data, 'user_edit', true, $user_id); $jquery_ready_content = $return_params['jquery_ready_content']; @@ -432,7 +430,7 @@ if ($form->validate()) { } else { UserManager::update_extra_field_value($user_id, substr($key, 6), $value); } - } elseif (strpos($key,'remove_extra') !== false) { + } elseif (strpos($key, 'remove_extra') !== false) { $extra_value = Security::filter_filename(urldecode(key($value))); // To remove from user_field_value and folder UserManager::update_extra_field_value($user_id, substr($key,13), $extra_value); diff --git a/main/admin/user_move_stats.php b/main/admin/user_move_stats.php index f1f4b19bc9..27270d4a3f 100755 --- a/main/admin/user_move_stats.php +++ b/main/admin/user_move_stats.php @@ -1,12 +1,10 @@ 'index.php', "name" => get_lang('PlatformAd $debug = 0; function compare_data($result_message) { - foreach ($result_message as $table=>$data) { - - $title = $table; + foreach ($result_message as $table=>$data) { + + $title = $table; if ($table == 'TRACK_E_EXERCISES') { $title = get_lang('Exercises'); } elseif ($table == 'TRACK_E_EXERCISES_IN_LP') { $title = get_lang('ExercisesInLp'); - } elseif ($table == 'LP_VIEW') { + } elseif ($table == 'LP_VIEW') { $title = get_lang('LearningPaths'); - } + } echo '

'.get_lang($title).'

'; - - if (is_array($data)) { + + if (is_array($data)) { foreach ($data as $id => $item) { - + if ($table == 'TRACK_E_EXERCISES' || $table == 'TRACK_E_EXERCISES_IN_LP' ) { - echo "

".get_lang('Attempt')." #$id

"; + echo "

".get_lang('Attempt')." #$id

"; echo '

'; echo get_lang('Exercise').' #'.$item['exe_exo_id']; - echo '

'; + echo ''; if (!empty($item['orig_lp_id'])) { echo '

'; echo get_lang('LearningPath').' #'.$item['orig_lp_id']; echo '

'; - } + } //Process data $array = array('exe_date' =>get_lang('Date'), 'exe_result' =>get_lang('Score'),'exe_weighting'=>get_lang('Weighting')); foreach($item as $key=> $value) { if (in_array($key,array_keys($array))) { $key = $array[$key]; echo "$key = $value
"; - } + } } - } else { - echo "

".get_lang('Id')." #$id

"; + } else { + echo "

".get_lang('Id')." #$id

"; //process data foreach($item as $key=> $value) { - echo "$key = $value
"; + echo "$key = $value
"; } - } - } + } + } } else { echo get_lang('NoResults'); - } + } } } if (isset($_REQUEST['load_ajax'])) { //Checking the variable $_SESSION['combination'] that has all the information of the selected course (instead of using a lots of hidden variables ... ) if (isset($_SESSION['combination']) && !empty($_SESSION['combination'])) { - $combinations = $_SESSION['combination']; + $combinations = $_SESSION['combination']; $combination_result = $combinations[$_REQUEST['unique_id']]; if (empty($combination_result)) { - echo get_lang('ThereWasAnError'); + echo get_lang('ThereWasAnError'); } else { - $origin_course_code = $combination_result['course_code']; - $origin_session_id = intval($combination_result['session_id']); + $origin_course_code = $combination_result['course_code']; + $origin_session_id = intval($combination_result['session_id']); $new_session_id = intval($_REQUEST['session_id']); - + //if (!isset($_REQUEST['view_stat'])) { - if ($origin_session_id == $new_session_id ) { - echo get_lang('CantMoveToTheSameSession'); - exit; - } + if ($origin_session_id == $new_session_id ) { + echo get_lang('CantMoveToTheSameSession'); + exit; + } //} - $user_id = intval($_REQUEST['user_id']); - + $user_id = intval($_REQUEST['user_id']); + $new_course_list = SessionManager::get_course_list_by_session_id($new_session_id); - + $course_founded = false; - foreach ($new_course_list as $course_item) { + foreach ($new_course_list as $course_item) { if ($origin_course_code == $course_item['code']) { $course_founded = true; } } - - - $result_message = array(); + + $result_message = array(); $result_message_compare = array(); - + $update_database = true; - if (isset($_REQUEST['view_stat']) && $_REQUEST['view_stat'] == 1 ) { + if (isset($_REQUEST['view_stat']) && $_REQUEST['view_stat'] == 1 ) { $update_database = false; } - - //Check if the same course exist in the session destination + + //Check if the same course exist in the session destination if ($course_founded) { - - //Check if the user is registered in the session otherwise we will add it + + //Check if the user is registered in the session otherwise we will add it $result = SessionManager::get_users_by_session($new_session_id); if (empty($result) || !in_array($user_id, array_keys($result))) { - if ($debug) echo 'User added to the session'; + if ($debug) echo 'User added to the session'; //Registering user to the new session - SessionManager::suscribe_users_to_session($new_session_id,array($user_id),false); - } - + SessionManager::suscribe_users_to_session($new_session_id,array($user_id),false); + } + //Begin with the import process - $course_info = api_get_course_info($origin_course_code); - $course_id = $course_info['real_id']; - + $course_info = api_get_course_info($origin_course_code); + $course_id = $course_info['real_id']; + $TABLETRACK_EXERCICES = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES); $TBL_TRACK_ATTEMPT = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT); $TBL_TRACK_E_COURSE_ACCESS = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); $TBL_TRACK_E_LAST_ACCESS = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_LASTACCESS); - + $TBL_LP_VIEW = Database::get_course_table(TABLE_LP_VIEW); $TBL_NOTEBOOK = Database::get_course_table(TABLE_NOTEBOOK); $TBL_STUDENT_PUBLICATION = Database::get_course_table(TABLE_STUDENT_PUBLICATION); $TBL_STUDENT_PUBLICATION_ASSIGNMENT = Database::get_course_table(TABLE_STUDENT_PUBLICATION_ASSIGNMENT); $TBL_ITEM_PROPERTY = Database::get_course_table(TABLE_ITEM_PROPERTY); - + $TBL_DROPBOX_FILE = Database::get_course_table(TABLE_DROPBOX_FILE); $TBL_DROPBOX_POST = Database::get_course_table(TABLE_DROPBOX_POST); $TBL_AGENDA = Database::get_course_table(TABLE_AGENDA); - - $course_code = Database::escape_string($course_code); - + //1. track_e_exercises - //ORIGINAL COURSE - - $sql = "SELECT * FROM $TABLETRACK_EXERCICES WHERE exe_cours_id = '$origin_course_code' AND session_id = $origin_session_id AND exe_user_id = $user_id "; + + $sql = "SELECT * FROM $TABLETRACK_EXERCICES + WHERE exe_cours_id = '$origin_course_code' AND session_id = $origin_session_id AND exe_user_id = $user_id "; $res = Database::query($sql); - $list = array(); + $list = array(); while($row = Database::fetch_array($res,'ASSOC')) { $list[$row['exe_id']]= $row; - } - + } + if (!empty($list)) - foreach ($list as $exe_id =>$data) { - if ($update_database) { - $sql = "UPDATE $TABLETRACK_EXERCICES SET session_id = '$new_session_id' WHERE exe_id = $exe_id"; - $res = Database::query($sql); - $result_message[$TABLETRACK_EXERCICES]++; - } else { - if(!empty($data['orig_lp_id']) && !empty($data['orig_lp_item_id'])) { - $result_message['TRACK_E_EXERCISES'][$exe_id] = $data; - } else { - $result_message['TRACK_E_EXERCISES_IN_LP'][$exe_id] = $data; + foreach ($list as $exe_id =>$data) { + if ($update_database) { + $sql = "UPDATE $TABLETRACK_EXERCICES SET session_id = '$new_session_id' WHERE exe_id = $exe_id"; + $res = Database::query($sql); + $result_message[$TABLETRACK_EXERCICES]++; + } else { + if(!empty($data['orig_lp_id']) && !empty($data['orig_lp_item_id'])) { + $result_message['TRACK_E_EXERCISES'][$exe_id] = $data; + } else { + $result_message['TRACK_E_EXERCISES_IN_LP'][$exe_id] = $data; + } } - } - } - + } + //DESTINY COURSE - + if (!$update_database) { - - $sql = "SELECT * FROM $TABLETRACK_EXERCICES WHERE exe_cours_id = '$origin_course_code' AND session_id = $new_session_id AND exe_user_id = $user_id "; + + $sql = "SELECT * FROM $TABLETRACK_EXERCICES WHERE exe_cours_id = '$origin_course_code' AND session_id = $new_session_id AND exe_user_id = $user_id "; $res = Database::query($sql); - $list = array(); + $list = array(); while($row = Database::fetch_array($res,'ASSOC')) { $list[$row['exe_id']]= $row; - } - + } + if (!empty($list)) - foreach ($list as $exe_id =>$data) { - if ($update_database) { - $sql = "UPDATE $TABLETRACK_EXERCICES SET session_id = '$new_session_id' WHERE exe_id = $exe_id"; - $res = Database::query($sql); - $result_message[$TABLETRACK_EXERCICES]++; - } else { - if(!empty($data['orig_lp_id']) && !empty($data['orig_lp_item_id'])) { - $result_message_compare['TRACK_E_EXERCISES'][$exe_id] = $data; - } else { - $result_message_compare['TRACK_E_EXERCISES_IN_LP'][$exe_id] = $data; + foreach ($list as $exe_id =>$data) { + if ($update_database) { + $sql = "UPDATE $TABLETRACK_EXERCICES SET session_id = '$new_session_id' WHERE exe_id = $exe_id"; + $res = Database::query($sql); + $result_message[$TABLETRACK_EXERCICES]++; + } else { + if(!empty($data['orig_lp_id']) && !empty($data['orig_lp_item_id'])) { + $result_message_compare['TRACK_E_EXERCISES'][$exe_id] = $data; + } else { + $result_message_compare['TRACK_E_EXERCISES_IN_LP'][$exe_id] = $data; + } } - } - } - } - + } + } + //2.track_e_attempt, track_e_attempt_recording, track_e_downloads //Nothing to do because there are not relationship with a session - - //3. track_e_course_access - - $sql = "SELECT * FROM $TBL_TRACK_E_COURSE_ACCESS WHERE course_code = '$origin_course_code' AND session_id = $origin_session_id AND user_id = $user_id "; + + //3. track_e_course_access + + $sql = "SELECT * FROM $TBL_TRACK_E_COURSE_ACCESS WHERE course_code = '$origin_course_code' AND session_id = $origin_session_id AND user_id = $user_id "; $res = Database::query($sql); - $list = array(); + $list = array(); while($row = Database::fetch_array($res,'ASSOC')) { $list[$row['course_access_id']] = $row; - } - - if (!empty($list)) - foreach ($list as $id => $data) { - if ($update_database) { - $sql = "UPDATE $TBL_TRACK_E_COURSE_ACCESS SET session_id = '$new_session_id' WHERE course_access_id = $id"; - if ($debug) echo $sql; - $res = Database::query($sql); - if ($debug) var_dump($res); - $result_message[$TBL_TRACK_E_COURSE_ACCESS]++; - } else { - //$result_message[$TBL_TRACK_E_COURSE_ACCESS][$id] = $data; - } } - + + if (!empty($list)) + foreach ($list as $id => $data) { + if ($update_database) { + $sql = "UPDATE $TBL_TRACK_E_COURSE_ACCESS SET session_id = '$new_session_id' WHERE course_access_id = $id"; + if ($debug) echo $sql; + $res = Database::query($sql); + if ($debug) var_dump($res); + $result_message[$TBL_TRACK_E_COURSE_ACCESS]++; + } else { + //$result_message[$TBL_TRACK_E_COURSE_ACCESS][$id] = $data; + } + } + //4. track_e_lastaccess - - $sql = "SELECT access_id FROM $TBL_TRACK_E_LAST_ACCESS WHERE access_cours_code = '$origin_course_code' AND access_session_id = $origin_session_id AND access_user_id = $user_id "; + + $sql = "SELECT access_id FROM $TBL_TRACK_E_LAST_ACCESS WHERE access_cours_code = '$origin_course_code' AND access_session_id = $origin_session_id AND access_user_id = $user_id "; $res = Database::query($sql); - $list = array(); + $list = array(); while($row = Database::fetch_array($res,'ASSOC')) { $list[] = $row['access_id']; - } + } if (!empty($list)) - foreach ($list as $id) { - if ($update_database) { - $sql = "UPDATE $TBL_TRACK_E_LAST_ACCESS SET access_session_id = '$new_session_id' WHERE access_id = $id"; - if ($debug) echo $sql; - $res = Database::query($sql); - if ($debug) var_dump($res); - $result_message[$TBL_TRACK_E_LAST_ACCESS]++; - } - } - + foreach ($list as $id) { + if ($update_database) { + $sql = "UPDATE $TBL_TRACK_E_LAST_ACCESS SET access_session_id = '$new_session_id' WHERE access_id = $id"; + if ($debug) echo $sql; + $res = Database::query($sql); + if ($debug) var_dump($res); + $result_message[$TBL_TRACK_E_LAST_ACCESS]++; + } + } + //5. lp_item_view - //CHECK ORIGIN - + //CHECK ORIGIN + $sql = "SELECT * FROM $TBL_LP_VIEW WHERE user_id = $user_id AND session_id = $origin_session_id AND c_id = $course_id "; $res = Database::query($sql); - - //Getting the list of LPs in the new session + + //Getting the list of LPs in the new session $lp_list = new LearnpathList($user_id, $origin_course_code, $new_session_id); $flat_list = $lp_list->get_flat_list(); - - $list = array(); + + $list = array(); while($row = Database::fetch_array($res,'ASSOC')) { - //Checking if the LP exist in the new session - if (in_array($row['lp_id'], array_keys($flat_list))) { + //Checking if the LP exist in the new session + if (in_array($row['lp_id'], array_keys($flat_list))) { $list[$row['id']] = $row; - } + } } - + if (!empty($list)) - foreach ($list as $id=>$data) { - if ($update_database) { - $sql = "UPDATE $TBL_LP_VIEW SET session_id = '$new_session_id' WHERE c_id = $course_id AND id = $id "; - if ($debug) var_dump($sql); - $res = Database::query($sql); - if ($debug) var_dump($res); - $result_message[$TBL_LP_VIEW]++; - } else { - //Getting all information of that lp_item_id - $score = Tracking::get_avg_student_score($user_id, $origin_course_code, array($data['lp_id']),$origin_session_id); - $progress = Tracking::get_avg_student_progress($user_id, $origin_course_code, array($data['lp_id']),$origin_session_id); - $result_message['LP_VIEW'][$data['lp_id']] = array('score' => $score, 'progress' =>$progress); - } - } - - + foreach ($list as $id=>$data) { + if ($update_database) { + $sql = "UPDATE $TBL_LP_VIEW SET session_id = '$new_session_id' WHERE c_id = $course_id AND id = $id "; + if ($debug) var_dump($sql); + $res = Database::query($sql); + if ($debug) var_dump($res); + $result_message[$TBL_LP_VIEW]++; + } else { + //Getting all information of that lp_item_id + $score = Tracking::get_avg_student_score($user_id, $origin_course_code, array($data['lp_id']),$origin_session_id); + $progress = Tracking::get_avg_student_progress($user_id, $origin_course_code, array($data['lp_id']),$origin_session_id); + $result_message['LP_VIEW'][$data['lp_id']] = array('score' => $score, 'progress' =>$progress); + } + } + + //CHECk DESTINY if (!$update_database) { - $sql = "SELECT * FROM $TBL_LP_VIEW WHERE user_id = $user_id AND session_id = $new_session_id AND c_id = $course_id"; - $res = Database::query($sql); - - //Getting the list of LPs in the new session - $lp_list = new LearnpathList($user_id, $origin_course_code, $new_session_id); - $flat_list = $lp_list->get_flat_list(); - - $list = array(); - while($row = Database::fetch_array($res,'ASSOC')) { - //Checking if the LP exist in the new session - if (in_array($row['lp_id'], array_keys($flat_list))) { - $list[$row['id']] = $row; - } - } - if (!empty($list)) - foreach ($list as $id=>$data) { - //Getting all information of that lp_item_id - $score = Tracking::get_avg_student_score($user_id, $origin_course_code, array($data['lp_id']), $new_session_id); - $progress = Tracking::get_avg_student_progress($user_id, $origin_course_code, array($data['lp_id']), $new_session_id); - $result_message_compare['LP_VIEW'][$data['lp_id']] = array('score' => $score, 'progress' =>$progress); + $sql = "SELECT * FROM $TBL_LP_VIEW WHERE user_id = $user_id AND session_id = $new_session_id AND c_id = $course_id"; + $res = Database::query($sql); + + //Getting the list of LPs in the new session + $lp_list = new LearnpathList($user_id, $origin_course_code, $new_session_id); + $flat_list = $lp_list->get_flat_list(); + + $list = array(); + while($row = Database::fetch_array($res,'ASSOC')) { + //Checking if the LP exist in the new session + if (in_array($row['lp_id'], array_keys($flat_list))) { + $list[$row['id']] = $row; + } + } + if (!empty($list)) + foreach ($list as $id=>$data) { + //Getting all information of that lp_item_id + $score = Tracking::get_avg_student_score($user_id, $origin_course_code, array($data['lp_id']), $new_session_id); + $progress = Tracking::get_avg_student_progress($user_id, $origin_course_code, array($data['lp_id']), $new_session_id); + $result_message_compare['LP_VIEW'][$data['lp_id']] = array('score' => $score, 'progress' =>$progress); } } - - + + //6. Agenda - + //calendar_event_attachment no problems no session_id $sql = "SELECT ref FROM $TBL_ITEM_PROPERTY WHERE tool = 'calendar_event' AND insert_user_id = $user_id AND c_id = $course_id "; $res = Database::query($sql); while($row = Database::fetch_array($res,'ASSOC')) { - $id = $row['ref']; - if ($update_database) { + $id = $row['ref']; + if ($update_database) { $sql = "UPDATE $TBL_AGENDA SET session_id = '$new_session_id' WHERE c_id = $course_id AND id = $id "; - if ($debug) var_dump($sql); + if ($debug) var_dump($sql); $res_update = Database::query($sql); - if ($debug) var_dump($res_update); + if ($debug) var_dump($res_update); $result_message['agenda']++; - } - } - + } + } + //7. Forum ?? So much problems when trying to import data - + //8. Student publication - Works - + //echo '

Student publication

'; - + $sql = "SELECT ref FROM $TBL_ITEM_PROPERTY WHERE tool = 'work' AND insert_user_id = $user_id AND c_id = $course_id"; if ($debug) echo $sql; $res = Database::query($sql); while($row = Database::fetch_array($res,'ASSOC')) { $id = $row['ref']; $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION WHERE id = $id AND session_id = $origin_session_id AND c_id = $course_id"; - if ($debug) var_dump($sql); + if ($debug) var_dump($sql); $sub_res = Database::query($sql); if (Database::num_rows($sub_res) > 0 ) { - $data = Database::fetch_array($sub_res,'ASSOC'); - if ($debug) var_dump($data); + $data = Database::fetch_array($sub_res,'ASSOC'); + if ($debug) var_dump($data); $parent_id = $data['parent_id']; if (isset($data['parent_id']) && !empty($data['parent_id'])) { $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION WHERE id = $parent_id AND c_id = $course_id"; $select_res = Database::query($sql); $parent_data = Database::fetch_array($select_res,'ASSOC'); if ($debug) var_dump($parent_data); - + $sys_course_path = api_get_path(SYS_COURSE_PATH); $course_dir = $sys_course_path . $course_info['path']; $base_work_dir = $course_dir . '/work'; - require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php'; - - //Creating the parent folder in the session if does not exists already - + require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php'; + + //Creating the parent folder in the session if does not exists already + //@todo ugly fix $search_this = "folder_moved_from_session_id_$origin_session_id"; $search_this2 = $parent_data['url']; - $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION - WHERE description like '%$search_this%' AND url LIKE '%$search_this2%' AND session_id = $new_session_id AND c_id = $course_id + $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION + WHERE description like '%$search_this%' AND url LIKE '%$search_this2%' AND session_id = $new_session_id AND c_id = $course_id ORDER BY id desc LIMIT 1"; if ($debug) echo $sql; $sub_res = Database::query($sql); $num_rows = Database::num_rows($sub_res); - - if ($num_rows > 0 ) { + + if ($num_rows > 0 ) { $new_result = Database::fetch_array($sub_res,'ASSOC'); $created_dir = $new_result['url']; - $new_parent_id = $new_result['id']; - } else { - + $new_parent_id = $new_result['id']; + } else { + if ($update_database) { - - $dir_name = substr($parent_data['url'], 1); - $created_dir = create_unexisting_work_directory($base_work_dir, $dir_name); - $created_dir = '/'.$created_dir; - $now = api_get_utc_datetime(); - //Creating directory - $sql_add_publication = "INSERT INTO " . $TBL_STUDENT_PUBLICATION . " SET " . - "url = '".$created_dir."', + + $dir_name = substr($parent_data['url'], 1); + $created_dir = create_unexisting_work_directory($base_work_dir, $dir_name); + $created_dir = '/'.$created_dir; + $now = api_get_utc_datetime(); + //Creating directory + $sql_add_publication = "INSERT INTO " . $TBL_STUDENT_PUBLICATION . " SET " . + "url = '".$created_dir."', c_id = '".$course_id."', title = '".$parent_data['title']."', description = '".$parent_data['description']." folder_moved_from_session_id_$origin_session_id ', author = '', active = '0', accepted = '1', - filetype = 'folder', + filetype = 'folder', sent_date = '".$now."', qualification = '".$parent_data['qualification'] ."', parent_id = '', qualificator_id = '', date_of_qualification = '0000-00-00 00:00:00', - session_id = ".$new_session_id; - $rest_insert = Database::query($sql_add_publication); - if ($debug) echo ($sql_add_publication); - // add the directory - $id = Database::insert_id(); - //Folder created - api_item_property_update($course_info, 'work', $id, 'DirectoryCreated', api_get_user_id()); - if ($debug) var_dump($rest_insert); - $new_parent_id = $id; - $result_message[$TBL_STUDENT_PUBLICATION.' - new folder created called: '.$created_dir]++; - } - } - + session_id = ".$new_session_id; + $rest_insert = Database::query($sql_add_publication); + if ($debug) echo ($sql_add_publication); + // add the directory + $id = Database::insert_id(); + //Folder created + api_item_property_update($course_info, 'work', $id, 'DirectoryCreated', api_get_user_id()); + if ($debug) var_dump($rest_insert); + $new_parent_id = $id; + $result_message[$TBL_STUDENT_PUBLICATION.' - new folder created called: '.$created_dir]++; + } + } + //Creating student_publication_assignment if exists $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION_ASSIGNMENT WHERE publication_id = $parent_id AND c_id = $course_id"; if ($debug) var_dump($sql); @@ -399,37 +394,37 @@ if (isset($_REQUEST['load_ajax'])) { if (Database::num_rows($rest_select) > 0 ) { if ($update_database) { $assignment_data = Database::fetch_array($rest_select,'ASSOC'); - $sql_add_publication = "INSERT INTO " . $TBL_STUDENT_PUBLICATION_ASSIGNMENT . " SET - c_id = '$course_id', + $sql_add_publication = "INSERT INTO " . $TBL_STUDENT_PUBLICATION_ASSIGNMENT . " SET + c_id = '$course_id', expires_on = '".$assignment_data['expires_on']."', ends_on = '".$assignment_data['ends_on']."', add_to_calendar = '".$assignment_data['add_to_calendar']."', enable_qualification = '".$assignment_data['enable_qualification']."', publication_id = '".$new_parent_id."'"; - if ($debug) echo $sql_add_publication; + if ($debug) echo $sql_add_publication; $rest_select = Database::query($sql_add_publication); $id = Database::insert_id(); - - $sql_update = "UPDATE " . $TBL_STUDENT_PUBLICATION . " SET " . - "has_properties = '".$id."', + + $sql_update = "UPDATE " . $TBL_STUDENT_PUBLICATION . " SET " . + "has_properties = '".$id."', view_properties = '1' WHERE id = ".$new_parent_id; - if ($debug) echo $sql_update; - $rest_update = Database::query($sql_update); - - + if ($debug) echo $sql_update; + $rest_update = Database::query($sql_update); + + if ($debug) var_dump($sql_update); - $result_message[$TBL_STUDENT_PUBLICATION_ASSIGNMENT]++; - } - } - + $result_message[$TBL_STUDENT_PUBLICATION_ASSIGNMENT]++; + } + } + $doc_url = $data['url']; - $new_url = str_replace($parent_data['url'], $created_dir, $doc_url); - - if ($update_database) { - //Creating a new work + $new_url = str_replace($parent_data['url'], $created_dir, $doc_url); + + if ($update_database) { + //Creating a new work $sql_add_publication = "INSERT INTO " . $TBL_STUDENT_PUBLICATION . " SET " . - "url = '" . $new_url . "', + "url = '" . $new_url . "', c_id = '".$course_id."', title = '" . $data['title']. "', description = '" . $data['description'] . " file moved', @@ -440,113 +435,113 @@ if (isset($_REQUEST['load_ajax'])) { sent_date = '".$data['sent_date'] ."', parent_id = '".$new_parent_id ."' , session_id = ".$new_session_id; - - if ($debug) echo $sql_add_publication; - $rest_insert = Database::query($sql_add_publication); + + if ($debug) echo $sql_add_publication; + $rest_insert = Database::query($sql_add_publication); if ($debug) var_dump($rest_insert); $id = Database::insert_id(); api_item_property_update($course_info, 'work', $id, 'DocumentAdded', $user_id); - $result_message[$TBL_STUDENT_PUBLICATION]++; - - $full_file_name = $course_dir.'/'.$doc_url; + $result_message[$TBL_STUDENT_PUBLICATION]++; + + $full_file_name = $course_dir.'/'.$doc_url; $new_file = $course_dir.'/'.$new_url; - + if (file_exists($full_file_name)) { //deleting old assignment - $result = copy($full_file_name, $new_file); + $result = copy($full_file_name, $new_file); if ($result) { - unlink($full_file_name); + unlink($full_file_name); $sql = "DELETE FROM $TBL_STUDENT_PUBLICATION WHERE id= ".$data['id']; if ($debug) var_dump($sql); - $result_delete = Database::query($sql); + $result_delete = Database::query($sql); api_item_property_update($course_info, 'work', $data['id'], 'DocumentDeleted', api_get_user_id()); } } } } - - } - } - - //9. Survey Pending - + + } + } + + //9. Survey Pending + //10. Dropbox - not neccesary to move categories (no presence of session_id) - + $sql = "SELECT id FROM $TBL_DROPBOX_FILE WHERE uploader_id = $user_id AND session_id = $origin_session_id AND c_id = $course_id"; - if ($debug) var_dump($sql); + if ($debug) var_dump($sql); $res = Database::query($sql); while($row = Database::fetch_array($res,'ASSOC')) { $id = $row['id']; if ($update_database) { $sql = "UPDATE $TBL_DROPBOX_FILE SET session_id = '$new_session_id' WHERE c_id = $course_id AND id = $id"; - if ($debug) var_dump($sql); - $res = Database::query($sql); + if ($debug) var_dump($sql); + $res = Database::query($sql); if ($debug) var_dump($res); - + $sql = "UPDATE $TBL_DROPBOX_POST SET session_id = '$new_session_id' WHERE file_id = $id"; - if ($debug) - var_dump($sql); + if ($debug) + var_dump($sql); $res = Database::query($sql); - if ($debug) - var_dump($res); + if ($debug) + var_dump($res); $result_message[$TBL_DROPBOX_FILE]++; - } - } - + } + } + //11. Notebook - - $sql = "SELECT notebook_id FROM $TBL_NOTEBOOK + + $sql = "SELECT notebook_id FROM $TBL_NOTEBOOK WHERE user_id = $user_id AND session_id = $origin_session_id AND course = '$origin_course_code' AND c_id = $course_id"; - if ($debug) var_dump($sql); + if ($debug) var_dump($sql); $res = Database::query($sql); while($row = Database::fetch_array($res,'ASSOC')) { - $id = $row['notebook_id']; - if ($update_database) { - $sql = "UPDATE $TBL_NOTEBOOK SET session_id = '$new_session_id' WHERE c_id = $course_id AND notebook_id = $id"; - if ($debug) var_dump($sql); + $id = $row['notebook_id']; + if ($update_database) { + $sql = "UPDATE $TBL_NOTEBOOK SET session_id = '$new_session_id' WHERE c_id = $course_id AND notebook_id = $id"; + if ($debug) var_dump($sql); $res = Database::query($sql); - if ($debug) var_dump($res); - } + if ($debug) var_dump($res); + } } - + if ($update_database) { echo '

'.get_lang('StatsMoved').'

'; - if (is_array($result_message)) + if (is_array($result_message)) foreach ($result_message as $table=>$times) { echo 'Table '.$table.' - '.$times.' records updated
'; - } - } else { - echo '

'.get_lang('UserInformationOfThisCourse').'

'; - - echo '
'; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
'; - - if ($origin_session_id == 0 ) { - echo '

'.get_lang('OriginCourse').'

'; - } else { - echo '

'.get_lang('OriginSession').' #'.$origin_session_id.'

'; } - compare_data($result_message); - echo '		'; - if ($new_session_id == 0 ) { - echo '

'.get_lang('DestinyCourse').'

'; - } else { - echo '

'.get_lang('DestinySession').' #'.$new_session_id.'

'; - } - compare_data($result_message_compare); - echo '
'; + } else { + echo '

'.get_lang('UserInformationOfThisCourse').'

'; + + echo '
'; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo '
'; + + if ($origin_session_id == 0 ) { + echo '

'.get_lang('OriginCourse').'

'; + } else { + echo '

'.get_lang('OriginSession').' #'.$origin_session_id.'

'; + } + compare_data($result_message); + echo '		'; + if ($new_session_id == 0 ) { + echo '

'.get_lang('DestinyCourse').'

'; + } else { + echo '

'.get_lang('DestinySession').' #'.$new_session_id.'

'; + } + compare_data($result_message_compare); + echo '
'; } } else { - echo get_lang('CourseDoesNotExistInThisSession'); + echo get_lang('CourseDoesNotExistInThisSession'); } } } else { - echo get_lang('ThereWasAnError'); + echo get_lang('ThereWasAnError'); } exit; } @@ -564,7 +559,7 @@ $htmlHeadXtra[] = ''; function get_courses_list_by_user_id_based_in_exercises($user_id) { $TABLETRACK_EXERCICES = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES); $user_id = intval($user_id); - //$sql = "SELECT DISTINCT exe_user_id, exe_cours_id as code, session_id as id_session FROM $TABLETRACK_EXERCICES WHERE exe_user_id = $user_id GROUP BY exe_user_id, exe_cours_id ORDER by exe_user_id, exe_cours_id ASC"; + //$sql = "SELECT DISTINCT exe_user_id, exe_cours_id as code, session_id as id_session FROM $TABLETRACK_EXERCICES WHERE exe_user_id = $user_id GROUP BY exe_user_id, exe_cours_id ORDER by exe_user_id, exe_cours_id ASC"; $sql = "SELECT DISTINCT exe_user_id, exe_cours_id as code, session_id as id_session FROM $TABLETRACK_EXERCICES WHERE exe_user_id = $user_id ORDER by exe_user_id, exe_cours_id ASC"; - + $res = Database::query($sql); $course_list = array(); while($row = Database::fetch_array($res,'ASSOC')) { - $course_list []= $row; + $course_list []= $row; } - return $course_list; + return $course_list; } @@ -624,13 +619,13 @@ $navigation = "$begin - $end / $count
"; if ($page > 1) { $navigation .=''.get_lang('Previous').''; } else { - $navigation .= get_lang('Previous'); + $navigation .= get_lang('Previous'); } $navigation .= ' '; $page ++; if ($page < $nro_pages) $navigation .= ''.get_lang('Next').''; -else +else $navigation .= get_lang('Next'); echo $navigation; @@ -639,7 +634,7 @@ $session_list = SessionManager::get_sessions_list(array(),array('name')); $options = ''; $options .= ''; foreach ($session_list as $session_data) { - $my_session_list[$session_data['id']] =$session_data['name']; + $my_session_list[$session_data['id']] =$session_data['name']; $options .= ''; } @@ -647,87 +642,94 @@ $combinations = array(); if (!empty($user_list)) { foreach ($user_list as $user) { - $user_id = $user['user_id']; - //if ($user_id != 78 ) continue; $name = $user['firstname'].' '.$user['lastname']; - $course_list_registered = CourseManager::get_courses_list_by_user_id($user_id, true, false); - + $course_list_registered = CourseManager::get_courses_list_by_user_id( + $user_id, + true, + false + ); + $new_course_list = array(); foreach ($course_list_registered as $course_reg) { if (empty($course_reg['id_session'])) { - $course_reg['id_session'] = 0; + $course_reg['id_session'] = 0; } - $new_course_list[] = $course_reg['code'].'_'.$course_reg['id_session']; + $new_course_list[] = $course_reg['code'].'_'.$course_reg['id_session']; } - + $course_list = get_courses_list_by_user_id_based_in_exercises($user_id); - + if (is_array($course_list) && !empty($course_list)) { foreach ($course_list as $my_course) { $key = $my_course['code'].'_'.$my_course['id_session']; - if(!in_array($key,$new_course_list)) { + + if (!in_array($key, $new_course_list)) { $my_course['not_registered'] = 1; - $course_list_registered[] = $my_course; - } + $course_list_registered[] = $my_course; + } } } + foreach ($course_list_registered as & $course) { + $courseInfo = api_get_course_info($course['code']); + $course['name'] = $courseInfo['name']; + } + $course_list = $course_list_registered; - - echo '
'; + + echo '
'; echo ''; - echo ''; - echo ''; - echo ''; - + echo ''; + echo ''; + echo ''; + if (!empty($course_list)) { - echo ''; - - foreach ($course_list as $course) { + echo ''; + foreach ($course_list as $course) { echo ''; + echo ''; } echo ''; echo ''; - + foreach ($course_list as $course) { $course_code = $course['code']; if (empty($course['id_session'])) { - $session_id = 0; + $session_id = 0; } else { - $session_id = $course['id_session']; + $session_id = $course['id_session']; } echo ''; } echo ''; } else { echo ''; - + } echo '
'; - echo "

$name #$user_id

"; - echo '
'; + echo "

$name #$user_id

"; + echo '
'; if (isset($course['id_session']) && !empty($course['id_session'])) { - echo ''.get_lang('SessionName').' '.$my_session_list[$course['id_session']].'
'; + echo ''.get_lang('SessionName').' '.$my_session_list[$course['id_session']].'
'; } - echo $course['title']; + echo $course['name']; echo ' ('.$course['code'].') '; if (isset($course['not_registered']) && !empty($course['not_registered'])) { - echo ' '.get_lang('UserNotRegistered').''; + echo ' '.get_lang('UserNotRegistered').''; } - echo '
'; echo get_lang('MoveTo'); echo '
'; $unique_id = uniqid(); $combinations[$unique_id] = array('course_code' =>$course_code, 'session_id'=>$session_id); - + echo ''; - echo '
'; - echo ''; - echo ''; - echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; echo '
'; - echo get_lang('NoCoursesForThisUser'); + echo get_lang('NoCoursesForThisUser'); echo '
'; echo '
'; @@ -735,5 +737,3 @@ if (!empty($user_list)) { } echo $navigation; $_SESSION['combination'] = $combinations; - - diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index 9e2558074a..acded9439b 100755 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -1379,7 +1379,7 @@ class CourseManager $session_id = intval($session_id); $course_code = Database::escape_string($course_code); $where = array(); - + if (empty($order_by)) { $order_by = 'user.lastname, user.firstname'; if (api_is_western_name_order()) { @@ -2643,12 +2643,13 @@ class CourseManager /** * Get list of courses for a given user - * @param int user ID - * @param boolean Whether to include courses from session or not + * @param int $user_id + * @param boolean $include_sessions Whether to include courses from session or not * @return array List of codes and db names * @author isaac flores paz */ - public static function get_courses_list_by_user_id($user_id, $include_sessions = false) { + public static function get_courses_list_by_user_id($user_id, $include_sessions = false) + { $user_id = intval($user_id); $course_list = array(); $codes = array();