';
if (isset($fromExercise) && $fromExercise > 0) {
echo '
'.Display::return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).' ';
$titleAdd = get_lang('AddQuestionToTest');
- }
- else {
+ } else {
echo '
'.Display::return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).' ';
echo "
".Display::return_icon('add_question.gif', get_lang('NewQu'), '', 32)." ";
$titleAdd = get_lang('ManageAllQuestions');
@@ -316,8 +294,7 @@ echo Display::form_row(get_lang('Course'), $select_course_html);
if (empty($selected_course) || $selected_course == '-1') {
$course_info = api_get_course_info();
reset_menu_exo_lvl_type(); // no course selected, reset menu test / difficult� / type de reponse // hub 13-10-2011
-}
-else {
+} else {
$course_info = CourseManager::get_course_information_by_id($selected_course);
}
// If course has changed, reset the menu default
@@ -365,7 +342,9 @@ echo Display::form_row(get_lang('Exercise'), $select_exercise_html);
// Difficulty list (only from 0 to 5)
-$select_difficulty_html = Display::select('exerciseLevel', array(-1 => get_lang('All'), 0=>0, 1=>1, 2=>2, 3=>3, 4=>4, 5=>5), $exerciseLevel, array('class'=>'chzn-select', 'onchange'=>'submit_form(this);'), false);
+$levels = Question::get_default_levels();
+$levels['-1'] = get_lang('All');
+$select_difficulty_html = Display::select('exerciseLevel', $levels, $exerciseLevel, array('class' => 'chzn-select', 'onchange' => 'submit_form(this);'), false);
echo Display::form_row(get_lang('Difficulty'), $select_difficulty_html);
@@ -413,7 +392,7 @@ if ($exerciseId > 0) {
$from = '';
if (isset($courseCategoryId) && $courseCategoryId > 0) {
$from = ", $TBL_COURSE_REL_CATEGORY crc ";
- $where .= " AND crc.c_id = $selected_course AND crc.question_id=qu.id AND crc.category_id=$courseCategoryId";
+ $where .= " AND crc.c_id = $selected_course AND crc.question_id = qu.iid AND crc.category_id = $courseCategoryId";
}
if (isset($exerciseLevel) && $exerciseLevel != -1) {
$where .= ' AND level='.$exerciseLevel;
@@ -421,22 +400,18 @@ if ($exerciseId > 0) {
if (isset($answerType) && $answerType > 0) {
$where .= ' AND type='.$answerType;
}
- $sql = "SELECT DISTINCT
- id,question,
- type,
- level
+ $sql = "SELECT DISTINCT iid, question, type, level
FROM
$TBL_EXERCICE_QUESTION qt,
$TBL_QUESTIONS qu
$from
WHERE
- qt.question_id=qu.id
+ qt.question_id = qu.iid
AND qt.exercice_id = $exerciseId
AND qt.c_id = $selected_course
AND qu.c_id = $selected_course
$where
- ORDER BY
- question_order";
+ ORDER BY question_order";
$result=Database::query($sql);
while($row = Database::fetch_array($result, 'ASSOC')) {
$main_question_list[] = $row;
@@ -448,14 +423,14 @@ if ($exerciseId > 0) {
$from = '';
if (isset($courseCategoryId) && $courseCategoryId > 0) {
$from = ", $TBL_COURSE_REL_CATEGORY crc ";
- $level_where .= " AND crc.c_id=$selected_course AND crc.question_id=qu.id AND crc.category_id = $courseCategoryId";
+ $level_where .= " AND crc.c_id= $selected_course AND crc.question_id = qu.iid AND crc.category_id = $courseCategoryId";
}
if (isset($exerciseLevel) && $exerciseLevel!= -1 ) {
$level_where = ' AND level = '.$exerciseLevel;
}
$answer_where = '';
if (isset($answerType) && $answerType >0 -1 ) {
- $answer_where = ' AND q.type = '.$answerType;
+ $answer_where = ' AND type = '.$answerType;
}
/*$sql = "SELECT DISTINCT * FROM $TBL_QUESTIONS qu $from
@@ -464,6 +439,8 @@ if ($exerciseId > 0) {
WHERE c_id=$selected_course
) $level_where $answer_where";*/
+ // @todo fix this query with the new iid field
+
$sql = " (
SELECT q.* FROM $TBL_QUESTIONS q INNER JOIN $TBL_EXERCICE_QUESTION r
ON (q.c_id = r.c_id AND q.id = r.question_id)
@@ -491,16 +468,14 @@ if ($exerciseId > 0) {
$main_question_list[] = $row;
}
} else {
- //
// All tests for selected course
- //
- // if we have not selected any option in the list-box 'Filter'
+ // If we have not selected any option in the list-box 'Filter'
$filter = '';
$from = '';
if (isset($courseCategoryId) && $courseCategoryId > 0) {
$from = ", $TBL_COURSE_REL_CATEGORY crc ";
- $filter .= " AND crc.c_id=$selected_course AND crc.question_id=qu.id AND crc.category_id=$courseCategoryId";
+ $filter .= " AND crc.c_id = $selected_course AND crc.question_id = qu.iid AND crc.category_id = $courseCategoryId";
}
if (isset($exerciseLevel) && $exerciseLevel != -1) {
$filter .= ' AND level='.$exerciseLevel.' ';
@@ -544,12 +519,13 @@ if ($exerciseId > 0) {
continue;
}
}
- $question_row = array( 'id' => $question_obj->id,
- 'question' => $question_obj->question,
- 'type' => $question_obj->type,
- 'level' => $question_obj->level,
- 'exercise_id' => $exercise['id'],
- 'course_id' => $course_item['id'],
+ $question_row = array(
+ 'id' => $question_obj->id,
+ 'question' => $question_obj->question,
+ 'type' => $question_obj->type,
+ 'level' => $question_obj->level,
+ 'exercise_id' => $exercise['id'],
+ 'course_id' => $course_item['id'],
);
$main_question_list[] = $question_row;
}
@@ -558,12 +534,16 @@ if ($exerciseId > 0) {
}
}
}
- }
- else {
- //
+} else {
// All tests for the course selected, not in session
- //
- $sql = "SELECT DISTINCT qu.id, question, qu.type, level, q.session_id FROM $TBL_QUESTIONS as qu, $TBL_EXERCICE_QUESTION as qt, $TBL_EXERCICES as q $from WHERE qu.c_id=$selected_course AND qt.c_id=$selected_course AND q.c_id=$selected_course AND qu.id = qt.question_id AND q.id = qt.exercice_id $filter ORDER BY session_id ASC";
+ $sql = "SELECT DISTINCT qu.iid, question, qu.type, level, q.session_id
+ FROM $TBL_QUESTIONS as qu, $TBL_EXERCICE_QUESTION as qt, $TBL_EXERCICES as q $from
+ WHERE qu.c_id = $selected_course AND
+ qt.c_id = $selected_course AND
+ q.c_id = $selected_course AND
+ qu.iid = qt.question_id AND
+ q.iid = qt.exercice_id $filter
+ ORDER BY session_id ASC";
$result = Database::query($sql);
while($row = Database::fetch_array($result, 'ASSOC')) {
$main_question_list[] = $row;
@@ -599,31 +579,26 @@ if ($fromExercise <= 0) { // NOT IN A TEST - IN THE COURSE
$actionIcon1 = "edit";
$actionIcon2 = "delete";
$questionTagA = 1; // we are in the course, question title can be a link to the question edit page
- }
- else { // NOT IN A TEST - NOT IN THE COURSE
+ } else { // NOT IN A TEST - NOT IN THE COURSE
$actionLabel = get_lang('Reuse');
$actionIcon1 = get_lang('MustBeInATest');
$actionIcon2 = "";
$questionTagA = 0; // we are not in this course, to messy if we link to the question in another course
}
-}
-else { // IN A TEST - IN THE COURSE
+} else { // IN A TEST - IN THE COURSE
if ($selected_course == api_get_course_int_id()) {
$actionLabel = get_lang('Reuse');
$actionIcon1 = "add";
$actionIcon2 = "";
$questionTagA = 1;
- }
- else { // IN A TEST - NOT IN THE COURSE
+ } else { // IN A TEST - NOT IN THE COURSE
$actionLabel = get_lang('Reuse');
$actionIcon1 = "clone";
$actionIcon2 = "";
$questionTagA = 0;
}
}
-//
-// display table
-//
+// Display table
$header = array();
$header[] = array(get_lang('QuestionUpperCaseFirstLetter'), false, array("style"=>"text-align:center"), '');
$header[] = array(get_lang('Type'), false, array("style"=>"text-align:center"), array("style"=>"text-align:center"), '');
@@ -635,34 +610,24 @@ $data = array();
if (is_array($main_question_list)) {
$all_category_list = Testcategory::getCategoryListName($selected_course);
- foreach ($main_question_list as $tabQuestion) {
+ foreach ($main_question_list as $question_item) {
$row = array();
+ $question_id_item = $question_item['iid'];
//This function checks if the question can be read
- $question_type = get_question_type_for_question($selected_course, $tabQuestion['id']);
+ $question_type = get_question_type_for_question($selected_course, $question_id_item);
if (empty($question_type)) {
continue;
}
- $row[] = get_a_tag_for_question($questionTagA, $fromExercise, $tabQuestion['id'], $tabQuestion['type'], $tabQuestion['question']);
+ $row[] = get_a_tag_for_question($questionTagA, $fromExercise, $question_id_item, $question_item['type'], $question_item['question']);
$row[] = $question_type;
- $row[] = get_question_categorie_for_question($selected_course, $tabQuestion['id']);
- $row[] = $tabQuestion['level'];
- $row[] = get_action_icon_for_question($actionIcon1,
- $fromExercise,
- $tabQuestion['id'],
- $tabQuestion['type'],
- $tabQuestion['question'],
- $selected_course,
- $courseCategoryId,
- $exerciseLevel,
- $answerType,
- $session_id, $exerciseId).
- " ".
- get_action_icon_for_question($actionIcon2, $fromExercise, $tabQuestion['id'], $tabQuestion['type'],
- $tabQuestion['question'], $selected_course, $courseCategoryId, $exerciseLevel, $answerType,
- $session_id, $exerciseId);
+ $row[] = get_question_category_for_question($selected_course, $question_id_item);
+ $row[] = $question_item['level'];
+ $row[] = get_action_icon_for_question($actionIcon1, $fromExercise, $question_id_item, $question_item['type'], $question_item['question'], $selected_course, $courseCategoryId, $exerciseLevel, $answerType, $session_id, $exerciseId).
+ " ".
+ get_action_icon_for_question($actionIcon2, $fromExercise, $question_id_item, $question_item['type'], $question_item['question'], $selected_course, $courseCategoryId, $exerciseLevel, $answerType, $session_id, $exerciseId);
$data[] = $row;
}
}
@@ -706,7 +671,6 @@ function reset_menu_exo_lvl_type() {
$courseCategoryId = 0;
}
-//
// return the
link to admin question, if needed
// hubert.borderiou 13-10-2011
function get_a_tag_for_question($in_addA, $in_fromex, $in_questionid, $in_questiontype, $in_questionname) {
@@ -740,23 +704,21 @@ $session_id, $exerciseId);
*/
-//
-// return the html code for delete, add, clone, edit a question
-// hubert.borderiou 13-10-2011
-// in_action = the code of the action triggered by the button
-// from_exercice = the id of the current exercice from which we click on question pool
-// in_questionid = the id of the current question
-// in_questiontype = the code of the type of the current question
-// in_questionname = the name of the question
-// in_selected_course = the if of the course chosen in the FILTERING MENU
-// in_courseCategoryId = the id of the category chosen in the FILTERING MENU
-// in_exerciseLevel = the level of the exercice chosen in the FILTERING MENU
-// in_answerType = the code of the type of the question chosen in the FILTERING MENU
-// in_session_id = the id of the session_id chosen in the FILTERING MENU
-// in_exercice_id = the id of the exercice chosen in the FILTERING MENU
-function get_action_icon_for_question($in_action, $from_exercice, $in_questionid, $in_questiontype, $in_questionname,
- $in_selected_course, $in_courseCategoryId, $in_exerciseLevel, $in_answerType, $in_session_id, $in_exercice_id
-) {
+/*
+ Return the html code for delete, add, clone, edit a question hubert.borderiou 13-10-2011
+ in_action = the code of the action triggered by the button
+ from_exercice = the id of the current exercice from which we click on question pool
+ in_questionid = the id of the current question
+ in_questiontype = the code of the type of the current question
+ in_questionname = the name of the question
+ in_selected_course = the if of the course chosen in the FILTERING MENU
+ in_courseCategoryId = the id of the category chosen in the FILTERING MENU
+ in_exerciseLevel = the level of the exercice chosen in the FILTERING MENU
+ in_answerType = the code of the type of the question chosen in the FILTERING MENU
+ in_session_id = the id of the session_id chosen in the FILTERING MENU
+ in_exercice_id = the id of the exercice chosen in the FILTERING MENU
+ */
+function get_action_icon_for_question($in_action, $from_exercice, $in_questionid, $in_questiontype, $in_questionname, $in_selected_course, $in_courseCategoryId, $in_exerciseLevel, $in_answerType, $in_session_id, $in_exercice_id) {
$res = "";
$getParams = "&selected_course=$in_selected_course&courseCategoryId=$in_courseCategoryId&exerciseId=$in_exercice_id&exerciseLevel=$in_exerciseLevel&answerType=$in_answerType&session_id=$in_session_id";
@@ -773,13 +735,13 @@ function get_action_icon_for_question($in_action, $from_exercice, $in_questionid
case "add":
// add if question is not already in test
$myObjEx = new Exercise();
+ $myObjEx->setCategoriesGrouping(false);
$myObjEx->read($from_exercice);
if (!$myObjEx->isInList($in_questionid)) {
$res = " ";
$res .= Display::return_icon("view_more_stats.gif", get_lang('InsertALinkToThisQuestionInTheExercise'));
$res .= " ";
- }
- else {
+ } else {
$res = "-";
}
unset($myObjEx);
@@ -796,8 +758,8 @@ function get_action_icon_for_question($in_action, $from_exercice, $in_questionid
return $res;
}
-// return the icon for the question type
-// hubert.borderiou 13-10-2011
+/* return the icon for the question type
+ hubert.borderiou 13-10-2011*/
function get_question_type_for_question($in_selectedcourse, $in_questionid) {
$myObjQuestion = Question::read($in_questionid, $in_selectedcourse);
$questionType = null;
@@ -809,9 +771,8 @@ function get_question_type_for_question($in_selectedcourse, $in_questionid) {
return $questionType;
}
-// return the name of the category for the question in a course
-// hubert.borderiou 13-10-2011
-function get_question_categorie_for_question($course_id, $question_id) {
+/* return the name of the category for the question in a course hubert.borderiou 13-10-2011*/
+function get_question_category_for_question($course_id, $question_id) {
global $all_category_list;
$objQuestionTmp = Question :: read($question_id, $course_id);
return Testcategory::return_category_labels($objQuestionTmp->category_list, $all_category_list);
diff --git a/main/exercice/result.php b/main/exercice/result.php
index 8c339a189f..ce4b27c743 100644
--- a/main/exercice/result.php
+++ b/main/exercice/result.php
@@ -75,4 +75,4 @@ if ($show_headers) {
display_question_list_by_attempt($objExercise, $id, false);
-Display::display_footer();
+Display::display_footer();
\ No newline at end of file
diff --git a/main/exercice/savescores.php b/main/exercice/savescores.php
index a1a9f2b4e3..67d45cf815 100644
--- a/main/exercice/savescores.php
+++ b/main/exercice/savescores.php
@@ -36,6 +36,7 @@ $full_file_path = $documentPath.$test;
FileManager::my_delete($full_file_path.$_user['user_id'].".t.html");
$TABLETRACK_HOTPOTATOES = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
+$tbl_learnpath_user = Database::get_course_table(TABLE_LEARNPATH_USER);
$TABLE_LP_ITEM_VIEW = Database::get_course_table(TABLE_LP_ITEM_VIEW);
$jscript2run = '';
diff --git a/main/exercice/testcategory.class.php b/main/exercice/testcategory.class.php
index 2665d99092..68e446f189 100644
--- a/main/exercice/testcategory.class.php
+++ b/main/exercice/testcategory.class.php
@@ -1,73 +1,166 @@
getCategory($in_id);
$this->id = $tmpobj->id;
$this->name = $tmpobj->name;
+ $this->title = $tmpobj->name;
$this->description = $tmpobj->description;
+ $this->parent_id = $tmpobj->parent_id;
+ $this->parent_path = $this->name;
+
+ if (!empty($tmpobj->parent_id)) {
+ $category = new Testcategory($tmpobj->parent_id);
+ $this->parent_path = $category->parent_path.' > '.$this->name;
}
- else {
+ } else {
$this->id = $in_id;
$this->name = $in_name;
$this->description = $in_description;
- }
+ $this->parent_id = $parent_id;
+ }
+ $this->type = $type;
+
+ if (!empty($course_id)) {
+ $this->course_id = $course_id;
+ } else {
+ $this->course_id = api_get_course_int_id();
+ }
}
- /** return the Testcategory object with id=in_id
+ /**
+ * Return the Testcategory object with id=in_id
+ *
+ * @assert () === false
*/
function getCategory($in_id) {
$t_cattable = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
$in_id = Database::escape_string($in_id);
- $sql = "SELECT * FROM $t_cattable WHERE id=$in_id AND c_id=".api_get_course_int_id();
+ $sql = "SELECT * FROM $t_cattable WHERE iid = $in_id ";
$res = Database::query($sql);
$numrows = Database::num_rows($res);
if ($numrows > 0) {
$row = Database::fetch_array($res);
- $this->id = $row['id'];
- $this->name = $row['title'];
+ $this->id = $row['iid'];
+ $this->title = $this->name = $row['title'];
$this->description = $row['description'];
+ $this->parent_id = $row['parent_id'];
+ } else {
+ return false;
}
}
- /** add Testcategory in the database if name doesn't already exists
- */
+ /**
+ * Add Testcategory in the database if name doesn't already exists
+ *
+ */
function addCategoryInBDD() {
$t_cattable = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
- $v_name = $this->name;
- $v_name = Database::escape_string($v_name);
- $v_description = $this->description;
- $v_description = Database::escape_string($v_description);
- // check if name already exists
- $sql_verif = "SELECT count(*) AS nb FROM $t_cattable WHERE title = '$v_name' AND c_id=".api_get_course_int_id();
- $result_verif = Database::query($sql_verif);
- $data_verif = Database::fetch_array($result_verif);
- // lets add in BDD if not the same name
- if ($data_verif['nb'] <= 0) {
- $c_id = api_get_course_int_id();
- $sql = "INSERT INTO $t_cattable VALUES ('$c_id', '', '$v_name', '$v_description')";
- $res = Database::query($sql);
- return true;
- }
- else {
- return false;
+ $v_name = Database::escape_string($this->name);
+ $v_description = Database::escape_string($this->description);
+ $parent_id = intval($this->parent_id);
+
+ $course_id = $this->course_id;
+ $courseCondition = " AND c_id = $course_id ";
+ if ($this->type == 'global') {
+ $course_id = '';
+ $courseCondition = null;
+ }
+ // Check if name already exists
+ $sql = "SELECT count(*) AS nb FROM $t_cattable WHERE title = '$v_name' $courseCondition";
+ $result = Database::query($sql);
+ $data = Database::fetch_array($result);
+ // lets add in BD if not the same name
+ if ($data['nb'] <= 0) {
+ $sql = "INSERT INTO $t_cattable (c_id, title, description, parent_id) VALUES ('$course_id', '$v_name', '$v_description', '$parent_id')";
+ Database::query($sql);
+ return Database::insert_id();
+ } else {
+ return false;
}
+ }
+
+ function get_category_by_title($title , $course_id = 0) {
+ $table = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
+ $course_id = intval($course_id);
+ $sql = "SELECT * FROM $table WHERE title = '$title' AND c_id IN ('0', '$course_id')LIMIT 1";
+ $title = Database::escape_string($title);
+ $result = Database::query($sql);
+ if (Database::num_rows($result)) {
+ $result = Database::store_result($result, 'ASSOC');
+ return $result[0];
+ }
+ return false;
+ }
+ /**
+ *
+ * Get categories by title for json calls
+ *
+ * @assert() === false
+ */
+ function get_categories_by_keyword($tag) {
+ if (empty($tag)) {
+ return false;
+ }
+ $table = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
+ $sql = "SELECT iid, title, c_id FROM $table WHERE 1=1 ";
+ $tag = Database::escape_string($tag);
+
+ $where_condition = array();
+ if (!empty($tag)) {
+ $condition = ' LIKE "%'.$tag.'%"';
+ $where_condition = array(
+ "title $condition",
+ );
+ $where_condition = ' AND ('.implode(' OR ', $where_condition).') ';
+ }
+
+ switch ($this->type) {
+ case 'simple':
+ $course_condition = " AND c_id = '".api_get_course_int_id()."' ";
+ break;
+ case 'global':
+ $course_condition = " AND c_id = '0' ";
+ break;
+ case 'all':
+ $course_condition = " AND c_id IN ('0', '".api_get_course_int_id()."')";
+ break;
+ }
+
+ $where_condition .= $course_condition;
+ $order_clause = " ORDER BY title";
+ $sql .= $where_condition.$order_clause;
+
+ $result = Database::query($sql);
+ if (Database::num_rows($result)) {
+ return Database::store_result($result, 'ASSOC');
+ }
+ return false;
}
/**
@@ -75,12 +168,11 @@ class Testcategory {
* @todo I'm removing the $in_id parameter because it seems that you're using $this->id instead of $in_id after confirmation delete this
* jmontoya
*/
- //function removeCategory($in_id) {
function removeCategory() {
$t_cattable = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
$v_id = Database::escape_string($this->id);
- $sql = "DELETE FROM $t_cattable WHERE id=$v_id AND c_id=".api_get_course_int_id();
- $res = Database::query($sql);
+ $sql = "DELETE FROM $t_cattable WHERE iid = $v_id";
+ Database::query($sql);
if (Database::affected_rows() <= 0) {
return false;
} else {
@@ -89,20 +181,29 @@ class Testcategory {
}
- /** modify category name or description of category with id=in_id
+ /**
+ * Modify category name or description of category with id=in_id
*/
- //function modifyCategory($in_id, $in_name, $in_description) {
function modifyCategory() {
$t_cattable = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
$v_id = Database::escape_string($this->id);
$v_name = Database::escape_string($this->name);
$v_description = Database::escape_string($this->description);
- $sql = "UPDATE $t_cattable SET title='$v_name', description='$v_description' WHERE id='$v_id' AND c_id=".api_get_course_int_id();
- $res = Database::query($sql);
+ $parent_id = intval($this->parent_id);
+
+ //Avoid recursive categories
+ if ($parent_id == $v_id) {
+ $parent_id = 0;
+ }
+ $sql = "UPDATE $t_cattable SET
+ title = '$v_name',
+ description = '$v_description',
+ parent_id = '$parent_id'
+ WHERE iid = '$v_id'";
+ Database::query($sql);
if (Database::affected_rows() <= 0) {
return false;
- }
- else {
+ } else {
return true;
}
}
@@ -116,7 +217,7 @@ class Testcategory {
function getCategoryQuestionsNumber() {
$t_reltable = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
$in_id = Database::escape_string($this->id);
- $sql = "SELECT count(*) AS nb FROM $t_reltable WHERE category_id=$in_id AND c_id=".api_get_course_int_id();
+ $sql = "SELECT count(*) AS nb FROM $t_reltable WHERE category_id = $in_id";
$res = Database::query($sql);
$row = Database::fetch_array($res);
return $row['nb'];
@@ -145,11 +246,10 @@ 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['iid'], $row['title'], $row['description'], $row['parent_id']);
$tabres[] = $tmpcat;
}
- }
- else {
+ } else {
$sql = "SELECT $in_field FROM $t_cattable WHERE c_id=$in_courseid ORDER BY $in_field ASC";
$res = Database::query($sql);
while ($row = Database::fetch_array($res)) {
@@ -164,39 +264,68 @@ 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
+ * @assert () === false
*/
- public static function getCategoryForQuestion($in_questionid, $in_courseid = null) {
+ public static function getCategoryForQuestion($question_id, $in_courseid = null) {
$result = array(); // result
if (empty($in_courseid) || $in_courseid=="") {
$in_courseid = api_get_course_int_id();
}
$t_cattable = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
- $question_id = Database::escape_string($in_questionid);
+ $question_id = Database::escape_string($question_id);
$sql = "SELECT category_id FROM $t_cattable WHERE question_id = '$question_id' AND c_id = $in_courseid";
$res = Database::query($sql);
if (Database::num_rows($res) > 0) {
- while ($row = Database::fetch_array($res)) {
+ while ($row = Database::fetch_array($res, 'ASSOC')) {
$result[] = $row['category_id'];
}
}
return $result;
}
- public static function getCategoryNamesForQuestion($in_questionid, $in_courseid = null, $display_into_labels = true) {
+ public static function getCategoryForQuestionWithCategoryData($question_id, $in_courseid = null) {
$result = array(); // result
if (empty($in_courseid) || $in_courseid=="") {
$in_courseid = api_get_course_int_id();
}
$t_cattable = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
$table_category = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
- $question_id = Database::escape_string($in_questionid);
- $sql = "SELECT c.title FROM $t_cattable qc INNER JOIN $table_category c
- ON (qc.category_id = c.id AND qc.c_id = $in_courseid AND c.c_id = $in_courseid)
+ $question_id = Database::escape_string($question_id);
+ $sql = "SELECT * FROM $t_cattable qc INNER JOIN $table_category c ON (category_id = c.iid) WHERE question_id = '$question_id' AND qc.c_id = $in_courseid";
+ $res = Database::query($sql);
+ if (Database::num_rows($res) > 0) {
+ while ($row = Database::fetch_array($res, 'ASSOC')) {
+ $result[] = $row;
+ }
+ }
+ return $result;
+ }
+
+ /**
+ *
+ * @param int $question_id
+ * @param int $course_id
+ * @param bool $display_into_labels
+ * @return string
+ */
+ public static function getCategoryNamesForQuestion($question_id, $course_id = null, $display_into_labels = true) {
+ $result = array(); // result
+ if (empty($course_id) || $course_id == "") {
+ $course_id = api_get_course_int_id();
+ }
+ $t_cattable = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
+ $table_category = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
+ $question_id = intval($question_id);
+ $course_id = intval($course_id);
+
+ $sql = "SELECT c.title, c.iid FROM $t_cattable qc INNER JOIN $table_category c
+ ON (qc.category_id = c.iid AND qc.c_id = $course_id)
WHERE question_id = '$question_id' ";
$res = Database::query($sql);
if (Database::num_rows($res) > 0) {
while ($row = Database::fetch_array($res)) {
- $result[] = $row['title'];
+ $cat = new Testcategory($row['iid']);
+ $result[] = $cat->parent_path;
}
}
@@ -209,9 +338,12 @@ class Testcategory {
/**
* true if question id has a category
+ * @assert () === false
+ * @assert (null) === false
+ * @assert (-1) === false
*/
- public static function isQuestionHasCategory($in_questionid) {
- $category_list = Testcategory::getCategoryForQuestion($in_questionid);
+ public static function isQuestionHasCategory($question_id) {
+ $category_list = Testcategory::getCategoryForQuestion($question_id);
if (!empty($category_list)) {
return true;
}
@@ -225,18 +357,16 @@ class Testcategory {
In this version, a question has only 1 category.
Return the category id, "" if none
*/
- public static function getCategoryNameForQuestion($question_id, $course_id = null) {
+ public static function getCategoryNameForQuestion($catid, $course_id = null) {
if (empty($course_id) || $course_id == "") {
$course_id = api_get_course_int_id();
}
$course_id = intval($course_id);
- $category_list = Testcategory::getCategoryForQuestion($question_id, $course_id);
-
- $result = array(); // result
+ $result = array();
$t_cattable = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
$catid = Database::escape_string($catid);
- $sql = "SELECT title FROM $t_cattable WHERE id='$catid' AND c_id = $course_id";
+ $sql = "SELECT title FROM $t_cattable WHERE iid = '$catid' AND c_id = $course_id";
$res = Database::query($sql);
$data = Database::fetch_array($res);
if (Database::num_rows($res) > 0) {
@@ -251,15 +381,34 @@ class Testcategory {
* return : array of category id (integer)
* @author hubert.borderiou 07-04-2011, Julio Montoya
*/
- public static function getListOfCategoriesIDForTest($exercise_id) {
+ public static function getListOfCategoriesIDForTest($exercise_id, $grouped_by_category = true) {
// parcourir les questions d'un test, recup les categories uniques dans un tableau
$categories_in_exercise = array();
- $quiz = new Exercise();
- $quiz->read($exercise_id);
- $question_list = $quiz->selectQuestionList();
+ $exercise = new Exercise();
+ $exercise->setCategoriesGrouping($grouped_by_category);
+ $exercise->read($exercise_id);
+ $question_list = $exercise->selectQuestionList();
// the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ???
- for ($i=1; $i <= count($question_list); $i++) {
- $category_list = Testcategory::getCategoryForQuestion($question_list[$i]);
+ foreach ($question_list as $question_id) {
+ $category_list = Testcategory::getCategoryForQuestion($question_id);
+ if (!empty($category_list)) {
+ $categories_in_exercise = array_merge($categories_in_exercise, $category_list);
+ }
+ }
+ if (!empty($categories_in_exercise)) {
+ $categories_in_exercise = array_unique(array_filter($categories_in_exercise));
+ }
+ return $categories_in_exercise;
+ }
+
+ public static function getListOfCategoriesIDForTestObject($exercise_obj) {
+ // parcourir les questions d'un test, recup les categories uniques dans un tableau
+ $categories_in_exercise = array();
+ $question_list = $exercise_obj->selectQuestionList();
+
+ // the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ???
+ foreach ($question_list as $question_id) {
+ $category_list = Testcategory::getCategoryForQuestion($question_id);
if (!empty($category_list)) {
$categories_in_exercise = array_merge($categories_in_exercise, $category_list);
}
@@ -277,14 +426,29 @@ class Testcategory {
* hubert.borderiou 07-04-2011
* @author function rewrote by jmontoya
*/
- public static function getListOfCategoriesNameForTest($in_testid) {
- $tabcatName = array();
- $tabcatID = self::getListOfCategoriesIDForTest($in_testid);
- for ($i=0; $i < count($tabcatID); $i++) {
- $cat = new Testcategory($tabcatID[$i]);
- $tabcatName[$cat->id] = $cat->name;
+ public static function getListOfCategoriesNameForTest($exercise_id, $grouped_by_category = true) {
+ $result = array();
+ $categories = self::getListOfCategoriesIDForTest($exercise_id, $grouped_by_category);
+ foreach ($categories as $cat_id) {
+ $cat = new Testcategory($cat_id);
+ if (!empty($cat->id)) {
+ $result[$cat->id] = $cat->name;
}
- return $tabcatName;
+ }
+ return $result;
+ }
+
+ public static function getListOfCategoriesForTest($exercise_obj) {
+ $result = array();
+ $categories = self::getListOfCategoriesIDForTestObject($exercise_obj);
+ foreach ($categories as $cat_id) {
+ $cat = new Testcategory($cat_id);
+ $cat = (array)$cat;
+ $cat['iid'] = $cat['id'];
+ $cat['title'] = $cat['name'];
+ $result[$cat['id']] = $cat;
+ }
+ return $result;
}
/**
@@ -293,8 +457,8 @@ class Testcategory {
* return : integer
* hubert.borderiou 07-04-2011
*/
- public static function getNumberOfCategoriesForTest($in_testid) {
- return count(Testcategory::getListOfCategoriesIDForTest($in_testid));
+ public static function getNumberOfCategoriesForTest($exercise_id) {
+ return count(Testcategory::getListOfCategoriesIDForTest($exercise_id));
}
/**
@@ -309,8 +473,8 @@ class Testcategory {
$exercise->read($exercise_id);
$question_list = $exercise->selectQuestionList();
// the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ? ? ?
- for ($i=1; $i <= count($question_list); $i++) {
- $category_in_question = Testcategory::getCategoryForQuestion($question_list[$i]);
+ foreach ($question_list as $question_id) {
+ $category_in_question = Testcategory::getCategoryForQuestion($question_id);
if (in_array($category_id, $category_in_question)) {
$number_questions_in_category++;
}
@@ -329,9 +493,10 @@ class Testcategory {
$list_categories = Testcategory::getListOfCategoriesIDForTest($exercise_id);
if (!empty($list_categories)) {
- for ($i=0; $i < count($list_categories); $i++) {
- if ($list_categories[$i] > 0) { // 0 = no category for this question
- $nbQuestionInThisCat = Testcategory::getNumberOfQuestionsInCategoryForTest($exercise_id, $list_categories[$i]);
+ foreach ($list_categories as $category_item) {
+ if ($category_item > 0) {
+ // 0 = no category for this question
+ $nbQuestionInThisCat = Testcategory::getNumberOfQuestionsInCategoryForTest($exercise_id, $category_item);
if ($nbQuestionInThisCat > $in_nbrandom) {
$nbquestionresult += $in_nbrandom;
@@ -363,39 +528,48 @@ class Testcategory {
}
/**
- * return an array of question_id for each 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
- * In this version, a question has 0 or 1 category
+ * Returns an array of question ids for each category
+ * $categories[1][30] = 10, array with category id = 1 and question_id = 10
+ * A question has "n" categories
*/
- static function getQuestionsByCat($in_exerciceId) {
- $tabres = array();
+ static function getQuestionsByCat($exerciceId, $check_in_question_list = array()) {
+ $categories = array();
$TBL_EXERCICE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
$TBL_QUESTION_REL_CATEGORY = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
- $in_exerciceId = intval($in_exerciceId);
- $sql = "SELECT qrc.question_id, qrc.category_id FROM $TBL_QUESTION_REL_CATEGORY qrc, $TBL_EXERCICE_QUESTION eq
- WHERE exercice_id=$in_exerciceId AND eq.question_id=qrc.question_id AND eq.c_id=".api_get_course_int_id()." AND eq.c_id=qrc.c_id ORDER BY category_id, question_id";
+ $exerciceId = intval($exerciceId);
+ $sql = "SELECT DISTINCT qrc.question_id, qrc.category_id
+ FROM $TBL_QUESTION_REL_CATEGORY qrc, $TBL_EXERCICE_QUESTION eq
+ WHERE exercice_id = $exerciceId AND
+ eq.question_id = qrc.question_id AND
+ eq.c_id =".api_get_course_int_id()." AND
+ eq.c_id = qrc.c_id
+ ORDER BY category_id, question_id";
$res = Database::query($sql);
while ($data = Database::fetch_array($res)) {
- if (!is_array($tabres[$data['category_id']])) {
- $tabres[$data['category_id']] = array();
- }
- $tabres[$data['category_id']][] = $data['question_id'];
- }
- return $tabres;
- }
+ if (!empty($check_in_question_list)) {
+ if (!in_array($data['question_id'], $check_in_question_list)) {
+ continue;
+ }
+ }
+
+ if (!is_array($categories[$data['category_id']])) {
+ $categories[$data['category_id']] = array();
+ }
+ $categories[$data['category_id']][] = $data['question_id'];
+ }
+ return $categories;
+ }
/**
- * return a tab of $in_number random elements of $in_tab
+ * Return an array of X elements of an array
*/
- static function getNElementsFromArray($in_tab, $in_number) {
- $tabres = $in_tab;
- shuffle($tabres);
- if ($in_number < count($tabres)) {
- $tabres = array_slice($tabres, 0, $in_number);
+ static function getNElementsFromArray($array, $random_number) {
+ shuffle($array);
+ if ($random_number < count($array)) {
+ $array = array_slice($array, 0, $random_number);
}
- return $tabres;
+ return $array;
}
/**
@@ -412,24 +586,24 @@ class Testcategory {
}
/**
- * sortTabByBracketLabel ($tabCategoryQuestions)
- * key of $tabCategoryQuestions are the categopy id (0 for not in a category)
+ * key of $array are the categopy id (0 for not in a category)
* value is the array of question id of this category
* Sort question by Category
*/
- static function sortTabByBracketLabel($in_tab) {
+ static function sortCategoriesQuestionByName($array) {
$tabResult = array();
- $tabCatName = array(); // tab of category name
- while (list($cat_id, $tabquestion) = each($in_tab)) {
- $catTitle = new Testcategory($cat_id);
- $tabCatName[$cat_id] = $catTitle->name;
+ $category_array = array();
+ // tab of category name
+ while (list($cat_id, $tabquestion) = each($array)) {
+ $cat = new Testcategory($cat_id);
+ $category_array[$cat_id] = $cat->title;
}
- reset($in_tab);
+ reset($array);
// sort table by value, keeping keys as they are
- asort($tabCatName);
+ asort($category_array);
// keys of $tabCatName are keys order for $in_tab
- while (list($key, $val) = each($tabCatName)) {
- $tabResult[$key] = $in_tab[$key];
+ while (list($key, $val) = each($category_array)) {
+ $tabResult[$key] = $array[$key];
}
return $tabResult;
}
@@ -538,7 +712,7 @@ class Testcategory {
if (empty($category_list)) {
return null;
}
- $category_name_list = Testcategory::getListOfCategoriesNameForTest($exercise_id);
+ $category_name_list = Testcategory::getListOfCategoriesNameForTest($exercise_id, false);
$table = new HTML_Table(array('class' => 'data_table'));
$table->setHeaderContents(0, 0, get_lang('Categories'));
@@ -581,7 +755,138 @@ class Testcategory {
return null;
}
+ function get_all_categories() {
+ $table = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
+ $sql = "SELECT * FROM $table ORDER BY title ASC";
+ $res = Database::query($sql);
+ while ($row = Database::fetch_array($res,'ASSOC')) {
+ $array[] = $row;
+ }
+ return $array;
+ }
+
+ function get_category_exercise_tree($exercise_id, $course_id, $order = null) {
+ $table = Database::get_course_table(TABLE_QUIZ_REL_CATEGORY);
+ $table_category = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
+ $sql = "SELECT * FROM $table qc INNER JOIN $table_category c ON (category_id = c.iid) WHERE exercise_id = {$exercise_id} AND qc.c_id = {$course_id} ";
+
+ if (!empty($order)) {
+ $sql .= "ORDER BY $order";
+ }
+
+ $result = Database::query($sql);
+ if (Database::num_rows($result)) {
+ while ($row = Database::fetch_array($result, 'ASSOC')) {
+ $list[$row['category_id']] = $row;
+ }
+ if (!empty($list)) {
+ $array = $this->sort_tree_array($list);
+ $this->create_tree_array($array);
+ }
+ return $this->category_array_tree;
+ }
+ return false;
+ }
+
+
+
+ function get_category_tree_by_type($type) {
+ $course_id = api_get_course_int_id();
+ if ($type == 'global') {
+ $course_condition = 'c_id = 0';
+ } else {
+ $course_condition = " c_id IN ('$course_id', '0') ";
+ }
+ $t_cattable = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
+
+ $sql = "SELECT * FROM $t_cattable WHERE $course_condition";
+ $res = Database::query($sql);
+ $categories = array();
+ while ($row = Database::fetch_array($res, 'ASSOC')) {
+ $row['id'] = $row['iid'];
+ $categories[] = $row;
+ }
+ if (!empty($categories)) {
+ $array = $this->sort_tree_array($categories);
+ $this->create_tree_array($array);
+ }
+ return $this->category_array_tree;
+ }
+
+ function return_category_form($exercise_obj) {
+
+ $categories = $this->getListOfCategoriesForTest($exercise_obj);
+
+ if (!empty($categories)) {
+ $array = $this->sort_tree_array($categories);
+ $this->create_tree_array($array);
+ }
+
+ $saved_categories = $exercise_obj->get_categories_in_exercise();
+
+ if (!empty($this->category_array_tree)) {
+ $nbQuestionsTotal = $exercise_obj->getNumberQuestionExerciseCategory();
+ $original_grouping = $exercise_obj->categories_grouping;
+ $exercise_obj->setCategoriesGrouping(true);
+ $real_question_count = count($exercise_obj->selectQuestionList(true));
+ $exercise_obj->setCategoriesGrouping($original_grouping);
+
+ $warning = null;
+ if ($nbQuestionsTotal != $real_question_count) {
+ $warning = Display::return_message(get_lang('CheckThatYouHaveEnoughQuestionsInYourCategories'), 'warning');
+ }
-}
-endif;
\ No newline at end of file
+ $return .= $warning;
+ $return .= '
';
+ return $return;
+ }
+ }
+
+ public function sort_tree_array($array) {
+ foreach ($array as $key => $row) {
+ $parent[$key] = $row['parent_id'];
+ }
+ if (count($array) > 0) {
+ array_multisort($parent, SORT_ASC, $array);
+ }
+ return $array;
+ }
+
+ public function create_tree_array($array, $parent = 0, $depth = -1, $tmp = array()) {
+ if (is_array($array)) {
+ for ($i = 0; $i < count($array); $i++) {
+ //var_dump($array[$i], $parent, $tmp);
+ if ($array[$i]['parent_id'] == $parent) {
+ if (!in_array($array[$i]['parent_id'], $tmp)) {
+ $tmp[] = $array[$i]['parent_id'];
+ $depth++;
+ }
+ $row = $array[$i];
+ $row['id'] = $array[$i]['iid'];
+ $row['depth'] = $depth;
+ $this->category_array_tree[] = $row;
+ $this->create_tree_array($array, $array[$i]['iid'], $depth, $tmp);
+ }
+ }
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/main/exercice/tests_category.php b/main/exercice/tests_category.php
index 19cf658939..7cff469fee 100644
--- a/main/exercice/tests_category.php
+++ b/main/exercice/tests_category.php
@@ -6,6 +6,27 @@
hubert.borderiou
Manage tests category page
*/
+// name of the language file that needs to be included
+$language_file = 'exercice';
+$nameTools = "";
+
+require_once '../inc/global.inc.php';
+require_once 'exercise.lib.php';
+require_once 'question.class.php';
+
+$this_section = SECTION_COURSES;
+
+if (!api_is_allowed_to_edit()) {
+ api_not_allowed(true);
+}
+
+$type = isset($_GET['type']) ? Security::remove_XSS($_GET['type']) : 'simple';
+
+if ($type == 'global' && !api_is_platform_admin()) {
+ api_not_allowed(true);
+}
+
+$url = api_get_path(WEB_AJAX_PATH).'exercise.ajax.php?type='.$type;
$htmlHeadXtra[] = '
-';
-// name of the language file that needs to be included
-$language_file = 'exercice';
-$nameTools = "";
+ function check() {
+ $("#parent_id option:selected").each(function() {
+ var id = $(this).val();
+ var name = $(this).text();
+ if (id != "" ) {
+ $.ajax({
+ async: false,
+ url: "'.$url.'&a=exercise_category_exists",
+ data: "id="+id,
+ success: function(return_value) {
+ if (return_value == 0 ) {
+ alert("'.get_lang('CategoryDoesNotExists').'");
+ //Deleting select option tag
+ $("#parent_id").find("option").remove();
-require_once '../inc/global.inc.php';
-require_once 'exercise.lib.php';
-require_once 'question.class.php';
-require_once 'testcategory.class.php';
+ $(".holder li").each(function () {
+ if ($(this).attr("rel") == id) {
+ $(this).remove();
+ }
+ });
+ }
+ },
+ });
+ }
+ });
+ }
-$this_section = SECTION_COURSES;
+ $(function() {
+ $("#parent_id").fcbkcomplete({
+ json_url: "'.$url.'&a=search_category_parent",
+ maxitems: 1,
+ addontab: false,
+ input_min_size: 1,
+ cache: false,
+ complete_text:"'.get_lang('StartToType').'",
+ firstselected: false,
+ onselect: check,
+ filter_selected: true,
+ newel: true
+ });
+ });
+';
-if (!api_is_allowed_to_edit()) {
- api_not_allowed(true);
-}
+$htmlHeadXtra[] = '';
+$htmlHeadXtra[] = '
';
-// breadcrumbs
+// Breadcrumbs
$interbreadcrumb[] = array("url" => "exercice.php", "name" => get_lang('Exercices'));
Display::display_header(get_lang('Category'));
// Action handling: add, edit and remove
if (isset($_GET['action']) && $_GET['action'] == 'addcategory') {
- add_category_form($_GET['action']);
+ add_category_form($_GET['action'], $type);
+} else if (isset($_GET['action']) && $_GET['action'] == 'addcategoryglobal') {
+ add_category_form($_GET['action'], $type);
} else if (isset($_GET['action']) && $_GET['action'] == 'editcategory') {
- edit_category_form($_GET['action']);
+ edit_category_form($_GET['action'], $type);
} else if (isset($_GET['action']) && $_GET['action'] == 'deletecategory') {
- delete_category_form($_GET['action']);
+ delete_category_form($_GET['action'], $type);
} else {
- display_add_category();
- display_categories();
+ display_add_category($type);
+ display_categories($type);
}
Display::display_footer();
// FUNCTIONS
// form to edit a category
-function edit_category_form($in_action) {
+function edit_category_form($in_action, $type = 'simple') {
$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);
- // initiate the object
- $form = new FormValidator('note', 'post', api_get_self() . '?action=' . $in_action . '&category_id=' . $category_id);
+ // initiate the object
+ $form = new FormValidator('note', 'post', api_get_self().'?action='.$in_action.'&category_id='.$category_id."&type=".$type);
- // settting the form elements
+ // settting the form elements
$form->addElement('header', get_lang('EditCategory'));
$form->addElement('hidden', 'category_id');
- $form->addElement('text', 'category_name', get_lang('CategoryName'), array('size' => '95'));
+ $form->addElement('text', 'category_name', get_lang('CategoryName'), array('class' => 'span6'));
$form->add_html_editor('category_description', get_lang('CategoryDescription'), false, false, array('ToolbarSet' => 'test_category', 'Width' => '90%', 'Height' => '200'));
+ $category_parent_list = array();
+
+ if (!empty($objcat->parent_id)) {
+ $parent_cat = new Testcategory($objcat->parent_id);
+ $category_parent_list = array($parent_cat->id => $parent_cat->name);
+ echo '';
+ }
+
+ $form->addElement('select', 'parent_id', get_lang('Parent'), $category_parent_list, array('id' => 'parent_id'));
$form->addElement('style_submit_button', 'SubmitNote', get_lang('ModifyCategory'), 'class="add"');
- // setting the defaults
+ // setting the defaults
$defaults = array();
$defaults["category_id"] = $objcat->id;
$defaults["category_name"] = $objcat->name;
$defaults["category_description"] = $objcat->description;
+ $defaults["parent_id"] = $objcat->parent_id;
$form->setDefaults($defaults);
- // setting the rules
+ // setting the rules
$form->addRule('category_name', get_lang('ThisFieldIsRequired'), 'required');
- // The validation or display
+ // The validation or display
if ($form->validate()) {
$check = Security::check_token('post');
if ($check) {
@@ -91,7 +153,8 @@ 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);
+ $parent_id = isset($values['parent_id']) ? $values['parent_id'] : null;
+ $objcat = new Testcategory($v_id, $v_name, $v_description, $parent_id, $type);
if ($objcat->modifyCategory()) {
Display::display_confirmation_message(get_lang('MofidfyCategoryDone'));
} else {
@@ -99,15 +162,15 @@ function edit_category_form($in_action) {
}
}
Security::clear_token();
- display_add_category();
- display_categories();
+ display_add_category($type);
+ display_categories($type);
} else {
- display_goback();
+ display_goback($type);
$token = Security::get_token();
$form->addElement('hidden', 'sec_token');
$form->setConstants(array('sec_token' => $token));
$form->display();
- display_categories();
+ display_categories($type);
}
} else {
Display::display_error_message(get_lang('CannotEditCategory'));
@@ -115,7 +178,7 @@ function edit_category_form($in_action) {
}
// process to delete a category
-function delete_category_form($in_action) {
+function delete_category_form($in_action, $type = 'simple') {
$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']);
@@ -132,30 +195,33 @@ function delete_category_form($in_action) {
} else {
Display::display_error_message(get_lang('CannotDeleteCategoryError'));
}
- display_add_category();
- display_categories();
+ display_add_category($type);
+ display_categories($type);
}
-// form to add a category
-function add_category_form($in_action) {
+// Form to add a category
+function add_category_form($in_action, $type = 'simple') {
$in_action = Security::remove_XSS($in_action);
- // initiate the object
- $form = new FormValidator('note', 'post', api_get_self() . '?action=' . $in_action);
- // settting the form elements
+ // Initiate the object
+ $form = new FormValidator('note', 'post', api_get_self().'?action='.$in_action."&type=".$type);
+ // Setting the form elements
$form->addElement('header', get_lang('AddACategory'));
- $form->addElement('text', 'category_name', get_lang('CategoryName'), array('size' => '95'));
+ $form->addElement('text', 'category_name', get_lang('CategoryName'), array('class' => 'span6'));
$form->add_html_editor('category_description', get_lang('CategoryDescription'), false, false, array('ToolbarSet' => 'test_category', 'Width' => '90%', 'Height' => '200'));
+ $form->addElement('select', 'parent_id', get_lang('Parent'), array(), array('id' => 'parent_id'));
$form->addElement('style_submit_button', 'SubmitNote', get_lang('AddTestCategory'), 'class="add"');
- // setting the rules
+
+ // Setting the rules
$form->addRule('category_name', get_lang('ThisFieldIsRequired'), 'required');
// The validation or display
if ($form->validate()) {
$check = Security::check_token('post');
if ($check) {
- $values = $form->exportValues();
+ $values = $form->getSubmitValues();
$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);
+ $parent_id = isset($values['parent_id']) && isset($values['parent_id'][0]) ? $values['parent_id'][0] : null;
+ $objcat = new Testcategory(0, $v_name, $v_description, $parent_id, $type, api_get_course_int_id());
if ($objcat->addCategoryInBDD()) {
Display::display_confirmation_message(get_lang('AddCategoryDone'));
} else {
@@ -163,59 +229,75 @@ function add_category_form($in_action) {
}
}
Security::clear_token();
- display_add_category();
- display_categories();
+ display_add_category($type);
+ display_categories($type);
} else {
- display_goback();
+ display_goback($type);
$token = Security::get_token();
$form->addElement('hidden', 'sec_token');
$form->setConstants(array('sec_token' => $token));
$form->display();
- display_categories();
}
}
// Display add category button
-function display_add_category() {
+function display_add_category($type) {
echo '
';
echo "
";
+ if ($type == 'simple') {
echo "
" . get_lang('QuestionCategory') . " ";
+ } else {
+ echo "
".get_lang('QuestionGlobalCategory')." ";
+ }
}
// Display category list
-function display_categories() {
- $course_id = api_get_course_int_id();
- $t_cattable = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
- $sql = "SELECT * FROM $t_cattable WHERE c_id = $course_id ORDER BY title";
- $res = Database::query($sql);
+function display_categories($type = 'simple') {
+ $cat = new Testcategory();
+ $categories = $cat->get_category_tree_by_type($type);
- while ($row = Database::fetch_array($res)) {
- // le titre avec le nombre de questions qui sont dans cette cat�gorie
- $tmpobj = new Testcategory($row['id']);
+ foreach ($categories as $row) {
+ // Title with number of questions in the category
+ $category_id = $row['id'];
+ $tmpobj = new Testcategory($category_id);
$nb_question = $tmpobj->getCategoryQuestionsNumber();
- echo '
';
+ echo '
';
$nb_question_label = $nb_question == 1 ? $nb_question . ' ' . get_lang('Question') : $nb_question . ' ' . get_lang('Questions');
+ $global_label = null;
+ if ($row['c_id'] == 0) {
+ $global_label = ' '.Display::label(get_lang('Global'), 'info');
+ }
echo "" . $nb_question_label . " ";
- echo $row['title'];
+ $style = 'margin-left:' . $row['depth'] * 20 . 'px; margin-right:10px;';
+ echo $title = Display::div($row['title'].$global_label, array('style' => $style));
echo '
';
echo '';
echo '
';
- echo '
' . Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL) . ' ';
- if ($nb_question > 0) {
+ if ($row['c_id'] == 0 && $type == 'simple') {
+ echo Display::return_icon('edit_na.png', get_lang('Edit'), array(), ICON_SIZE_SMALL);
+ } else {
+ echo '
'.Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).' ';
+ }
+
+ if ($nb_question > 0 || ($row['c_id'] == 0 && $type == 'simple')){
echo '
';
echo Display::return_icon('delete_na.png', get_lang('CannotDeleteCategory'), array(), ICON_SIZE_SMALL);
echo ' ';
} else {
$rowname = protectJSDialogQuote($row['title']);
- echo '
';
+ echo ' ';
echo Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . ' ';
}
echo '
';
@@ -223,9 +305,10 @@ function display_categories() {
}
// display goback to category list page link
-function display_goback() {
+function display_goback($type) {
+ $type = Security::remove_XSS($type);
echo '
';
}
diff --git a/main/exercice/unique_answer.class.php b/main/exercice/unique_answer.class.php
index 0668fb4569..ee6c48f2e9 100644
--- a/main/exercice/unique_answer.class.php
+++ b/main/exercice/unique_answer.class.php
@@ -9,9 +9,6 @@
/**
* Code
*/
-
-if(!class_exists('UniqueAnswer')):
-
/**
CLASS UNIQUE_ANSWER
*
@@ -23,7 +20,8 @@ if(!class_exists('UniqueAnswer')):
* @package chamilo.exercise
**/
-class UniqueAnswer extends Question {
+class UniqueAnswer extends Question
+{
static $typePicture = 'mcua.gif';
static $explanationLangVar = 'UniqueSelect';
@@ -119,7 +117,7 @@ class UniqueAnswer extends Question {
$question = Question::read($questionid);
if($question) {
- $select_question[$questionid]='Q'.$key.' :'.Text::cut($question->selectTitle(),20);
+ $select_question[$questionid] = 'Q'.$key.' :'.Text::cut($question->selectTitle(),20);
}
}
}
@@ -131,7 +129,7 @@ class UniqueAnswer extends Question {
$select_lp_id[0]=get_lang('SelectTargetLP');
foreach ($flat_list as $id => $details) {
- $select_lp_id[$id] = Text::cut($details['lp_name'],20);
+ $select_lp_id[$id] = Text::cut($details['lp_name'], 20);
}
$temp_scenario = array();
@@ -144,14 +142,16 @@ class UniqueAnswer extends Question {
for ($i = 1 ; $i <= $nb_answers ; ++$i) {
$form -> addElement ('html', '
');
if (isset($answer) && is_object($answer)) {
- if ($answer -> correct[$i]) {
+ $answer_id = $answer->getRealAnswerIdFromList($i);
+
+ if ($answer->correct[$answer_id]) {
$correct = $i;
}
- $defaults['answer['.$i.']'] = $answer->answer[$i];
- $defaults['comment['.$i.']'] = $answer->comment[$i];
- $defaults['weighting['.$i.']'] = Text::float_format($answer->weighting[$i], 1);
+ $defaults['answer['.$i.']'] = $answer->answer[$answer_id];
+ $defaults['comment['.$i.']'] = $answer->comment[$answer_id];
+ $defaults['weighting['.$i.']'] = float_format($answer->weighting[$answer_id], 1);
- $item_list=explode('@@',$answer -> destination[$i]);
+ $item_list = explode('@@', $answer->destination[$answer_id]);
$try = $item_list[0];
$lp = $item_list[1];
@@ -306,8 +306,7 @@ class UniqueAnswer extends Question {
url= an url
$destination_str='';
- foreach ($list_destination as $destination_id)
- {
+ foreach ($list_destination as $destination_id) {
$destination_str.=$destination_id.';';
}*/
@@ -379,13 +378,14 @@ class UniqueAnswer extends Question {
* @assert (1,1,'','',1,1,null) === false
*/
function create_answer($id=1, $question_id, $answer_title, $comment = '', $score = 0, $correct = 0, $course_id = null) {
- if (empty($question_id) or empty($answer_title)) { return false; }
+ if (empty($question_id) or empty($answer_title)) {
+ return false;
+ }
$tbl_quiz_answer = Database::get_course_table(TABLE_QUIZ_ANSWER);
$tbl_quiz_question = Database::get_course_table(TABLE_QUIZ_QUESTION);
if (empty($course_id)) {
$course_id = api_get_course_int_id();
}
- $position = 1;
$question_id = filter_var($question_id,FILTER_SANITIZE_NUMBER_INT);
$score = filter_var($score,FILTER_SANITIZE_NUMBER_FLOAT);
$correct = filter_var($correct,FILTER_SANITIZE_NUMBER_INT);
@@ -396,18 +396,15 @@ class UniqueAnswer extends Question {
$row_max = Database::fetch_object($rs_max);
$position = $row_max->max_position + 1;
// Insert a new answer
- $sql = "INSERT INTO $tbl_quiz_answer "
- ."(c_id, id, question_id,answer,correct,comment,ponderation,position,destination)"
- ."VALUES ($course_id, $id,$question_id,'".Database::escape_string($answer_title)."',"
+ $sql = "INSERT INTO $tbl_quiz_answer (c_id, question_id,answer,correct,comment,ponderation,position,destination)"
+ ."VALUES ($course_id, $question_id,'".Database::escape_string($answer_title)."',"
."$correct,'".Database::escape_string($comment)."',$score,$position, "
." '0@@0@@0@@0')";
$rs = Database::query($sql);
if ($correct) {
- $sql = "UPDATE $tbl_quiz_question "
- ." SET ponderation = (ponderation + $score) WHERE c_id = $course_id AND id = ".$question_id;
+ $sql = "UPDATE $tbl_quiz_question SET ponderation = (ponderation + $score) WHERE c_id = $course_id AND iid = ".$question_id;
$rs = Database::query($sql);
return $rs;
}
}
-}
-endif;
+}
\ No newline at end of file
diff --git a/main/exercice/unique_answer_no_option.class.php b/main/exercice/unique_answer_no_option.class.php
index 88b5ccb1f8..f3328ccdb2 100644
--- a/main/exercice/unique_answer_no_option.class.php
+++ b/main/exercice/unique_answer_no_option.class.php
@@ -10,9 +10,6 @@
/**
* Code
*/
-
-if(!class_exists('UniqueAnswerNoOption')):
-
/**
CLASS UNIQUE_ANSWER
*
@@ -24,7 +21,8 @@ if(!class_exists('UniqueAnswerNoOption')):
* @package chamilo.exercise
**/
-class UniqueAnswerNoOption extends Question {
+class UniqueAnswerNoOption extends Question
+{
static $typePicture = 'mcuao.gif';
static $explanationLangVar = 'UniqueAnswerNoOption';
@@ -121,7 +119,8 @@ class UniqueAnswerNoOption extends Question {
}
}
for ($k = 1 ; $k <= $nb_answers; ++$k) {
- if ($answer->position[$k] != '666') {
+ $answer_id = $answer->getRealAnswerIdFromList($k);
+ if ($answer->position[$answer_id] != '666') {
$new_list[$count] = $count;
$count++;
}
@@ -137,25 +136,26 @@ class UniqueAnswerNoOption extends Question {
foreach ($new_list as $key) {
$i = $key;
$form -> addElement ('html', ' ');
+ $answer_id = $answer->getRealAnswerIdFromList($i);
if (is_object($answer)) {
- if($answer->position[$i] == 666) {
+ if ($answer->position[$answer_id] == 666) {
//we set nothing
} else {
- if ($answer->correct[$i]) {
+ if ($answer->correct[$answer_id]) {
$correct = $i;
}
- $answer_result = $answer->answer[$i];
- $weight_result = Text::float_format($answer->weighting[$i], 1);
+ $answer_result = $answer->answer[$answer_id];
+ $weight_result = float_format($answer->weighting[$answer_id], 1);
if ($nb_answers == $i) {
$weight_result = '0';
}
$defaults['answer['.$i.']'] = $answer_result;
- $defaults['comment['.$i.']'] = $answer->comment[$i];
+ $defaults['comment['.$i.']'] = $answer->comment[$answer_id];
$defaults['weighting['.$i.']'] = $weight_result;
- $item_list=explode('@@',$answer -> destination[$i]);
+ $item_list = explode('@@', $answer->destination[$answer_id]);
$try = $item_list[0];
$lp = $item_list[1];
@@ -413,5 +413,4 @@ class UniqueAnswerNoOption extends Question {
$header .= ' ';
return $header;
}
-}
-endif;
+}
\ No newline at end of file
diff --git a/main/exercice/upload_exercise.php b/main/exercice/upload_exercise.php
index 010ed116b4..f5a06b1987 100644
--- a/main/exercice/upload_exercise.php
+++ b/main/exercice/upload_exercise.php
@@ -32,14 +32,8 @@ if (!$is_allowed_to_edit) {
api_not_allowed(true);
}
-// setting the tabs
+// Setting the tabs
$this_section = SECTION_COURSES;
-$htmlHeadXtra[] = "";
// Action handling
lp_upload_quiz_action_handling();
@@ -55,50 +49,32 @@ if ($origin != 'learnpath') {
Display :: display_confirmation_message(get_lang($_GET['message']));
}
}
-} else {
- echo '
';
}
// display the actions
echo '
';
echo lp_upload_quiz_actions();
echo '
';
-// start the content div
-echo '
';
// the main content
lp_upload_quiz_main();
-// close the content div
-echo '
';
-
-function lp_upload_quiz_actions()
-{
+function lp_upload_quiz_actions() {
$lp_id = Security::remove_XSS($_GET['lp_id']);
$return = "";
- $return .= '
'.Display::return_icon(
- 'back.png',
- get_lang('BackToExercisesList'),
- '',
- ICON_SIZE_MEDIUM
- ).' ';
+ $return .= '
'.Display::return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).' ';
return $return;
}
-function lp_upload_quiz_secondary_actions()
-{
+function lp_upload_quiz_secondary_actions() {
$lp_id = Security::remove_XSS($_GET['lp_id']);
$return .= '';
- $return .= '
'.Display :: return_icon(
- 'reporting32.png',
- get_lang('Tracking')
- ).get_lang('Tracking').' ';
+ $return.='
'.Display :: return_icon('reporting32.png', get_lang('Tracking')).get_lang('Tracking').' ';
return $return;
}
-function lp_upload_quiz_main()
-{
+function lp_upload_quiz_main() {
// variable initialisation
$lp_id = Security::remove_XSS($_GET['lp_id']);
@@ -286,13 +262,6 @@ function lp_upload_quiz_action_handling()
} else {
$comment = $feedback_false_list[$i][2];
}
- /*
- if ($id == 1) {
- $comment = $feedback_true_list[$i][2];
- } elseif ($id == 2) {
- $comment = $feedback_false_list[$i][2];
- }
- */
// Create answer
$unique_answer->create_answer($id, $question_id, $answer, $comment, $score, $correct);
$id++;
diff --git a/main/img/icons/32/folder_category.gif b/main/img/icons/32/folder_category.gif
new file mode 100644
index 0000000000..fdf955753f
Binary files /dev/null and b/main/img/icons/32/folder_category.gif differ
diff --git a/main/img/icons/32/folder_global_category.png b/main/img/icons/32/folder_global_category.png
new file mode 100644
index 0000000000..3f032251f1
Binary files /dev/null and b/main/img/icons/32/folder_global_category.png differ
diff --git a/main/img/icons/32/folder_global_category_new.gif b/main/img/icons/32/folder_global_category_new.gif
new file mode 100644
index 0000000000..8fda0d481a
Binary files /dev/null and b/main/img/icons/32/folder_global_category_new.gif differ
diff --git a/main/img/icons/32/folder_global_category_new.png b/main/img/icons/32/folder_global_category_new.png
new file mode 100644
index 0000000000..c0f6e963ce
Binary files /dev/null and b/main/img/icons/32/folder_global_category_new.png differ
diff --git a/main/img/icons/64/looknfeel.png b/main/img/icons/64/looknfeel.png
new file mode 100644
index 0000000000..abd6404973
Binary files /dev/null and b/main/img/icons/64/looknfeel.png differ
diff --git a/main/inc/ajax/exercise.ajax.php b/main/inc/ajax/exercise.ajax.php
index 44d9947296..c573bf80dd 100644
--- a/main/inc/ajax/exercise.ajax.php
+++ b/main/inc/ajax/exercise.ajax.php
@@ -21,6 +21,35 @@ $session_id = isset($_REQUEST['session_id']) ? intval($_REQUEST['session_id']) :
$course_code = isset($_REQUEST['cidReq']) ? $_REQUEST['cidReq'] : api_get_course_id();
switch ($action) {
+ case 'exercise_category_exists':
+ $category = new Testcategory();
+ $category->getCategory($_REQUEST['id']);
+ if (empty($category->id)) {
+ echo 0;
+ } else {
+ echo 1;
+ }
+ break;
+ case 'search_category_parent':
+ $type = isset($_REQUEST['type']) ? $_REQUEST['type'] : 'simple';
+
+ $cat = new Testcategory(null, null, null, null, $type);
+ $items = $cat->get_categories_by_keyword($_REQUEST['tag']);
+
+ $json_items = array();
+ if (!empty($items)) {
+ foreach ($items as $item) {
+ if ($item['c_id'] == 0) {
+ $item['title'] .= " [".get_lang('Global')."]";
+ }
+ $json_items[] = array(
+ 'key' => $item['iid'],
+ 'value' => $item['title']
+ );
+ }
+ }
+ echo json_encode($json_items);
+ break;
case 'get_live_stats':
if (!api_is_allowed_to_edit(null, true)) {
break;
@@ -212,18 +241,21 @@ switch ($action) {
//Attempt id
$exe_id = $_REQUEST['exe_id'];
- if ($debug) error_log("exe_id = $exe_id ");
- if ($debug) error_log("type = $type ");
- if ($debug) error_log("choice = ".print_r($choice, 1)." ");
- if ($debug) error_log("hot_spot_coordinates = ".print_r($hot_spot_coordinates,1));
- if ($debug) error_log("remind_list = ".print_r($remind_list));
+ if ($debug) {
+ error_log("exe_id = $exe_id ");
+ error_log("type = $type ");
+ error_log("choice = ".print_r($choice, 1)." ");
+ error_log("hot_spot_coordinates = ".print_r($hot_spot_coordinates,1));
+ error_log("remind_list = ".print_r($remind_list));
+ }
//Exercise information
$objExercise = isset($_SESSION['objExercise']) ? $_SESSION['objExercise'] : null;
//Question info
$question_id = intval($_REQUEST['question_id']);
- $question_list = $_SESSION['questionList'];
+ //$question_list = $_SESSION['questionList'];
+ $question_list = $_SESSION['question_list_flatten'];
//If exercise or question is not set then exit
if (empty($question_list) || empty($objExercise)) {
@@ -297,12 +329,14 @@ switch ($action) {
//Looping the question list
+ if ($debug) error_log("Looping question list".print_r($question_list, 1));
+ if ($debug) error_log("Trying to save question: $question_id ");
foreach ($question_list as $my_question_id) {
- if ($debug) error_log("Saving question_id = $my_question_id ");
if ($type == 'simple' && $question_id != $my_question_id) {
continue;
}
+ if ($debug) error_log("Saving question_id = $my_question_id ");
$my_choice = $choice[$my_question_id];
@@ -380,17 +414,19 @@ switch ($action) {
$_SESSION['duration_time'][$key] = time();
- update_event_exercise( $exe_id,
- $objExercise->selectId(),
- $total_score,
- $total_weight,
- $session_id,
- $exercise_stat_info['orig_lp_id'],
- $exercise_stat_info['orig_lp_item_id'],
- $exercise_stat_info['orig_lp_item_view_id'],
- $duration,
- 'incomplete',
- $remind_list);
+ update_event_exercise(
+ $exe_id,
+ $objExercise->selectId(),
+ $total_score,
+ $total_weight,
+ $session_id,
+ $exercise_stat_info['orig_lp_id'],
+ $exercise_stat_info['orig_lp_item_id'],
+ $exercise_stat_info['orig_lp_item_view_id'],
+ $duration,
+ 'incomplete',
+ $remind_list
+ );
// Destruction of the Question object
unset($objQuestionTmp);
diff --git a/main/inc/ajax/model.ajax.php b/main/inc/ajax/model.ajax.php
index d24de69e03..477919ba22 100644
--- a/main/inc/ajax/model.ajax.php
+++ b/main/inc/ajax/model.ajax.php
@@ -38,12 +38,20 @@ if (!in_array($action, array(
'get_timelines',
'get_user_skill_ranking',
'get_usergroups_teacher',
- 'get_question_list'
+ 'get_question_list',
+ 'get_user_list_plugin_widescale'
))
) {
api_protect_admin_script(true);
}
+if ($action == 'get_user_list_plugin_widescale') {
+ $allowed = api_is_drh() || api_is_platform_admin();
+ if (!$allowed) {
+ api_not_allowed();
+ }
+}
+
//Search features
$ops = array(
@@ -181,6 +189,9 @@ if (!$sidx) $sidx = 1;
//@todo rework this
switch ($action) {
+ case 'get_user_list_plugin_widescale':
+ $count = UserManager::get_user_data(null, null, null, null, true);
+ break;
case 'get_question_list':
require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.class.php';
$exerciseId = isset($_REQUEST['exerciseId']) ? $_REQUEST['exerciseId'] : null;
@@ -320,6 +331,11 @@ $is_allowedToEdit = api_is_allowed_to_edit(null,true) || api_is_allowed_to_edit(
$columns = array();
switch ($action) {
+ case 'get_user_list_plugin_widescale':
+ $columns = array('username', 'firstname', 'lastname', 'exam_password');
+ $column_names = array(get_lang('Username'), get_lang('Firstname'), get_lang('Lastname'), get_lang('Password'));
+ $result = UserManager::get_user_data($start, $limit, $sidx, $sord);
+ break;
case 'get_question_list':
if (isset($exercise) && !empty($exercise)) {
$columns = array('question', 'type', 'category', 'level', 'score', 'actions');
@@ -333,6 +349,11 @@ switch ($action) {
case 'get_course_exercise_medias':
$columns = array('question');
$result = Question::get_course_medias($course_id, $start, $limit, $sidx, $sord, $where_condition);
+ if (!empty($result)) {
+ foreach ($result as &$media) {
+ $media['id'] = $media['iid'];
+ }
+ }
break;
case 'get_user_course_report_resumed':
$columns = array('extra_ruc', 'training_hours', 'count_users', 'count_users_registered', 'average_hours_per_user', 'count_certificates');
@@ -553,7 +574,7 @@ switch ($action) {
$group['sessions'] = count($obj->get_sessions_by_usergroup($group['id']));
$group['courses'] = count($obj->get_courses_by_usergroup($group['id']));
$group['users'] = count($obj->get_users_by_usergroup($group['id']));
- switch($group['group_type']) {
+ switch ($group['group_type']) {
case '0':
$group['group_type'] = Display::label(get_lang('Class'), 'info');
break;
@@ -668,7 +689,8 @@ $allowed_actions = array(
'get_user_course_report',
'get_user_course_report_resumed',
'get_group_reporting',
- 'get_question_list'
+ 'get_question_list',
+ 'get_user_list_plugin_widescale'
);
//5. Creating an obj to return a json
diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php
index 7a26ed756a..e652d2f7c4 100644
--- a/main/inc/global.inc.php
+++ b/main/inc/global.inc.php
@@ -100,6 +100,12 @@ require_once $includePath.'/lib/internationalization_internal.lib.php';
// Do not over-use this variable. It is only for this script's local use.
$libPath = $includePath.'/lib/';
+// Database constants
+require_once $libPath.'database.constants.inc.php';
+
+// @todo Rewrite the events.lib.inc.php in a class
+require_once $libPath.'events.lib.inc.php';
+
/** Loading config files */
if ($alreadyInstalled) {
$configPath = $includePath.'/../../config/';
@@ -333,6 +339,115 @@ $app['form.extensions'] = $app->share($app->extend('form.extensions', function (
return $extensions;
}));*/
+
+// Setting Doctrine service provider (DBAL)
+if (isset($app['configuration']['main_database'])) {
+
+ $app->register(new Silex\Provider\DoctrineServiceProvider(), array(
+ 'db.options' => array(
+ 'driver' => 'pdo_mysql',
+ 'dbname' => $app['configuration']['main_database'],
+ 'user' => $app['configuration']['db_user'],
+ 'password' => $app['configuration']['db_password'],
+ 'host' => $app['configuration']['db_host'],
+ 'charset' => 'utf8',
+ /*'driverOptions' => array(
+ 1002 => 'SET NAMES utf8'
+ )*/
+ )
+ ));
+
+ // Setting Doctrine ORM
+ $app->register(new Dflydev\Silex\Provider\DoctrineOrm\DoctrineOrmServiceProvider, array(
+ 'orm.auto_generate_proxies' => true,
+ "orm.proxies_dir" => $app['db.orm.proxies_dir'],
+ //'orm.proxies_namespace' => '\Doctrine\ORM\Proxy\Proxy',
+ "orm.em.options" => array(
+ "mappings" => array(
+ array(
+ //If true, only simple notations like @Entity will work. If false, more advanced notations and aliasing via use will work. (Example: use Doctrine\ORM\Mapping AS ORM, @ORM\Entity)
+ 'use_simple_annotation_reader' => false,
+ "type" => "annotation",
+ "namespace" => "Entity",
+ "path" => api_get_path(INCLUDE_PATH).'Entity',
+ )
+ ),
+ ),
+ ));
+
+ // Temporal fix to load gedmo libs
+ $sortableGroup = new Gedmo\Mapping\Annotation\SortableGroup(array());
+ $sortablePosition = new Gedmo\Mapping\Annotation\SortablePosition(array());
+
+ // Setting Doctrine2 extensions
+ $timestampableListener = new \Gedmo\Timestampable\TimestampableListener();
+ $app['db.event_manager']->addEventSubscriber($timestampableListener);
+
+ $sluggableListener = new \Gedmo\Sluggable\SluggableListener();
+ $app['db.event_manager']->addEventSubscriber($sluggableListener);
+
+ $sortableListener = new Gedmo\Sortable\SortableListener();
+ $app['db.event_manager']->addEventSubscriber($sortableListener);
+}
+
+// Connect to the server database and select the main chamilo database.
+if (!($conn_return = @Database::connect(
+ array(
+ 'server' => $app['configuration']['db_host'],
+ 'username' => $app['configuration']['db_user'],
+ 'password' => $app['configuration']['db_password'],
+ 'persistent' => isset($app['configuration']['db_persistent_connection']) ? $app['configuration']['db_persistent_connection'] : null
+ // When $app['configuration']['db_persistent_connection'] is set, it is expected to be a boolean type.
+ )
+))
+) {
+ //$app->abort(500, "Database is unavailable"); //error 3
+}
+
+/*
+if (!$app['configuration']['db_host']) {
+ //$app->abort(500, "Database is unavailable"); //error 3
+}*/
+
+$charset = 'UTF-8';
+$checkConnection = false;
+
+if (isset($app['configuration']['main_database'])) {
+ // The system has not been designed to use special SQL modes that were introduced since MySQL 5.
+ Database::query("set session sql_mode='';");
+
+ $checkConnection = @Database::select_db($app['configuration']['main_database'], $conn_return);
+
+ if ($checkConnection) {
+
+ // Initialization of the database encoding to be used.
+ Database::query("SET SESSION character_set_server='utf8';");
+ Database::query("SET SESSION collation_server='utf8_general_ci';");
+
+ /* Initialization of the default encodings */
+
+ // The platform's character set must be retrieved at this early moment.
+ /*$sql = "SELECT selected_value FROM settings_current WHERE variable = 'platform_charset';";
+
+ $result = Database::query($sql);
+ while ($row = @Database::fetch_array($result)) {
+ $charset = $row[0];
+ }
+ if (empty($charset)) {
+ $charset = 'UTF-8';
+ }*/
+ //Charset is UTF-8
+
+ if (api_is_utf8($charset)) {
+ // See Bug #1802: For UTF-8 systems we prefer to use "SET NAMES 'utf8'" statement in order to avoid a bizarre problem with Chinese language.
+ Database::query("SET NAMES 'utf8';");
+ } else {
+ Database::query("SET CHARACTER SET '".Database::to_db_encoding($charset)."';");
+ }
+ Database::query("SET NAMES 'utf8';");
+ }
+}
+
// The script is allowed? This setting is modified when calling api_is_not_allowed()
$app['allowed'] = true;
@@ -430,54 +545,6 @@ if (is_writable($app['temp.path'])) {
);
}
-// Setting Doctrine service provider (DBAL)
-if (isset($app['configuration']['main_database'])) {
-
- $app->register(new Silex\Provider\DoctrineServiceProvider(), array(
- 'db.options' => array(
- 'driver' => 'pdo_mysql',
- 'dbname' => $app['configuration']['main_database'],
- 'user' => $app['configuration']['db_user'],
- 'password' => $app['configuration']['db_password'],
- 'host' => $app['configuration']['db_host'],
- 'driverOptions' => array(
- 1002 => 'SET NAMES utf8'
- )
- )
- ));
-
- // Setting Doctrine ORM
- $app->register(new Dflydev\Silex\Provider\DoctrineOrm\DoctrineOrmServiceProvider, array(
- 'orm.auto_generate_proxies' => true,
- "orm.proxies_dir" => $app['db.orm.proxies_dir'],
- //'orm.proxies_namespace' => '\Doctrine\ORM\Proxy\Proxy',
- "orm.em.options" => array(
- "mappings" => array(
- array(
- //If true, only simple notations like @Entity will work. If false, more advanced notations and aliasing via use will work. (Example: use Doctrine\ORM\Mapping AS ORM, @ORM\Entity)
- 'use_simple_annotation_reader' => false,
- "type" => "annotation",
- "namespace" => "Entity",
- "path" => api_get_path(INCLUDE_PATH).'Entity',
- )
- ),
- ),
- ));
-
- // Temporal fix to load gedmo libs
- $sortableGroup = new Gedmo\Mapping\Annotation\SortableGroup(array());
- $sortablePosition = new Gedmo\Mapping\Annotation\SortablePosition(array());
-
- // Setting Doctrine2 extensions
- $timestampableListener = new \Gedmo\Timestampable\TimestampableListener();
- $app['db.event_manager']->addEventSubscriber($timestampableListener);
-
- $sluggableListener = new \Gedmo\Sluggable\SluggableListener();
- $app['db.event_manager']->addEventSubscriber($sluggableListener);
-
- $sortableListener = new Gedmo\Sortable\SortableListener();
- $app['db.event_manager']->addEventSubscriber($sortableListener);
-}
define('IMAGE_PROCESSOR', 'gd'); // imagick or gd strings
@@ -534,68 +601,6 @@ if ($app['debug'] && isset($app['configuration']['main_database'])) {
});
}
-// Database constants
-require_once $libPath.'database.constants.inc.php';
-// @todo Rewrite the events.lib.inc.php in a class
-require_once $libPath.'events.lib.inc.php';
-
-// Connect to the server database and select the main chamilo database.
-if (!($conn_return = @Database::connect(
- array(
- 'server' => $app['configuration']['db_host'],
- 'username' => $app['configuration']['db_user'],
- 'password' => $app['configuration']['db_password'],
- 'persistent' => isset($app['configuration']['db_persistent_connection']) ? $app['configuration']['db_persistent_connection'] : null
- // When $app['configuration']['db_persistent_connection'] is set, it is expected to be a boolean type.
- )
-))
-) {
- //$app->abort(500, "Database is unavailable"); //error 3
-}
-
-/*
-if (!$app['configuration']['db_host']) {
- //$app->abort(500, "Database is unavailable"); //error 3
-}*/
-
-$charset = 'UTF-8';
-$checkConnection = false;
-
-if (isset($app['configuration']['main_database'])) {
- // The system has not been designed to use special SQL modes that were introduced since MySQL 5.
- Database::query("set session sql_mode='';");
-
- $checkConnection = @Database::select_db($app['configuration']['main_database'], $conn_return);
-
- if ($checkConnection) {
-
- // Initialization of the database encoding to be used.
- Database::query("SET SESSION character_set_server='utf8';");
- Database::query("SET SESSION collation_server='utf8_general_ci';");
-
- /* Initialization of the default encodings */
-
- // The platform's character set must be retrieved at this early moment.
- /*$sql = "SELECT selected_value FROM settings_current WHERE variable = 'platform_charset';";
-
- $result = Database::query($sql);
- while ($row = @Database::fetch_array($result)) {
- $charset = $row[0];
- }
- if (empty($charset)) {
- $charset = 'UTF-8';
- }*/
- //Charset is UTF-8
-
- if (api_is_utf8($charset)) {
- // See Bug #1802: For UTF-8 systems we prefer to use "SET NAMES 'utf8'" statement in order to avoid a bizarre problem with Chinese language.
- Database::query("SET NAMES 'utf8';");
- } else {
- Database::query("SET CHARACTER SET '".Database::to_db_encoding($charset)."';");
- }
- Database::query("SET NAMES 'utf8';");
- }
-}
// Preserving the value of the global variable $charset.
$charset_initial_value = $charset;
diff --git a/main/inc/lib/database.constants.inc.php b/main/inc/lib/database.constants.inc.php
index bedd60368d..32f52e7be0 100644
--- a/main/inc/lib/database.constants.inc.php
+++ b/main/inc/lib/database.constants.inc.php
@@ -198,8 +198,9 @@ define('TABLE_QUIZ_ORDER', 'quiz_order');
define('TABLE_QUIZ_ANSWER', 'quiz_answer');
define('TABLE_QUIZ_TEST_QUESTION', 'quiz_rel_question');
define('TABLE_QUIZ_QUESTION_OPTION', 'quiz_question_option');
-define('TABLE_QUIZ_QUESTION_CATEGORY', 'quiz_question_category');
+define('TABLE_QUIZ_QUESTION_CATEGORY', 'quiz_category');
define('TABLE_QUIZ_QUESTION_REL_CATEGORY', 'quiz_question_rel_category');
+define('TABLE_QUIZ_REL_CATEGORY', 'quiz_rel_category');
// Linked resource table
//@todo table exists?
@@ -303,13 +304,13 @@ define('TABLE_THEMATIC_ADVANCE','thematic_advance');
//User groups
//Needed for migration
define('TABLE_MAIN_GROUP', 'groups');
+
/*
define('TABLE_MAIN_USER_REL_GROUP', 'group_rel_user');
define('TABLE_MAIN_GROUP_REL_TAG', 'group_rel_tag');
define('TABLE_MAIN_GROUP_REL_GROUP', 'group_rel_group');
*/
-
// Careers, promotions, Usergroups
define('TABLE_CAREER', 'career');
define('TABLE_PROMOTION', 'promotion');
@@ -353,4 +354,3 @@ define('TABLE_BRANCH_SYNC_LOG', 'branch_sync_log');
define('TABLE_BRANCH_TRANSACTION', 'branch_transaction');
define('TABLE_BRANCH_TRANSACTION_STATUS', 'branch_transaction_status');
-
diff --git a/main/inc/lib/database.lib.php b/main/inc/lib/database.lib.php
index 033e391f5b..df7cdf6432 100644
--- a/main/inc/lib/database.lib.php
+++ b/main/inc/lib/database.lib.php
@@ -723,6 +723,8 @@ class Database
*/
public static function query($query, $connection = null, $file = null, $line = null)
{
+ //bad idea ...
+ //global $app;return $app['db']->executeQuery($query);
$use_default_connection = self::use_default_connection($connection);
if ($use_default_connection) {
// Let us do parameter shifting, thus the method would be similar
@@ -771,6 +773,9 @@ class Database
strpos($query, 'ALTER') === false &&
strpos($query, 'alter') === false &&
strpos($query, 'c_id') === false &&
+ strpos($query, 'c_quiz_question_rel_category') === false &&
+ strpos($query, 'c_quiz_category') === false &&
+
strpos($query, 'create table') === false &&
strpos($query, 'CREATE TABLE') === false &&
strpos($query, 'AUTO_INCREMENT') === false
diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php
index 3c0b0fed03..e37b3f8822 100644
--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@@ -1718,4 +1718,62 @@ class Display