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

Fixing exercise export see #5499

Browse Source
skala
Julio Montoya 13 years ago
parent d64ca6bfda
commit eeb6e0be4f
4 changed files with 37 additions and 36 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. 27
      main/coursecopy/classes/CourseBuilder.class.php
  2. 1
      main/coursecopy/classes/CourseRecycler.class.php
  3. 43
      main/coursecopy/classes/CourseRestorer.class.php
  4. 2
      main/coursecopy/classes/QuizQuestion.class.php

27
main/coursecopy/classes/CourseBuilder.class.php
Unescape View File

@ -66,8 +66,8 @@ class CourseBuilder {
$_course = $course;
}
$this->course = new Course();
$this->course->code = $_course['official_code'];
$this->course = new Course();
$this->course->code = $_course['official_code'];
$this->course->type = $type;
$this->course->path = api_get_path(SYS_COURSE_PATH).$_course['path'].'/';
$this->course->backup_path = api_get_path(SYS_COURSE_PATH).$_course['path'];
@ -161,19 +161,19 @@ class CourseBuilder {
}
foreach ($this->course->resources as $type => $resources) {
foreach ($resources as $id => $resource){
foreach ($resources as $id => $resource) {
$tool = $resource->get_tool();
if ($tool != null) {
$sql = "SELECT * FROM $table_properties WHERE c_id = $course_id AND TOOL = '".$tool."' AND ref='".$resource->get_id()."'";
$res = Database::query($sql);
$all_properties = array ();
while ($item_property = Database::fetch_array($res)) {
$all_properties[] = $item_property;
$all_properties[]= $item_property;
}
$this->course->resources[$type][$id]->item_properties = $all_properties;
}
}
}
}
return $this->course;
}
@ -424,7 +424,7 @@ class CourseBuilder {
$table_rel = Database :: get_course_table(TABLE_QUIZ_TEST_QUESTION);
$table_doc = Database :: get_course_table(TABLE_DOCUMENT);
$course_id = $course_info['real_id'];
$course_id = $course_info['real_id'];
if (!empty($course_code) && !empty($session_id)) {
$session_id = intval($session_id);
@ -432,13 +432,12 @@ class CourseBuilder {
$session_condition = api_get_session_condition($session_id, true, true);
} else {
$session_condition = api_get_session_condition($session_id, true);
}
$session_id = intval($session_id);
}
$sql = "SELECT * FROM $table_qui WHERE c_id = $course_id AND active >=0 $session_condition"; //select only quizzes with active = 0 or 1 (not -1 which is for deleted quizzes)
} else {
$sql = "SELECT * FROM $table_qui WHERE c_id = $course_id AND active >=0 AND session_id = 0"; //select only quizzes with active = 0 or 1 (not -1 which is for deleted quizzes)
}
$db_result = Database::query($sql);
while ($obj = Database::fetch_object($db_result)) {
if (strlen($obj->sound) > 0) {
@ -449,11 +448,11 @@ class CourseBuilder {
}
$quiz = new Quiz($obj->id, $obj->title, $obj->description, $obj->random, $obj->type, $obj->active, $obj->sound, $obj->max_attempt,
$obj->results_disabled, $obj->access_condition, $obj->start_time, $obj->end_time, $obj->feedback_type, $obj->random_answers, $obj->expired_time, $obj->session_id);
$sql = 'SELECT * FROM '.$table_rel.' WHERE c_id = '.$course_id.' AND exercice_id = '.$obj->id;
$sql = 'SELECT * FROM '.$table_rel.' WHERE c_id = '.$course_id.' AND exercice_id = '.$obj->id;
$db_result2 = Database::query($sql);
while ($obj2 = Database::fetch_object($db_result2)) {
$quiz->add_question($obj2->question_id, $obj2->question_order);
}
}
$this->course->add_resource($quiz);
}
@ -480,7 +479,7 @@ class CourseBuilder {
$sql = "SELECT * FROM $table_que WHERE c_id = $course_id ";
$db_result = Database::query($sql);
while ($obj = Database::fetch_object($db_result)) {
while ($obj = Database::fetch_object($db_result)) {
$question = new QuizQuestion($obj->id, $obj->question, $obj->description, $obj->ponderation, $obj->type, $obj->position, $obj->picture, $obj->level, $obj->extra);
$sql = 'SELECT * FROM '.$table_ans.' WHERE c_id = '.$course_id.' AND question_id = '.$obj->id;
$db_result2 = Database::query($sql);
@ -504,7 +503,7 @@ class CourseBuilder {
if (Database::num_rows($db_result) > 0) {
$build_orphan_questions = true;
while ($obj = Database::fetch_object($db_result)) {
$question = new QuizQuestion($obj->id, $obj->question, $obj->description, $obj->ponderation, $obj->type, $obj->position, $obj->picture,$obj->level, $obj->extra);
$question = new QuizQuestion($obj->id.$course_id, $obj->question, $obj->description, $obj->ponderation, $obj->type, $obj->position, $obj->picture,$obj->level, $obj->extra);
$sql = "SELECT * FROM $table_ans WHERE c_id = $course_id AND question_id = ".$obj->id;
$db_result2 = Database::query($sql);
if (Database::num_rows($db_result2)) {
@ -515,6 +514,7 @@ class CourseBuilder {
$this->course->add_resource($question);
}
}
if ($build_orphan_questions) {
//$this->course->add_resource(new Quiz(-1, get_lang('OrphanQuestions', ''), '', 0, 0, 1, '', 0));
}
@ -556,6 +556,7 @@ class CourseBuilder {
}
}
}
/**
* Build the Surveys
*/

1
main/coursecopy/classes/CourseRecycler.class.php
Unescape View File

@ -264,6 +264,7 @@ class CourseRecycler
Database::query($sql);
}
}
/**
* Recycle quizzes - doesn't remove the questions and their answers, as they might still be used later
*/

43
main/coursecopy/classes/CourseRestorer.class.php
Unescape View File

@ -324,8 +324,7 @@ class CourseRestorer
}
$new = substr($document->path, 8);
if (!is_dir($path.'document'.$new)) {
//var_dump($path.'document'.$new);
if (!is_dir($path.'document'.$new)) {
$created_dir = create_unexisting_directory($course_info, api_get_user_id(), $my_session_id, 0, 0 ,$path.'document', $new, $title, $visibility);
}
} elseif ($document->file_type == DOCUMENT) {
@ -359,9 +358,7 @@ class CourseRestorer
}
}
if (file_exists($path.$document->path)) {
//var_dump($this->file_option);
if (file_exists($path.$document->path)) {
switch ($this->file_option) {
case FILE_OVERWRITE :
$origin_path = $this->course->backup_path.'/'.$document->path;
@ -1222,8 +1219,10 @@ class CourseRestorer
// $id = -1 identifies the fictionary test for collecting orphan questions. We do not store it in the database.
$new_id = -1;
}
$this->course->resources[RESOURCE_QUIZ][$id]->destination_id = $new_id;
$order = 0;
///var_dump($quiz->title);var_dump($quiz->question_ids);
foreach ($quiz->question_ids as $index => $question_id) {
$qid = $this->restore_quiz_question($question_id);
$question_order = $quiz->question_orders[$index] ? $quiz->question_orders[$index] : ++$order;
@ -1238,10 +1237,10 @@ class CourseRestorer
* Restore quiz-questions
*/
function restore_quiz_question($id) {
$resources = $this->course->resources;
$question = $resources[RESOURCE_QUIZQUESTION][$id];
$new_id=0;
$resources = $this->course->resources;
$question = $resources[RESOURCE_QUIZQUESTION][$id];
$new_id = 0;
if (is_object($question)) {
if ($question->is_restored()) {
@ -1255,20 +1254,20 @@ class CourseRestorer
$question->description = DocumentManager::replace_urls_inside_content_html_from_copy_course($question->description, $this->course->code, $this->course->destination_path);
$sql = "INSERT INTO ".$table_que." SET
c_id = ".$this->destination_course_id." ,
question = '".self::DBUTF8escapestring($question->question)."',
description = '".self::DBUTF8escapestring($question->description)."',
ponderation = '".self::DBUTF8escapestring($question->ponderation)."',
position = '".self::DBUTF8escapestring($question->position)."',
type='".self::DBUTF8escapestring($question->quiz_type)."',
picture='".self::DBUTF8escapestring($question->picture)."',
level='".self::DBUTF8escapestring($question->level)."',
extra='".self::DBUTF8escapestring($question->extra)."'";
c_id = ".$this->destination_course_id." ,
question = '".self::DBUTF8escapestring($question->question)."',
description = '".self::DBUTF8escapestring($question->description)."',
ponderation = '".self::DBUTF8escapestring($question->ponderation)."',
position = '".self::DBUTF8escapestring($question->position)."',
type='".self::DBUTF8escapestring($question->quiz_type)."',
picture='".self::DBUTF8escapestring($question->picture)."',
level='".self::DBUTF8escapestring($question->level)."',
extra='".self::DBUTF8escapestring($question->extra)."'";
Database::query($sql);
$new_id = Database::insert_id();
if ($question->quiz_type == MATCHING) { // for answer type matching
$answerid = 0;
$new_id = Database::insert_id();
if ($question->quiz_type == MATCHING) {
$t = array();
foreach ($question->answers as $index => $answer) {
$t[$answer['position']] = $answer;

2
main/coursecopy/classes/QuizQuestion.class.php
Unescape View File

@ -58,7 +58,7 @@ class QuizQuestion extends Resource
* @param int $position
*/
function QuizQuestion($id,$question,$description,$ponderation,$type,$position,$picture,$level, $extra) {
parent::Resource($id,RESOURCE_QUIZQUESTION);
parent::Resource($id, RESOURCE_QUIZQUESTION);
$this->question = $question;
$this->description = $description;
$this->ponderation = $ponderation;

Write Preview
Loading…
Cancel
Save