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

Minor - format code, fixing PHP warnings.

Browse Source
1.9.x
Julio Montoya 12 years ago
parent 51906bf14b
commit 042e97dad5
5 changed files with 60 additions and 26 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. 4
      main/exercice/admin.php
  2. 32
      main/exercice/exercise.class.php
  3. 45
      main/exercice/exercise.lib.php
  4. 1
      main/exercice/multiple_answer_true_false.class.php
  5. 4
      main/exercice/testcategory.class.php

4
main/exercice/admin.php
Unescape View File

@ -126,8 +126,8 @@ delete_all_incomplete_attempts(api_get_user_id(), $exerciseId, api_get_course_id
// get from session
$objExercise = isset($_SESSION['objExercise']) ? $_SESSION['objExercise'] : null;
$objQuestion = $_SESSION['objQuestion'];
$objAnswer = $_SESSION['objAnswer'];
$objQuestion = isset($_SESSION['objQuestion']) ? $_SESSION['objQuestion'] : null;
$objAnswer = isset($_SESSION['objAnswer']) ? $_SESSION['objAnswer'] : null;
// document path
$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';

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

@ -2144,13 +2144,15 @@ class Exercise {
switch ($answerType) {
// for unique answer
case UNIQUE_ANSWER :
case UNIQUE_ANSWER_NO_OPTION :
case UNIQUE_ANSWER:
case UNIQUE_ANSWER_NO_OPTION:
if ($from_database) {
$queryans = "SELECT answer FROM ".$TBL_TRACK_ATTEMPT."
WHERE exe_id = '".$exeId."' and question_id= '".$questionId."'";
$resultans = Database::query($queryans);
$choice = Database::result($resultans,0,"answer");
$sql = "SELECT answer FROM $TBL_TRACK_ATTEMPT
WHERE
exe_id = '".$exeId."' AND
question_id= '".$questionId."'";
$result = Database::query($sql);
$choice = Database::result($result,0,"answer");
$studentChoice = ($choice == $numAnswer)?1:0;
if ($studentChoice) {
@ -2169,24 +2171,26 @@ class Exercise {
case MULTIPLE_ANSWER_TRUE_FALSE:
if ($from_database) {
$choice = array();
$sql = "SELECT answer FROM ".$TBL_TRACK_ATTEMPT."
$sql = "SELECT answer FROM $TBL_TRACK_ATTEMPT
WHERE
exe_id = ".$exeId." AND
exe_id = $exeId AND
question_id = ".$questionId;
$resultans = Database::query($sql);
while ($row = Database::fetch_array($resultans)) {
$result = Database::query($sql);
while ($row = Database::fetch_array($result)) {
$ind = $row['answer'];
$result = explode(':', $ind);
$my_answer_id = $result[0];
$option = $result[1];
$values = explode(':', $ind);
$my_answer_id = $values[0];
$option = $values[1];
$choice[$my_answer_id] = $option;
}
}
$studentChoice = isset($choice[$numAnswer]) ? $choice[$numAnswer] : null;
if (!empty($studentChoice)) {
if ($studentChoice == $answerCorrect) {
$questionScore += $true_score;
$questionScore += $true_score;
} else {
if ($quiz_question_options[$studentChoice]['name'] != "Don't know") {
$questionScore += $false_score;

45
main/exercice/exercise.lib.php
Unescape View File

@ -2275,14 +2275,25 @@ function display_question_list_by_attempt($objExercise, $exe_id, $save_user_resu
ob_start();
// We're inside *one* question. Go through each possible answer for this question
$result = $objExercise->manage_answer($exercise_stat_info['exe_id'], $questionId, null, 'exercise_result', array(), $save_user_result, true, $show_results, $objExercise->selectPropagateNeg(), $hotspot_delineation_result);
$result = $objExercise->manage_answer(
$exercise_stat_info['exe_id'],
$questionId,
null,
'exercise_result',
array(),
$save_user_result,
true,
$show_results,
$objExercise->selectPropagateNeg(),
array()
);
if (empty($result)) {
continue;
}
$total_score += $result['score'];
$total_weight += $result['weight'];
$total_score += $result['score'];
$total_weight += $result['weight'];
$question_list_answers[] = array(
'question' => $result['open_question'],
@ -2293,8 +2304,7 @@ function display_question_list_by_attempt($objExercise, $exe_id, $save_user_resu
$my_total_score = $result['score'];
$my_total_weight = $result['weight'];
//Category report
// Category report
$category_was_added_for_this_test = false;
if (isset($objQuestionTmp->category) && !empty($objQuestionTmp->category)) {
@ -2311,8 +2321,15 @@ function display_question_list_by_attempt($objExercise, $exe_id, $save_user_resu
}
}
//No category for this question!
// No category for this question!
if ($category_was_added_for_this_test == false) {
if (!isset($category_list['none']['score'])) {
$category_list['none']['score'] = 0;
}
if (!isset($category_list['none']['total'])) {
$category_list['none']['total'] = 0;
}
$category_list['none']['score'] += $my_total_score;
$category_list['none']['total'] += $my_total_weight;
}
@ -2390,7 +2407,6 @@ function display_question_list_by_attempt($objExercise, $exe_id, $save_user_resu
echo $total_score_text;
}
if ($save_user_result) {
// Tracking of results
@ -2399,7 +2415,20 @@ function display_question_list_by_attempt($objExercise, $exe_id, $save_user_resu
$learnpath_item_view_id = $exercise_stat_info['orig_lp_item_view_id'];
if (api_is_allowed_to_session_edit()) {
update_event_exercice($exercise_stat_info['exe_id'], $objExercise->selectId(), $total_score, $total_weight, api_get_session_id(), $learnpath_id, $learnpath_item_id, $learnpath_item_view_id, $exercise_stat_info['exe_duration'], $question_list, '', array(), $end_date);
update_event_exercice(
$exercise_stat_info['exe_id'],
$objExercise->selectId(),
$total_score,
$total_weight,
api_get_session_id(),
$learnpath_id,
$learnpath_item_id,
$learnpath_item_view_id,
$exercise_stat_info['exe_duration'],
$question_list,
'',
array()
);
}
// Send notification ..

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

@ -70,6 +70,7 @@ class MultipleAnswerTrueFalse extends Question {
$form -> addElement ('label', get_lang('Answers').'<br /> <img src="../img/fill_field.png">', $html);
$correct = 0;
$answer = null;
if (!empty($this -> id)) {
$answer = new Answer($this -> id);
$answer->read();

4
main/exercice/testcategory.class.php
Unescape View File

@ -380,10 +380,10 @@ class Testcategory
echo self::returnCategoryAndTitle($in_questionID, $in_display_category_name);
}
public static function returnCategoryAndTitle($in_questionID, $in_display_category_name = 1) {
$is_student = !(api_is_allowed_to_edit(null,true) || api_is_session_admin());
$objExercise = $_SESSION['objExercise'];
// @todo fix $_SESSION['objExercise']
$objExercise = isset($_SESSION['objExercise']) ? $_SESSION['objExercise'] : null;
if (!empty($objExercise)) {
$in_display_category_name = $objExercise->display_category_name;
}

Write Preview
Loading…
Cancel
Save