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

Format code, add docs, remove unused code.

Browse Source
1.10.x
Julio Montoya 10 years ago
parent 111e5681a2
commit 42d12d826c
13 changed files with 441 additions and 414 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. 219
      main/exercice/TestCategory.php
  2. 6
      main/exercice/multiple_answer.class.php
  3. 1
      main/exercice/oral_expression.class.php
  4. 79
      main/exercice/question.class.php
  5. 13
      main/exercice/question_create.php
  6. 9
      main/exercice/question_list_admin.inc.php
  7. 3
      main/exercice/savescores.php
  8. 2
      main/exercice/showinframes.php
  9. 7
      main/exercice/stats.php

219
main/exercice/TestCategory.php
Unescape View File

@ -15,41 +15,45 @@ class TestCategory
/** /**
* Constructor of the class Category * Constructor of the class Category
* @author - Hubert Borderiou
* If you give an in_id and no in_name, you get info concerning the category of id=in_id * If you give an in_id and no in_name, you get info concerning the category of id=in_id
* otherwise, you've got an category objet avec your in_id, in_name, in_descr * otherwise, you've got an category objet avec your in_id, in_name, in_descr
* *
* @param int $in_id * @param int $id
* @param string $in_name * @param string $name
* @param string $in_description * @param string $description
*
* @author - Hubert Borderiou
*/ */
public function __construct($in_id=0, $in_name = '', $in_description="") public function __construct($id = 0, $name = '', $description = "")
{ {
if ($in_id != 0 && $in_name == "") { if ($id != 0 && $name == "") {
$tmpobj = new TestCategory(); $obj = new TestCategory();
$tmpobj->getCategory($in_id); $obj->getCategory($id);
$this->id = $tmpobj->id; $this->id = $obj->id;
$this->name = $tmpobj->name; $this->name = $obj->name;
$this->description = $tmpobj->description; $this->description = $obj->description;
} else { } else {
$this->id = $in_id; $this->id = $id;
$this->name = $in_name; $this->name = $name;
$this->description = $in_description; $this->description = $description;
} }
} }
/** /**
* return the TestCategory object with id=in_id * return the TestCategory object with id=in_id
* @param $in_id * @param int $id
*
* @return TestCategory
*/ */
public function getCategory($in_id) public function getCategory($id)
{ {
$t_cattable = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY); $table = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
$in_id = intval($in_id); $id = intval($id);
$sql = "SELECT * FROM $t_cattable WHERE id = $in_id AND c_id=".api_get_course_int_id(); $sql = "SELECT * FROM $table
WHERE id = $id AND c_id=".api_get_course_int_id();
$res = Database::query($sql); $res = Database::query($sql);
$numrows = Database::num_rows($res);
if ($numrows > 0) { if (Database::num_rows($res)) {
$row = Database::fetch_array($res); $row = Database::fetch_array($res);
$this->id = $row['id']; $this->id = $row['id'];
$this->name = $row['title']; $this->name = $row['title'];
@ -62,13 +66,13 @@ class TestCategory
*/ */
public function addCategoryInBDD() public function addCategoryInBDD()
{ {
$t_cattable = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY); $table = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
$v_name = $this->name; $v_name = $this->name;
$v_name = Database::escape_string($v_name); $v_name = Database::escape_string($v_name);
$v_description = $this->description; $v_description = $this->description;
$v_description = Database::escape_string($v_description); $v_description = Database::escape_string($v_description);
// check if name already exists // check if name already exists
$sql = "SELECT count(*) AS nb FROM $t_cattable $sql = "SELECT count(*) AS nb FROM $table
WHERE title = '$v_name' AND c_id=".api_get_course_int_id(); WHERE title = '$v_name' AND c_id=".api_get_course_int_id();
$result_verif = Database::query($sql); $result_verif = Database::query($sql);
$data_verif = Database::fetch_array($result_verif); $data_verif = Database::fetch_array($result_verif);
@ -80,11 +84,11 @@ class TestCategory
'title' => $v_name, 'title' => $v_name,
'description' => $v_description, 'description' => $v_description,
]; ];
$new_id = Database::insert($t_cattable, $params); $new_id = Database::insert($table, $params);
if ($new_id) { if ($new_id) {
$sql = "UPDATE $t_cattable SET id = iid WHERE iid = $new_id"; $sql = "UPDATE $table SET id = iid WHERE iid = $new_id";
Database::query($sql); Database::query($sql);
// add test_category in item_property table // add test_category in item_property table
@ -112,15 +116,17 @@ class TestCategory
*/ */
public function removeCategory() public function removeCategory()
{ {
$t_cattable = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY); $table = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
$tbl_question_rel_cat = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY); $tbl_question_rel_cat = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
$v_id = intval($this->id); $v_id = intval($this->id);
$sql = "DELETE FROM $t_cattable WHERE id=$v_id AND c_id=".api_get_course_int_id(); $course_id = api_get_course_int_id();
$sql = "DELETE FROM $table
WHERE id= $v_id AND c_id=".$course_id;
$result = Database::query($sql); $result = Database::query($sql);
if (Database::affected_rows($result) <= 0) { if (Database::affected_rows($result) <= 0) {
return false; return false;
} else { } else {
$course_id = api_get_course_int_id();
// remove link between question and category // remove link between question and category
$sql2 = "DELETE FROM $tbl_question_rel_cat $sql2 = "DELETE FROM $tbl_question_rel_cat
WHERE category_id = $v_id AND c_id=".$course_id; WHERE category_id = $v_id AND c_id=".$course_id;
@ -134,6 +140,7 @@ class TestCategory
'TestCategoryDeleted', 'TestCategoryDeleted',
api_get_user_id() api_get_user_id()
); );
return true; return true;
} }
} }
@ -143,11 +150,13 @@ class TestCategory
*/ */
public function modifyCategory() public function modifyCategory()
{ {
$t_cattable = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY); $table = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
$v_id = intval($this->id); $v_id = intval($this->id);
$v_name = Database::escape_string($this->name); $v_name = Database::escape_string($this->name);
$v_description = Database::escape_string($this->description); $v_description = Database::escape_string($this->description);
$sql = "UPDATE $t_cattable SET title='$v_name', description='$v_description' $sql = "UPDATE $table SET
title = '$v_name',
description = '$v_description'
WHERE id = $v_id AND c_id=".api_get_course_int_id(); WHERE id = $v_id AND c_id=".api_get_course_int_id();
$result = Database::query($sql); $result = Database::query($sql);
if (Database::affected_rows($result) <= 0) { if (Database::affected_rows($result) <= 0) {
@ -163,6 +172,7 @@ class TestCategory
'TestCategoryModified', 'TestCategoryModified',
api_get_user_id() api_get_user_id()
); );
return true; return true;
} }
} }
@ -172,9 +182,10 @@ class TestCategory
*/ */
public function getCategoryQuestionsNumber() public function getCategoryQuestionsNumber()
{ {
$t_reltable = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY); $table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
$in_id = intval($this->id); $in_id = intval($this->id);
$sql = "SELECT count(*) AS nb FROM $t_reltable $sql = "SELECT count(*) AS nb
FROM $table
WHERE category_id=$in_id AND c_id=".api_get_course_int_id(); WHERE category_id=$in_id AND c_id=".api_get_course_int_id();
$res = Database::query($sql); $res = Database::query($sql);
$row = Database::fetch_array($res); $row = Database::fetch_array($res);
@ -198,33 +209,41 @@ class TestCategory
* Otherwise, return an array of all in_field value * Otherwise, return an array of all in_field value
* in the database (in_field = id or name or description) * in the database (in_field = id or name or description)
*/ */
public static function getCategoryListInfo($in_field="", $in_courseid="") public static function getCategoryListInfo($in_field = "", $courseId = "")
{ {
if (empty($in_courseid) || $in_courseid=="") { if (empty($courseId) || $courseId=="") {
$in_courseid = api_get_course_int_id(); $courseId = api_get_course_int_id();
} }
$t_cattable = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY); $table = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
$in_field = Database::escape_string($in_field); $in_field = Database::escape_string($in_field);
$tabres = array(); $tabres = array();
if ($in_field == "") { if ($in_field == "") {
$sql = "SELECT * FROM $t_cattable WHERE c_id=$in_courseid ORDER BY title ASC"; $sql = "SELECT * FROM $table
WHERE c_id=$courseId ORDER BY title ASC";
$res = Database::query($sql); $res = Database::query($sql);
while ($row = Database::fetch_array($res)) { while ($row = Database::fetch_array($res)) {
$tmpcat = new TestCategory($row['id'], $row['title'], $row['description']); $tmpcat = new TestCategory(
$row['id'],
$row['title'],
$row['description']
);
$tabres[] = $tmpcat; $tabres[] = $tmpcat;
} }
} else { } else {
$sql = "SELECT $in_field FROM $t_cattable WHERE c_id=$in_courseid ORDER BY $in_field ASC"; $sql = "SELECT $in_field FROM $table
WHERE c_id = $courseId
ORDER BY $in_field ASC";
$res = Database::query($sql); $res = Database::query($sql);
while ($row = Database::fetch_array($res)) { while ($row = Database::fetch_array($res)) {
$tabres[] = $row[$in_field]; $tabres[] = $row[$in_field];
} }
} }
return $tabres; return $tabres;
} }
/** /**
* Return the TestCategory id for question with question_id = $in_questionid * Return the TestCategory id for question with question_id = $questionId
* In this version, a question has only 1 TestCategory. * In this version, a question has only 1 TestCategory.
* Return the TestCategory id, 0 if none * Return the TestCategory id, 0 if none
* @param int $questionId * @param int $questionId
@ -240,7 +259,8 @@ class TestCategory
} }
$table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY); $table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
$questionId = intval($questionId); $questionId = intval($questionId);
$sql = "SELECT category_id FROM $table $sql = "SELECT category_id
FROM $table
WHERE question_id = $questionId AND c_id = $courseId"; WHERE question_id = $questionId AND c_id = $courseId";
$res = Database::query($sql); $res = Database::query($sql);
if (Database::num_rows($res) > 0) { if (Database::num_rows($res) > 0) {
@ -254,29 +274,32 @@ class TestCategory
/** /**
* true if question id has a category * true if question id has a category
*/ */
public static function isQuestionHasCategory($in_questionid) public static function isQuestionHasCategory($questionId)
{ {
if (TestCategory::getCategoryForQuestion($in_questionid) > 0) { if (TestCategory::getCategoryForQuestion($questionId) > 0) {
return true; return true;
} }
return false; return false;
} }
/** /**
Return the category name for question with question_id = $in_questionid Return the category name for question with question_id = $questionId
In this version, a question has only 1 category. In this version, a question has only 1 category.
Return the category id, "" if none Return the category id, "" if none
*/ */
public static function getCategoryNameForQuestion($in_questionid, $in_courseid="") public static function getCategoryNameForQuestion(
{ $questionId,
if (empty($in_courseid) || $in_courseid=="") { $courseId = ""
$in_courseid = api_get_course_int_id(); ) {
if (empty($courseId) || $courseId=="") {
$courseId = api_get_course_int_id();
} }
$catid = TestCategory::getCategoryForQuestion($in_questionid, $in_courseid); $catid = TestCategory::getCategoryForQuestion($questionId, $courseId);
$result = ""; // result $result = ""; // result
$t_cattable = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY); $table = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
$catid = intval($catid); $catid = intval($catid);
$sql = "SELECT title FROM $t_cattable WHERE id = $catid AND c_id = $in_courseid"; $sql = "SELECT title FROM $table
WHERE id = $catid AND c_id = $courseId";
$res = Database::query($sql); $res = Database::query($sql);
$data = Database::fetch_array($res); $data = Database::fetch_array($res);
if (Database::num_rows($res) > 0) { if (Database::num_rows($res) > 0) {
@ -340,22 +363,26 @@ class TestCategory
/** /**
* return the number of question of a category id in a test * return the number of question of a category id in a test
* input : test_id, category_id * @param int $exerciseId
* return : integer * @param int $categoryId
* hubert.borderiou 07-04-2011 *
* @return integer
*
* @author hubert.borderiou 07-04-2011
*/ */
public static function getNumberOfQuestionsInCategoryForTest($in_testid, $in_categoryid) public static function getNumberOfQuestionsInCategoryForTest($exerciseId, $categoryId)
{ {
$nbCatResult = 0; $nbCatResult = 0;
$quiz = new Exercise(); $quiz = new Exercise();
$quiz->read($in_testid); $quiz->read($exerciseId);
$tabQuestionList = $quiz->selectQuestionList(); $tabQuestionList = $quiz->selectQuestionList();
// the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ? ? ? // the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ? ? ?
for ($i=1; $i <= count($tabQuestionList); $i++) { for ($i=1; $i <= count($tabQuestionList); $i++) {
if (TestCategory::getCategoryForQuestion($tabQuestionList[$i]) == $in_categoryid) { if (TestCategory::getCategoryForQuestion($tabQuestionList[$i]) == $categoryId) {
$nbCatResult++; $nbCatResult++;
} }
} }
return $nbCatResult; return $nbCatResult;
} }
@ -365,13 +392,13 @@ class TestCategory
* hubert.borderiou 07-04-2011 * hubert.borderiou 07-04-2011
* question without categories are not counted * question without categories are not counted
*/ */
public static function getNumberOfQuestionRandomByCategory($in_testid, $in_nbrandom) public static function getNumberOfQuestionRandomByCategory($exerciseId, $in_nbrandom)
{ {
$nbquestionresult = 0; $nbquestionresult = 0;
$tabcatid = TestCategory::getListOfCategoriesIDForTest($in_testid); $tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
for ($i=0; $i < count($tabcatid); $i++) { for ($i=0; $i < count($tabcatid); $i++) {
if ($tabcatid[$i] > 0) { // 0 = no category for this questio if ($tabcatid[$i] > 0) { // 0 = no category for this questio
$nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($in_testid, $tabcatid[$i]); $nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($exerciseId, $tabcatid[$i]);
if ($nbQuestionInThisCat > $in_nbrandom) { if ($nbQuestionInThisCat > $in_nbrandom) {
$nbquestionresult += $in_nbrandom; $nbquestionresult += $in_nbrandom;
} }
@ -387,13 +414,17 @@ class TestCategory
* Return an array (id=>name) * Return an array (id=>name)
* tabresult[0] = get_lang('NoCategory'); * tabresult[0] = get_lang('NoCategory');
* *
* @param int $courseId
*
* @return array
*
*/ */
public static function getCategoriesIdAndName($in_courseid="") public static function getCategoriesIdAndName($courseId = "")
{ {
if (empty($in_courseid) || $in_courseid=="") { if (empty($courseId)) {
$in_courseid = api_get_course_int_id(); $courseId = api_get_course_int_id();
} }
$tabcatobject = TestCategory::getCategoryListInfo("", $in_courseid); $tabcatobject = TestCategory::getCategoryListInfo("", $courseId);
$tabresult = array("0"=>get_lang('NoCategorySelected')); $tabresult = array("0"=>get_lang('NoCategorySelected'));
for ($i=0; $i < count($tabcatobject); $i++) { for ($i=0; $i < count($tabcatobject); $i++) {
$tabresult[$tabcatobject[$i]->id] = $tabcatobject[$i]->name; $tabresult[$tabcatobject[$i]->id] = $tabcatobject[$i]->name;
@ -406,16 +437,19 @@ class TestCategory
* tabres[0] = array of question id with category id = 0 (i.e. no category) * tabres[0] = array of question id with category id = 0 (i.e. no category)
* tabres[24] = array of question id with category id = 24 * tabres[24] = array of question id with category id = 24
* In this version, a question has 0 or 1 category * In this version, a question has 0 or 1 category
*
* @param int $exerciseId
* @return array
*/ */
public static function getQuestionsByCat($in_exerciseId) public static function getQuestionsByCat($exerciseId)
{ {
$TBL_EXERCISE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION); $TBL_EXERCISE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
$TBL_QUESTION_REL_CATEGORY = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY); $TBL_QUESTION_REL_CATEGORY = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
$in_exerciseId = intval($in_exerciseId); $exerciseId = intval($exerciseId);
$sql = "SELECT qrc.question_id, qrc.category_id $sql = "SELECT qrc.question_id, qrc.category_id
FROM $TBL_QUESTION_REL_CATEGORY qrc, $TBL_EXERCISE_QUESTION eq FROM $TBL_QUESTION_REL_CATEGORY qrc, $TBL_EXERCISE_QUESTION eq
WHERE WHERE
exercice_id=$in_exerciseId AND exercice_id=$exerciseId AND
eq.question_id=qrc.question_id AND eq.question_id=qrc.question_id AND
eq.c_id=".api_get_course_int_id()." AND eq.c_id=".api_get_course_int_id()." AND
eq.c_id=qrc.c_id eq.c_id=qrc.c_id
@ -448,17 +482,18 @@ class TestCategory
/** /**
* display the category * display the category
*/ */
public static function displayCategoryAndTitle($in_questionID, $in_display_category_name = 1) public static function displayCategoryAndTitle($questionId, $in_display_category_name = 1)
{ {
echo self::returnCategoryAndTitle($in_questionID, $in_display_category_name); echo self::returnCategoryAndTitle($questionId, $in_display_category_name);
} }
/** /**
* @param $in_questionID * @param int $questionId
* @param int $in_display_category_name * @param int $in_display_category_name
* @return null|string * @return null|string
*/ */
public static function returnCategoryAndTitle($in_questionID, $in_display_category_name = 1) { public static function returnCategoryAndTitle($questionId, $in_display_category_name = 1)
{
$is_student = !(api_is_allowed_to_edit(null,true) || api_is_session_admin()); $is_student = !(api_is_allowed_to_edit(null,true) || api_is_session_admin());
// @todo fix $_SESSION['objExercise'] // @todo fix $_SESSION['objExercise']
$objExercise = isset($_SESSION['objExercise']) ? $_SESSION['objExercise'] : null; $objExercise = isset($_SESSION['objExercise']) ? $_SESSION['objExercise'] : null;
@ -466,9 +501,9 @@ class TestCategory
$in_display_category_name = $objExercise->display_category_name; $in_display_category_name = $objExercise->display_category_name;
} }
$content = null; $content = null;
if (TestCategory::getCategoryNameForQuestion($in_questionID) != "" && ($in_display_category_name == 1 || !$is_student)) { if (TestCategory::getCategoryNameForQuestion($questionId) != "" && ($in_display_category_name == 1 || !$is_student)) {
$content .= '<div class="page-header">'; $content .= '<div class="page-header">';
$content .= '<h4>'.get_lang('Category').": ".TestCategory::getCategoryNameForQuestion($in_questionID).'</h4>'; $content .= '<h4>'.get_lang('Category').": ".TestCategory::getCategoryNameForQuestion($questionId).'</h4>';
$content .= "</div>"; $content .= "</div>";
} }
return $content; return $content;
@ -512,46 +547,20 @@ class TestCategory
return $tabResult; return $tabResult;
} }
/**
* return total score for test exe_id for all question in the category $in_cat_id for user
* If no question for this category, return ""
*/
public static function getCatScoreForExeidForUserid($in_cat_id, $in_exe_id, $in_user_id)
{
$tbl_track_attempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
$tbl_question_rel_category = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
$in_cat_id = intval($in_cat_id);
$in_exe_id = intval($in_exe_id);
$in_user_id = intval($in_user_id);
$query = "SELECT DISTINCT
marks, exe_id, user_id, ta.question_id, category_id
FROM $tbl_track_attempt ta , $tbl_question_rel_category qrc
WHERE
ta.question_id=qrc.question_id AND
qrc.category_id=$in_cat_id AND
exe_id=$in_exe_id AND user_id=$in_user_id";
$res = Database::query($query);
$totalcatscore = "";
while ($data = Database::fetch_array($res)) {
$totalcatscore += $data['marks'];
}
return $totalcatscore;
}
/** /**
* return the number max of question in a category * return the number max of question in a category
* count the number of questions in all categories, and return the max * count the number of questions in all categories, and return the max
* @param int $exerciseId
* @author - hubert borderiou * @author - hubert borderiou
*/ */
public static function getNumberMaxQuestionByCat($in_testid) public static function getNumberMaxQuestionByCat($exerciseId)
{ {
$res_num_max = 0; $res_num_max = 0;
// foreach question // foreach question
$tabcatid = TestCategory::getListOfCategoriesIDForTest($in_testid); $tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
for ($i=0; $i < count($tabcatid); $i++) { for ($i=0; $i < count($tabcatid); $i++) {
if ($tabcatid[$i] > 0) { // 0 = no category for this question if ($tabcatid[$i] > 0) { // 0 = no category for this question
$nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($in_testid, $tabcatid[$i]); $nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($exerciseId, $tabcatid[$i]);
if ($nbQuestionInThisCat > $res_num_max) { if ($nbQuestionInThisCat > $res_num_max) {
$res_num_max = $nbQuestionInThisCat; $res_num_max = $nbQuestionInThisCat;
} }
@ -663,14 +672,14 @@ class TestCategory
*/ */
public static function add_category_for_question_id($in_category_id, $in_question_id, $in_course_c_id) public static function add_category_for_question_id($in_category_id, $in_question_id, $in_course_c_id)
{ {
$tbl_reltable = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY); $table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
// if question doesn't have a category // if question doesn't have a category
// @todo change for 1.10 when a question can have several categories // @todo change for 1.10 when a question can have several categories
if (TestCategory::getCategoryForQuestion($in_question_id, $in_course_c_id) == 0 && if (TestCategory::getCategoryForQuestion($in_question_id, $in_course_c_id) == 0 &&
$in_question_id > 0 && $in_question_id > 0 &&
$in_course_c_id > 0 $in_course_c_id > 0
) { ) {
$sql = "INSERT INTO $tbl_reltable $sql = "INSERT INTO $table
VALUES (".intval($in_course_c_id).", ".intval($in_question_id).", ".intval($in_category_id).")"; VALUES (".intval($in_course_c_id).", ".intval($in_question_id).", ".intval($in_category_id).")";
Database::query($sql); Database::query($sql);
} }

6
main/exercice/multiple_answer.class.php
Unescape View File

@ -143,7 +143,7 @@ class MultipleAnswer extends Question
$buttonGroup = []; $buttonGroup = [];
global $text, $class; global $text;
if ($obj_ex->edit_exercise_in_lp == true) { if ($obj_ex->edit_exercise_in_lp == true) {
// setting the save button here and not in the question class.php // setting the save button here and not in the question class.php
$buttonGroup[] = $form->addButtonDelete(get_lang('LessAnswer'), 'lessAnswers', true); $buttonGroup[] = $form->addButtonDelete(get_lang('LessAnswer'), 'lessAnswers', true);
@ -171,8 +171,8 @@ class MultipleAnswer extends Question
* @param the formvalidator instance * @param the formvalidator instance
* @param the answers number to display * @param the answers number to display
*/ */
function processAnswersCreation($form) { function processAnswersCreation($form)
{
$questionWeighting = $nbrGoodAnswers = 0; $questionWeighting = $nbrGoodAnswers = 0;
$objAnswer = new Answer($this->id); $objAnswer = new Answer($this->id);
$nb_answers = $form->getSubmitValue('nb_answers'); $nb_answers = $form->getSubmitValue('nb_answers');

1
main/exercice/oral_expression.class.php
Unescape View File

@ -6,6 +6,7 @@
* This class allows to instantiate an object of type FREE_ANSWER, * This class allows to instantiate an object of type FREE_ANSWER,
* extending the class question * extending the class question
* @author Eric Marguin * @author Eric Marguin
*
* @package chamilo.exercise * @package chamilo.exercise
*/ */
class OralExpression extends Question class OralExpression extends Question

79
main/exercice/question.class.php
Unescape View File

@ -95,11 +95,12 @@ abstract class Question
/** /**
* Reads question information from the data base * Reads question information from the data base
* *
* @author Olivier Brouckaert
* @param int $id - question ID * @param int $id - question ID
* @param int $course_id * @param int $course_id
* *
* @return Question * @return Question
*
* @author Olivier Brouckaert
*/ */
public static function read($id, $course_id = null) public static function read($id, $course_id = null)
{ {
@ -177,7 +178,7 @@ abstract class Question
* *
* @author Olivier Brouckaert * @author Olivier Brouckaert
* *
* @return - integer - question ID * @return integer - question ID
*/ */
public function selectId() public function selectId()
{ {
@ -300,9 +301,9 @@ abstract class Question
/** /**
* changes the question title * changes the question title
* *
* @author Olivier Brouckaert
*
* @param string $title - question title * @param string $title - question title
*
* @author Olivier Brouckaert
*/ */
public function updateTitle($title) public function updateTitle($title)
{ {
@ -320,9 +321,10 @@ abstract class Question
/** /**
* changes the question description * changes the question description
* *
* @param string $description - question description
*
* @author Olivier Brouckaert * @author Olivier Brouckaert
* *
* @param string $description - question description
*/ */
public function updateDescription($description) public function updateDescription($description)
{ {
@ -332,8 +334,9 @@ abstract class Question
/** /**
* changes the question weighting * changes the question weighting
* *
* @author Olivier Brouckaert
* @param integer $weighting - question weighting * @param integer $weighting - question weighting
*
* @author Olivier Brouckaert
*/ */
public function updateWeighting($weighting) public function updateWeighting($weighting)
{ {
@ -341,39 +344,44 @@ abstract class Question
} }
/** /**
* @param array $category
*
* @author Hubert Borderiou 12-10-2011 * @author Hubert Borderiou 12-10-2011
* @param array of category $in_category *
*/ */
public function updateCategory($in_category) public function updateCategory($category)
{ {
$this->category = $in_category; $this->category = $category;
} }
/** /**
* @param int $value
*
* @author Hubert Borderiou 12-10-2011 * @author Hubert Borderiou 12-10-2011
* @param int $in_positive
*/ */
public function updateScoreAlwaysPositive($in_positive) public function updateScoreAlwaysPositive($value)
{ {
$this->scoreAlwaysPositive = $in_positive; $this->scoreAlwaysPositive = $value;
} }
/** /**
* @param int $value
*
* @author Hubert Borderiou 12-10-2011 * @author Hubert Borderiou 12-10-2011
* @param int $in_positive
*/ */
public function updateUncheckedMayScore($in_positive) public function updateUncheckedMayScore($value)
{ {
$this->uncheckedMayScore = $in_positive; $this->uncheckedMayScore = $value;
} }
/** /**
* Save category of a question * Save category of a question
* *
* A question can have n categories * A question can have n categories if category is empty,
* if category is empty, then question has no category then delete the category entry * then question has no category then delete the category entry
*
* @param array $category_list
* *
* @param - int $in_positive
* @author Julio Montoya - Adding multiple cat support * @author Julio Montoya - Adding multiple cat support
*/ */
public function saveCategories($category_list) public function saveCategories($category_list)
@ -406,20 +414,21 @@ abstract class Question
} }
/** /**
* @author Hubert Borderiou 12-10-2011
* @param int $in_category
* in this version, a question can only have 1 category * in this version, a question can only have 1 category
* if category is 0, then question has no category then delete the category entry * if category is 0, then question has no category then delete the category entry
* @param int $category
*
* @author Hubert Borderiou 12-10-2011
*/ */
public function saveCategory($in_category) public function saveCategory($category)
{ {
if ($in_category <= 0) { if ($category <= 0) {
$this->deleteCategory(); $this->deleteCategory();
} else { } else {
// update or add category for a question // update or add category for a question
$table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY); $table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
$category_id = intval($in_category); $category_id = intval($category);
$question_id = intval($this->id); $question_id = intval($this->id);
$sql = "SELECT count(*) AS nb FROM $table $sql = "SELECT count(*) AS nb FROM $table
WHERE question_id = $question_id AND c_id=" . api_get_course_int_id(); WHERE question_id = $question_id AND c_id=" . api_get_course_int_id();
@ -440,7 +449,6 @@ abstract class Question
/** /**
* @author hubert borderiou 12-10-2011 * @author hubert borderiou 12-10-2011
* delete any category entry for question id * delete any category entry for question id
* @param : none
* delete the category for question * delete the category for question
*/ */
public function deleteCategory() public function deleteCategory()
@ -455,8 +463,9 @@ abstract class Question
/** /**
* changes the question position * changes the question position
* *
* @author Olivier Brouckaert
* @param integer $position - question position * @param integer $position - question position
*
* @author Olivier Brouckaert
*/ */
public function updatePosition($position) public function updatePosition($position)
{ {
@ -466,8 +475,9 @@ abstract class Question
/** /**
* changes the question level * changes the question level
* *
* @author Nicolas Raynaud
* @param integer $level - question level * @param integer $level - question level
*
* @author Nicolas Raynaud
*/ */
public function updateLevel($level) public function updateLevel($level)
{ {
@ -478,8 +488,9 @@ abstract class Question
* changes the answer type. If the user changes the type from "unique answer" to "multiple answers" * changes the answer type. If the user changes the type from "unique answer" to "multiple answers"
* (or conversely) answers are not deleted, otherwise yes * (or conversely) answers are not deleted, otherwise yes
* *
* @author Olivier Brouckaert
* @param integer $type - answer type * @param integer $type - answer type
*
* @author Olivier Brouckaert
*/ */
public function updateType($type) public function updateType($type)
{ {
@ -509,10 +520,13 @@ abstract class Question
/** /**
* adds a picture to the question * adds a picture to the question
* *
* @author Olivier Brouckaert
* @param string $Picture - temporary path of the picture to upload * @param string $Picture - temporary path of the picture to upload
* @param string $PictureName - Name of the picture * @param string $PictureName - Name of the picture
* @param string $picturePath
*
* @return boolean - true if uploaded, otherwise false * @return boolean - true if uploaded, otherwise false
*
* @author Olivier Brouckaert
*/ */
public function uploadPicture($Picture, $PictureName, $picturePath = null) public function uploadPicture($Picture, $PictureName, $picturePath = null)
{ {
@ -566,10 +580,12 @@ abstract class Question
/** /**
* Resizes a picture || Warning!: can only be called after uploadPicture, * Resizes a picture || Warning!: can only be called after uploadPicture,
* or if picture is already available in object. * or if picture is already available in object.
* @author Toon Keppens
* @param string $Dimension - Resizing happens proportional according to given dimension: height|width|any * @param string $Dimension - Resizing happens proportional according to given dimension: height|width|any
* @param integer $Max - Maximum size * @param integer $Max - Maximum size
*
* @return boolean - true if success, false if failed * @return boolean - true if success, false if failed
*
* @author Toon Keppens
*/ */
public function resizePicture($Dimension, $Max) public function resizePicture($Dimension, $Max)
{ {
@ -673,7 +689,8 @@ abstract class Question
$result = @copy($source_path . '/' . $this->picture, $destination_path . '/' . $picture) ? true : false; $result = @copy($source_path . '/' . $this->picture, $destination_path . '/' . $picture) ? true : false;
// If copy was correct then add to the database // If copy was correct then add to the database
if ($result) { if ($result) {
$sql = "UPDATE $TBL_QUESTIONS SET picture='" . Database::escape_string($picture) . "' $sql = "UPDATE $TBL_QUESTIONS SET
picture = '" . Database::escape_string($picture) . "'
WHERE c_id = $course_id AND id='" . intval($questionId) . "'"; WHERE c_id = $course_id AND id='" . intval($questionId) . "'";
Database::query($sql); Database::query($sql);
@ -1146,7 +1163,7 @@ abstract class Question
c_id = $course_id c_id = $course_id
AND exercice_id = " . intval($exerciseId) . " AND exercice_id = " . intval($exerciseId) . "
AND question_order > " . $row['question_order']; AND question_order > " . $row['question_order'];
$res = Database::query($sql); Database::query($sql);
} }
} }

13
main/exercice/question_create.php
Unescape View File

@ -29,7 +29,13 @@ $question_list_options = array();
foreach ($question_list as $key=> $value) { foreach ($question_list as $key=> $value) {
$question_list_options[$key] = addslashes(get_lang($value[1])); $question_list_options[$key] = addslashes(get_lang($value[1]));
} }
$form->addElement('select', 'question_type_hidden', get_lang('QuestionType'), $question_list_options, array('id' => 'question_type_hidden')); $form->addElement(
'select',
'question_type_hidden',
get_lang('QuestionType'),
$question_list_options,
array('id' => 'question_type_hidden')
);
//session id //session id
$session_id = api_get_session_id(); $session_id = api_get_session_id();
@ -38,7 +44,10 @@ $session_id = api_get_session_id();
$tbl_exercises = Database :: get_course_table(TABLE_QUIZ_TEST); $tbl_exercises = Database :: get_course_table(TABLE_QUIZ_TEST);
$course_id = api_get_course_int_id(); $course_id = api_get_course_int_id();
$sql = "SELECT id,title,type,description, results_disabled FROM $tbl_exercises WHERE c_id = $course_id AND active<>'-1' AND session_id=".$session_id." ORDER BY title ASC"; $sql = "SELECT id,title,type,description, results_disabled
FROM $tbl_exercises
WHERE c_id = $course_id AND active<>'-1' AND session_id=".$session_id."
ORDER BY title ASC";
$result = Database::query($sql); $result = Database::query($sql);
$exercises['-'] = '-'.get_lang('SelectExercise').'-'; $exercises['-'] = '-'.get_lang('SelectExercise').'-';
while ($row = Database :: fetch_array($result)) { while ($row = Database :: fetch_array($result)) {

9
main/exercice/question_list_admin.inc.php
Unescape View File

@ -171,13 +171,8 @@ if (!$inATest) {
$objQuestionTmp = Question::read($id); $objQuestionTmp = Question::read($id);
$question_class = get_class($objQuestionTmp); $question_class = get_class($objQuestionTmp);
$clone_link = '<a href="'.api_get_self().'?'.api_get_cidreq().'&clone_question='.$id.'">'.Display::return_icon('cd.gif',get_lang('Copy'), array(), ICON_SIZE_SMALL).'</a>'; $clone_link = '<a href="'.api_get_self().'?'.api_get_cidreq().'&clone_question='.$id.'">'.
/*$edit_link = '<a href="'.api_get_self().'?'.api_get_cidreq().'&type='.$objQuestionTmp->selectType().'&myid=1&editQuestion='.$id.'">'.Display::return_icon('edit.png',get_lang('Modify'), array(), ICON_SIZE_SMALL).'</a>'; Display::return_icon('cd.gif',get_lang('Copy'), array(), ICON_SIZE_SMALL).'</a>';
if ($objQuestionTmp->type == CALCULATED_ANSWER && $objQuestionTmp->isAnswered()) {
$edit_link = '<a>'.Display::return_icon('edit_na.png',get_lang('Modify'), array(), ICON_SIZE_SMALL).'</a>';
}*/
$edit_link = ($objQuestionTmp->type == CALCULATED_ANSWER && $objQuestionTmp->isAnswered()) ? $edit_link = ($objQuestionTmp->type == CALCULATED_ANSWER && $objQuestionTmp->isAnswered()) ?
'<a>'.Display::return_icon( '<a>'.Display::return_icon(
'edit_na.png', 'edit_na.png',

3
main/exercice/savescores.php
Unescape View File

@ -1,10 +1,9 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
/** /**
* Saving the scores. * Saving the scores.
* @package chamilo.exercise * @package chamilo.exercise
* @author
* @version $Id: savescores.php 15602 2008-06-18 08:52:24Z pcool $
*/ */
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
$courseInfo = api_get_course_info(); $courseInfo = api_get_course_info();

2
main/exercice/showinframes.php
Unescape View File

@ -1,10 +1,12 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
/** /**
* Code library for HotPotatoes integration. * Code library for HotPotatoes integration.
* @package chamilo.exercise * @package chamilo.exercise
* @author Istvan Mandak * @author Istvan Mandak
*/ */
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
require_once api_get_path(SYS_CODE_PATH).'exercice/hotpotatoes.lib.php'; require_once api_get_path(SYS_CODE_PATH).'exercice/hotpotatoes.lib.php';
$_course = api_get_course_info(); $_course = api_get_course_info();

7
main/exercice/stats.php
Unescape View File

@ -2,6 +2,7 @@
/* See license terms in /license.txt */ /* See license terms in /license.txt */
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
$this_section = SECTION_COURSES; $this_section = SECTION_COURSES;
$exercise_id = isset($_GET['exerciseId']) && !empty($_GET['exerciseId']) ? intval($_GET['exerciseId']) : 0; $exercise_id = isset($_GET['exerciseId']) && !empty($_GET['exerciseId']) ? intval($_GET['exerciseId']) : 0;
@ -251,7 +252,6 @@ if (!empty($question_list)) {
} }
$id++; $id++;
} }
} }
} }
@ -281,11 +281,6 @@ $interbreadcrumb[] = array("url" => "exercise.php?gradebook=$gradebook&".api_get
$interbreadcrumb[] = array("url" => "admin.php?exerciseId=$exercise_id&".api_get_cidreq(), "name" => $objExercise->name); $interbreadcrumb[] = array("url" => "admin.php?exerciseId=$exercise_id&".api_get_cidreq(), "name" => $objExercise->name);
$tpl = new Template(get_lang('ReportByQuestion')); $tpl = new Template(get_lang('ReportByQuestion'));
//$actions = array();
//$actions[]= array(get_lang('Back'), Display::return_icon('back.png', get_lang('Back'), 'exercise_report.php?'.$exercise_id));
//$tpl->set_actions($actions);
$actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">' . $actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">' .
Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>'; Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>';
$actions = Display::div($actions, array('class'=> 'actions')); $actions = Display::div($actions, array('class'=> 'actions'));

Write Preview
Loading…
Cancel
Save