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

Rename Testcategory to TestCategory

Browse Source
1.10.x
Julio Montoya 10 years ago
parent f9ca7d8dfb
commit a83a4af79b
11 changed files with 62 additions and 62 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. 8
      main/coursecopy/classes/CourseBuilder.class.php
  2. 2
      main/coursecopy/classes/CourseRecycler.class.php
  3. 14
      main/coursecopy/classes/CourseRestorer.class.php
  4. 58
      main/exercice/TestCategory.php
  5. 4
      main/exercice/exercice.php
  6. 8
      main/exercice/exercise.class.php
  7. 2
      main/exercice/exercise_show.php
  8. 2
      main/exercice/question_list_admin.inc.php
  9. 6
      main/exercice/question_pool.php
  10. 14
      main/exercice/tests_category.php
  11. 6
      main/inc/lib/exercise.lib.php

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

@ -621,7 +621,7 @@ class CourseBuilder
while ($obj = Database::fetch_object($db_result)) {
// find the question category
// @todo : need to be adapted for multi category questions in 1.10
$question_category_id = Testcategory::getCategoryForQuestion(
$question_category_id = TestCategory::getCategoryForQuestion(
$obj->id,
$course_id
);
@ -712,7 +712,7 @@ class CourseBuilder
if (!isset($this->course->resources[$obj->id])) {
// find the question category
// @todo : need to be adapted for multi category questions in 1.10
$question_category_id = Testcategory::getCategoryForQuestion(
$question_category_id = TestCategory::getCategoryForQuestion(
$obj->id,
$course_id
);
@ -850,12 +850,12 @@ class CourseBuilder
$course_id = api_get_course_int_id();
// get all test category in course
$tab_test_categories_id = Testcategory::getCategoryListInfo(
$tab_test_categories_id = TestCategory::getCategoryListInfo(
"id",
$course_id
);
foreach ($tab_test_categories_id as $test_category_id) {
$test_category = new Testcategory($test_category_id);
$test_category = new TestCategory($test_category_id);
$copy_course_test_category = new CourseCopyTestcategory(
$test_category_id,
$test_category->name,

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

@ -459,7 +459,7 @@ class CourseRecycler
{
if (isset($this->course->resources[RESOURCE_TEST_CATEGORY])) {
foreach ($this->course->resources[RESOURCE_TEST_CATEGORY] as $tab_test_cat) {
$obj_cat = new Testcategory($tab_test_cat->source_id);
$obj_cat = new TestCategory($tab_test_cat->source_id);
$obj_cat->removeCategory();
}
}

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

@ -1731,25 +1731,25 @@ class CourseRestorer
$title = $CourseCopyTestcategory->title;
$description = $CourseCopyTestcategory->description;
if (Testcategory::category_exists_with_title($title)) {
if (TestCategory::category_exists_with_title($title)) {
switch ($this->file_option) {
case FILE_SKIP:
//Do nothing
break;
case FILE_RENAME:
$new_title = $title."_";
while (Testcategory::category_exists_with_title(
while (TestCategory::category_exists_with_title(
$new_title
)) {
$new_title .= "_";
}
$test_category = new Testcategory(0, $new_title, $description);
$test_category = new TestCategory(0, $new_title, $description);
$new_id = $test_category->addCategoryInBDD();
$tab_test_category_id_old_new[$CourseCopyTestcategory->source_id] = $new_id;
break;
case FILE_OVERWRITE:
$id = Testcategory::get_category_id_for_title($title);
$my_cat = new Testcategory($id);
$id = TestCategory::get_category_id_for_title($title);
$my_cat = new TestCategory($id);
$my_cat->name = $title;
$my_cat->modifyCategory();
$tab_test_category_id_old_new[$CourseCopyTestcategory->source_id] = $id;
@ -1757,7 +1757,7 @@ class CourseRestorer
}
} else {
// create a new test_category
$test_category = new Testcategory(0, $title, $description);
$test_category = new TestCategory(0, $title, $description);
$new_id = $test_category->addCategoryInBDD();
$tab_test_category_id_old_new[$CourseCopyTestcategory->source_id] = $new_id;
}
@ -1774,7 +1774,7 @@ class CourseRestorer
$new_quiz_question_id = $resources[RESOURCE_QUIZQUESTION][$id]->destination_id;
$question_category = $CourseCopyQuestion->question_category;
if ($question_category > 0) {
Testcategory::add_category_for_question_id(
TestCategory::add_category_for_question_id(
$tab_test_category_id_old_new[$question_category],
$new_quiz_question_id,
$course_id

58
main/exercice/testcategory.class.php → main/exercice/TestCategory.php
Unescape View File

@ -2,12 +2,12 @@
/* For licensing terms, see /license.txt */
/**
* Class Testcategory
* Class TestCategory
* @author hubert.borderiou
* @author Julio Montoya - several fixes
* @todo rename to ExerciseCategory
*/
class Testcategory
class TestCategory
{
public $id;
public $name;
@ -23,10 +23,10 @@ class Testcategory
* @param string $in_name
* @param string $in_description
*/
public function Testcategory($in_id=0, $in_name = '', $in_description="")
public function __construct($in_id=0, $in_name = '', $in_description="")
{
if ($in_id != 0 && $in_name == "") {
$tmpobj = new Testcategory();
$tmpobj = new TestCategory();
$tmpobj->getCategory($in_id);
$this->id = $tmpobj->id;
$this->name = $tmpobj->name;
@ -39,7 +39,7 @@ class Testcategory
}
/**
* return the Testcategory object with id=in_id
* return the TestCategory object with id=in_id
* @param $in_id
*/
public function getCategory($in_id)
@ -58,7 +58,7 @@ class Testcategory
}
/**
* add Testcategory in the database if name doesn't already exists
* add TestCategory in the database if name doesn't already exists
*/
public function addCategoryInBDD()
{
@ -207,7 +207,7 @@ class Testcategory
$sql = "SELECT * FROM $t_cattable WHERE c_id=$in_courseid ORDER BY title ASC";
$res = Database::query($sql);
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;
}
} else {
@ -221,9 +221,9 @@ class Testcategory
}
/**
* Return the testcategory id for question with question_id = $in_questionid
* In this version, a question has only 1 testcategory.
* Return the testcategory id, 0 if none
* Return the TestCategory id for question with question_id = $in_questionid
* In this version, a question has only 1 TestCategory.
* Return the TestCategory id, 0 if none
* @param int $questionId
* @param int $courseId
*
@ -253,7 +253,7 @@ class Testcategory
*/
public static function isQuestionHasCategory($in_questionid)
{
if (Testcategory::getCategoryForQuestion($in_questionid) > 0) {
if (TestCategory::getCategoryForQuestion($in_questionid) > 0) {
return true;
}
return false;
@ -269,7 +269,7 @@ class Testcategory
if (empty($in_courseid) || $in_courseid=="") {
$in_courseid = api_get_course_int_id();
}
$catid = Testcategory::getCategoryForQuestion($in_questionid, $in_courseid);
$catid = TestCategory::getCategoryForQuestion($in_questionid, $in_courseid);
$result = ""; // result
$t_cattable = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
$catid = intval($catid);
@ -298,8 +298,8 @@ class Testcategory
$tabQuestionList = $quiz->selectQuestionList();
// the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ???
for ($i=1; $i <= count($tabQuestionList); $i++) {
if (!in_array(Testcategory::getCategoryForQuestion($tabQuestionList[$i]), $result)) {
$result[] = Testcategory::getCategoryForQuestion($tabQuestionList[$i]);
if (!in_array(TestCategory::getCategoryForQuestion($tabQuestionList[$i]), $result)) {
$result[] = TestCategory::getCategoryForQuestion($tabQuestionList[$i]);
}
}
@ -318,7 +318,7 @@ class Testcategory
$tabcatName = array();
$tabcatID = self::getListOfCategoriesIDForTest($in_testid);
for ($i=0; $i < count($tabcatID); $i++) {
$cat = new Testcategory($tabcatID[$i]);
$cat = new TestCategory($tabcatID[$i]);
$tabcatName[$cat->id] = $cat->name;
}
return $tabcatName;
@ -332,7 +332,7 @@ class Testcategory
*/
public static function getNumberOfCategoriesForTest($in_testid)
{
return count(Testcategory::getListOfCategoriesIDForTest($in_testid));
return count(TestCategory::getListOfCategoriesIDForTest($in_testid));
}
/**
@ -349,7 +349,7 @@ class Testcategory
$tabQuestionList = $quiz->selectQuestionList();
// the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ? ? ?
for ($i=1; $i <= count($tabQuestionList); $i++) {
if (Testcategory::getCategoryForQuestion($tabQuestionList[$i]) == $in_categoryid) {
if (TestCategory::getCategoryForQuestion($tabQuestionList[$i]) == $in_categoryid) {
$nbCatResult++;
}
}
@ -365,10 +365,10 @@ class Testcategory
public static function getNumberOfQuestionRandomByCategory($in_testid, $in_nbrandom)
{
$nbquestionresult = 0;
$tabcatid = Testcategory::getListOfCategoriesIDForTest($in_testid);
$tabcatid = TestCategory::getListOfCategoriesIDForTest($in_testid);
for ($i=0; $i < count($tabcatid); $i++) {
if ($tabcatid[$i] > 0) { // 0 = no category for this questio
$nbQuestionInThisCat = Testcategory::getNumberOfQuestionsInCategoryForTest($in_testid, $tabcatid[$i]);
$nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($in_testid, $tabcatid[$i]);
if ($nbQuestionInThisCat > $in_nbrandom) {
$nbquestionresult += $in_nbrandom;
}
@ -390,7 +390,7 @@ class Testcategory
if (empty($in_courseid) || $in_courseid=="") {
$in_courseid = api_get_course_int_id();
}
$tabcatobject = Testcategory::getCategoryListInfo("", $in_courseid);
$tabcatobject = TestCategory::getCategoryListInfo("", $in_courseid);
$tabresult = array("0"=>get_lang('NoCategorySelected'));
for ($i=0; $i < count($tabcatobject); $i++) {
$tabresult[$tabcatobject[$i]->id] = $tabcatobject[$i]->name;
@ -463,9 +463,9 @@ class Testcategory
$in_display_category_name = $objExercise->display_category_name;
}
$content = null;
if (Testcategory::getCategoryNameForQuestion($in_questionID) != "" && ($in_display_category_name == 1 || !$is_student)) {
if (TestCategory::getCategoryNameForQuestion($in_questionID) != "" && ($in_display_category_name == 1 || !$is_student)) {
$content .= '<div class="page-header">';
$content .= '<h4>'.get_lang('Category').": ".Testcategory::getCategoryNameForQuestion($in_questionID).'</h4>';
$content .= '<h4>'.get_lang('Category').": ".TestCategory::getCategoryNameForQuestion($in_questionID).'</h4>';
$content .= "</div>";
}
return $content;
@ -496,7 +496,7 @@ class Testcategory
$tabResult = array();
$tabCatName = array(); // tab of category name
while (list($cat_id, $tabquestion) = each($in_tab)) {
$catTitle = new Testcategory($cat_id);
$catTitle = new TestCategory($cat_id);
$tabCatName[$cat_id] = $catTitle->name;
}
reset($in_tab);
@ -545,10 +545,10 @@ class Testcategory
{
$res_num_max = 0;
// foreach question
$tabcatid = Testcategory::getListOfCategoriesIDForTest($in_testid);
$tabcatid = TestCategory::getListOfCategoriesIDForTest($in_testid);
for ($i=0; $i < count($tabcatid); $i++) {
if ($tabcatid[$i] > 0) { // 0 = no category for this question
$nbQuestionInThisCat = Testcategory::getNumberOfQuestionsInCategoryForTest($in_testid, $tabcatid[$i]);
$nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($in_testid, $tabcatid[$i]);
if ($nbQuestionInThisCat > $res_num_max) {
$res_num_max = $nbQuestionInThisCat;
}
@ -568,7 +568,7 @@ class Testcategory
if (empty($category_list)) {
return null;
}
$category_name_list = Testcategory::getListOfCategoriesNameForTest($exercise_id);
$category_name_list = TestCategory::getListOfCategoriesNameForTest($exercise_id);
$table = new HTML_Table(array('class' => 'data_table'));
$table->setHeaderContents(0, 0, get_lang('Categories'));
@ -620,7 +620,7 @@ class Testcategory
*/
public static function category_exists_with_title($in_name)
{
$tab_test_category = Testcategory::getCategoryListInfo("title");
$tab_test_category = TestCategory::getCategoryListInfo("title");
foreach ($tab_test_category as $title) {
if ($title == $in_name) {
return true;
@ -663,7 +663,7 @@ class Testcategory
$tbl_reltable = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
// if question doesn't have a category
// @todo change for 1.10 when a question can have several categories
if (Testcategory::getCategoryForQuestion($in_question_id, $in_course_c_id) == 0 && $in_question_id > 0 && $in_course_c_id > 0) {
if (TestCategory::getCategoryForQuestion($in_question_id, $in_course_c_id) == 0 && $in_question_id > 0 && $in_course_c_id > 0) {
$sql = "INSERT INTO $tbl_reltable VALUES (".intval($in_course_c_id).", ".intval($in_question_id).", ".intval($in_category_id).")";
Database::query($sql);
}
@ -716,7 +716,7 @@ class Testcategory
$html = null;
foreach ($categories as $category) {
$tmpobj = new Testcategory($category['id']);
$tmpobj = new TestCategory($category['id']);
$nb_question = $tmpobj->getCategoryQuestionsNumber();
$rowname = self::protectJSDialogQuote($category['title']);
$nb_question_label = $nb_question == 1 ? $nb_question . ' ' . get_lang('Question') : $nb_question . ' ' . get_lang('Questions');

4
main/exercice/exercice.php
Unescape View File

@ -727,14 +727,14 @@ if (!empty($exercise_list)) {
$random_number_of_question = $rowi;
}
if ($row['random_by_category'] > 0) {
$nbQuestionsTotal = Testcategory::getNumberOfQuestionRandomByCategory(
$nbQuestionsTotal = TestCategory::getNumberOfQuestionRandomByCategory(
$my_exercise_id,
$random_number_of_question
);
$number_of_questions = $nbQuestionsTotal." ";
$number_of_questions .= ($nbQuestionsTotal > 1) ? get_lang("QuestionsLowerCase") : get_lang("QuestionLowerCase");
$number_of_questions .= " - ";
$number_of_questions .= min(Testcategory::getNumberMaxQuestionByCat($my_exercise_id), $random_number_of_question).' '.get_lang('QuestionByCategory');
$number_of_questions .= min(TestCategory::getNumberMaxQuestionByCat($my_exercise_id), $random_number_of_question).' '.get_lang('QuestionByCategory');
} else {
$random_label = ' ('.get_lang('Random').') ';
$number_of_questions = $random_number_of_question.' '.$random_label;

8
main/exercice/exercise.class.php
Unescape View File

@ -4215,7 +4215,7 @@ class Exercise
// key of $tabCategoryQuestions are the categopy id (0 for not in a category)
// value is the array of question id of this category
$questionList = array();
$tabCategoryQuestions = Testcategory::getQuestionsByCat($this->id);
$tabCategoryQuestions = TestCategory::getQuestionsByCat($this->id);
$isRandomByCategory = $this->selectRandomByCat();
// on tri les categories en fonction du terme entre [] en tete de la description de la categorie
/*
@ -4230,14 +4230,14 @@ class Exercise
*/
// If test option is Grouped By Categories
if ($isRandomByCategory == 2) {
$tabCategoryQuestions = Testcategory::sortTabByBracketLabel($tabCategoryQuestions);
$tabCategoryQuestions = TestCategory::sortTabByBracketLabel($tabCategoryQuestions);
}
while (list($cat_id, $tabquestion) = each($tabCategoryQuestions)) {
$number_of_random_question = $this->random;
if ($this->random == -1) {
$number_of_random_question = count($this->questionList);
}
$questionList = array_merge($questionList, Testcategory::getNElementsFromArray($tabquestion, $number_of_random_question));
$questionList = array_merge($questionList, TestCategory::getNElementsFromArray($tabquestion, $number_of_random_question));
}
// shuffle the question list if test is not grouped by categories
if ($isRandomByCategory == 1) {
@ -4469,7 +4469,7 @@ class Exercise
$nb_random_questions = $this->random;
$tab_categories_scores = array();
for ($i=1; $i <= count($tab_question_list); $i++) {
$question_category_id = Testcategory::getCategoryForQuestion($tab_question_list[$i]);
$question_category_id = TestCategory::getCategoryForQuestion($tab_question_list[$i]);
if (!is_array($tab_categories_scores[$question_category_id])) {
$tab_categories_scores[$question_category_id] = array();
}

2
main/exercice/exercise_show.php
Unescape View File

@ -701,7 +701,7 @@ if (!empty($category_list) && ($show_results || $show_only_total_score)) {
'score' => $my_total_score_temp,
'total' => $totalWeighting
);
echo Testcategory::get_stats_table_by_attempt($objExercise->id, $category_list);
echo TestCategory::get_stats_table_by_attempt($objExercise->id, $category_list);
}
echo $total_score_text;

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

@ -226,7 +226,7 @@ if (!$inATest) {
$questionType = Display::tag('div', Display::return_icon($typeImg, $typeExpl, array(), ICON_SIZE_MEDIUM), array('style'=>$styleType));
// Question category
$txtQuestionCat = Security::remove_XSS(Testcategory::getCategoryNameForQuestion($objQuestionTmp->id));
$txtQuestionCat = Security::remove_XSS(TestCategory::getCategoryNameForQuestion($objQuestionTmp->id));
if (empty($txtQuestionCat)) {
$txtQuestionCat = "-";
}

6
main/exercice/question_pool.php
Unescape View File

@ -322,7 +322,7 @@ $TBL_COURSE_REL_CATEGORY = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CA
// Get course categories for the selected course
// get category list for the course $selected_course
$categoryList = Testcategory::getCategoriesIdAndName($selected_course);
$categoryList = TestCategory::getCategoriesIdAndName($selected_course);
$selectCourseCategory = Display::select(
'courseCategoryId',
$categoryList,
@ -582,7 +582,7 @@ if ($exerciseId > 0) {
}
}
$categoryIdFromQuestion = Testcategory::getCategoryForQuestion(
$categoryIdFromQuestion = TestCategory::getCategoryForQuestion(
$question_obj->id,
$selected_course
);
@ -945,6 +945,6 @@ function get_question_type_for_question($in_selectedcourse, $in_questionid)
*/
function get_question_categorie_for_question($in_courseid, $in_questionid)
{
$cat = Testcategory::getCategoryNameForQuestion($in_questionid, $in_courseid);
$cat = TestCategory::getCategoryNameForQuestion($in_questionid, $in_courseid);
return $cat;
}

14
main/exercice/tests_category.php
Unescape View File

@ -28,7 +28,7 @@ $this_section = SECTION_COURSES;
if (!api_is_allowed_to_edit()) {
api_not_allowed(true);
}
$category = new Testcategory();
$category = new TestCategory();
$courseId = api_get_course_int_id();
$sessionId = api_get_session_id();
@ -55,14 +55,14 @@ Display::display_footer();
// FUNCTIONS
// form to edit a category
/**
* @todo move to testcategory.class.php
* @todo move to TestCategory.class.php
* @param string $in_action
*/
function edit_category_form($in_action) {
$in_action = Security::remove_XSS($in_action);
if (isset($_GET['category_id']) && is_numeric($_GET['category_id'])) {
$category_id = Security::remove_XSS($_GET['category_id']);
$objcat = new Testcategory($category_id);
$objcat = new TestCategory($category_id);
// initiate the object
$form = new FormValidator('note', 'post', api_get_self() . '?action=' . $in_action . '&category_id=' . $category_id);
@ -92,7 +92,7 @@ function edit_category_form($in_action) {
$v_id = Security::remove_XSS($values['category_id']);
$v_name = Security::remove_XSS($values['category_name'], COURSEMANAGER);
$v_description = Security::remove_XSS($values['category_description'], COURSEMANAGER);
$objcat = new Testcategory($v_id, $v_name, $v_description);
$objcat = new TestCategory($v_id, $v_name, $v_description);
if ($objcat->modifyCategory()) {
Display::display_confirmation_message(get_lang('MofidfyCategoryDone'));
} else {
@ -116,7 +116,7 @@ function edit_category_form($in_action) {
function delete_category_form($in_action) {
if (isset($_GET['category_id']) && is_numeric($_GET['category_id'])) {
$category_id = Security::remove_XSS($_GET['category_id']);
$catobject = new Testcategory($category_id);
$catobject = new TestCategory($category_id);
if ($catobject->removeCategory()) {
Display::display_confirmation_message(get_lang('DeleteCategoryDone'));
} else {
@ -129,7 +129,7 @@ function delete_category_form($in_action) {
/**
* form to add a category
* @todo move to testcategory.class.php
* @todo move to TestCategory.class.php
* @param string $in_action
*/
function add_category_form($in_action) {
@ -150,7 +150,7 @@ function add_category_form($in_action) {
$values = $form->exportValues();
$v_name = Security::remove_XSS($values['category_name'], COURSEMANAGER);
$v_description = Security::remove_XSS($values['category_description'], COURSEMANAGER);
$objcat = new Testcategory(0, $v_name, $v_description);
$objcat = new TestCategory(0, $v_name, $v_description);
if ($objcat->addCategoryInBDD()) {
Display::display_confirmation_message(get_lang('AddCategoryDone'));
} else {

6
main/inc/lib/exercise.lib.php
Unescape View File

@ -63,7 +63,7 @@ class ExerciseLib
if (!$only_questions) {
$questionDescription = $objQuestionTmp->selectDescription();
if ($show_title) {
Testcategory::displayCategoryAndTitle($objQuestionTmp->id);
TestCategory::displayCategoryAndTitle($objQuestionTmp->id);
echo Display::div(
$current_item . '. ' . $objQuestionTmp->selectTitle(),
array('class' => 'question_title')
@ -970,7 +970,7 @@ class ExerciseLib
if (!$only_questions) {
if ($show_title) {
Testcategory::displayCategoryAndTitle($objQuestionTmp->id);
TestCategory::displayCategoryAndTitle($objQuestionTmp->id);
echo '<div class="question_title">' . $current_item . '. ' . $questionName . '</div>';
}
//@todo I need to the get the feedback type
@ -3482,7 +3482,7 @@ class ExerciseLib
'score' => $total_score,
'total' => $total_weight
);
echo Testcategory::get_stats_table_by_attempt(
echo TestCategory::get_stats_table_by_attempt(
$objExercise->id,
$category_list
);

Write Preview
Loading…
Cancel
Save