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 - removing whitespaces

Browse Source
skala
Julio Montoya 13 years ago
parent 3dcaa6d8df
commit d7aa82379c
2 changed files with 66 additions and 67 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. 114
      main/exercice/exercise_submit.php
  2. 19
      main/exercice/question_admin.inc.php

114
main/exercice/exercise_submit.php
Unescape View File

@ -194,7 +194,7 @@ if ($objExercise->selectAttempts() > 0) {
$attempt_html .= Display::return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
}
} else {
$attempt_html .= Display :: return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
$attempt_html .= Display :: return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
//Display :: display_warning_message(sprintf(get_lang('ReachedMaxAttemptsAdmin'), $exercise_title, $objExercise->selectAttempts()), false);
}
@ -217,13 +217,13 @@ if ($debug) { error_log("4. Setting the exe_id: $exe_id");} ;
//5. Getting user exercise info (if the user took the exam before) - generating exe_id
//var_dump($learnpath_id.' - '.$learnpath_item_id.' - '.$learnpath_item_view_id);
$exercise_stat_info = $objExercise->get_stat_track_exercise_info($learnpath_id, $learnpath_item_id, $learnpath_item_view_id);
$clock_expired_time = null;
if (empty($exercise_stat_info)) {
if ($debug) error_log('5 $exercise_stat_info is empty ');
$total_weight = 0;
$questionList = $objExercise->get_question_list(true);
foreach ($questionList as $question_id) {
$objQuestionTmp = Question::read($question_id);
$total_weight += floatval($objQuestionTmp->weighting);
@ -340,8 +340,8 @@ if ($time_control) { //Sends the exercice form when the expired time is finished
// if the user has submitted the form
$exercise_title = $objExercise->selectTitle();
$exercise_sound = $objExercise->selectSound();
$exercise_title = $objExercise->selectTitle();
$exercise_sound = $objExercise->selectSound();
//Media questions
$media_questions = $objExercise->get_media_list();
@ -349,7 +349,7 @@ $media_is_activated = $objExercise->media_is_activated($media_questions);
//in LP's is enabled the "remember question" feature?
if (!isset($_SESSION['questionList'])) {
// selects the list of question ID
$questionList = $objExercise->get_question_list(false);
@ -360,7 +360,7 @@ if (!isset($_SESSION['questionList'])) {
Session::write('questionList', $questionList);
if ($debug > 0) { error_log('$_SESSION[questionList] was set'); }
} else {
if (isset($objExercise) && isset($_SESSION['objExercise'])) {
if (isset($objExercise) && isset($_SESSION['objExercise'])) {
$questionList = Session::read('questionList');
}
}
@ -386,7 +386,7 @@ if ($formSent && isset($_POST)) {
}
// Filling array exercise result
// if the user has answered at least one question
if (is_array($choice)) {
if ($debug) { error_log('9.1. $choice is an array '.print_r($choice, 1)); }
@ -515,7 +515,7 @@ if ($question_count != 0) {
}
exit;
}
}
}
} else {
//Time control is only enabled for ONE PER PAGE
if (!empty($exe_id) && is_numeric($exe_id)) {
@ -528,7 +528,7 @@ if ($question_count != 0) {
} else {
$sql_exe_result = ", exe_result = 0";
if ($debug) { error_log('12. exercise_time_control_is_valid is NOT valid then exe_result = 0 '); }
}
}
}
if ($objExercise->review_answers) {
header('Location: exercise_reminder.php?'.$params);
@ -628,7 +628,7 @@ if ($limit_time_exists) {
exit;
} else {
$message_warning = $permission_to_start ? get_lang('ReachedTimeLimitAdmin') : get_lang('ExerciseNoStartedAdmin');
Display :: display_warning_message(sprintf($message_warning, $exercise_title, $objExercise->selectAttempts()));
Display :: display_warning_message(sprintf($message_warning, $exercise_title, $objExercise->selectAttempts()));
}
}
}
@ -646,7 +646,7 @@ if (isset($_custom['exercises_hidden_when_no_start_date']) && $_custom['exercise
//Timer control
if ($time_control) {
echo $objExercise->return_time_left_div();
echo $objExercise->return_time_left_div();
echo '<div style="display:none" class="warning-message" id="expired-message-id">'.get_lang('ExerciceExpiredTimeMessage').'</div>';
}
@ -737,7 +737,7 @@ if (!empty($error)) {
$number_of_hotspot_questions = 0;
$onsubmit = '';
$i = 0;
if (!empty($questionList)) {
foreach ($questionList as $questionId) {
$i++;
@ -777,26 +777,26 @@ if (!empty($error)) {
//$(this).find(".exercise_save_now_button").hide();
$(this).removeClass("question_highlight");
});
$(".no_remind_highlight").hide();
$(".no_remind_highlight").hide();
});
function previous_question(question_num) {
url = "exercise_submit.php?'.$params.'&num="+question_num;
window.location = url;
}
function previous_question_and_save(previous_question_id, question_id_to_save) {
url = "exercise_submit.php?'.$params.'&num="+previous_question_id;
function previous_question_and_save(previous_question_id, question_id_to_save) {
url = "exercise_submit.php?'.$params.'&num="+previous_question_id;
//Save the current question
save_now(question_id_to_save, url);
}
function save_question_list(question_list) {
$.each(question_list, function(key, question_id) {
save_now(question_id, null, false);
});
var url = "";
if ('.$reminder.' == 1 ) {
url = "exercise_reminder.php?'.$params.'&num='.$current_question.'";
@ -805,15 +805,15 @@ if (!empty($error)) {
} else {
url = "exercise_submit.php?'.$params.'&num='.$current_question.'&remind_question_id='.$remind_question_id.'";
}
//$("#save_for_now_"+question_id).html("'.addslashes(Display::return_icon('save.png', get_lang('Saved'), array(), ICON_SIZE_SMALL)).'");
window.location = url;
//$("#save_for_now_"+question_id).html("'.addslashes(Display::return_icon('save.png', get_lang('Saved'), array(), ICON_SIZE_SMALL)).'");
window.location = url;
}
function save_now(question_id, url_extra, redirect) {
function save_now(question_id, url_extra, redirect) {
if (redirect == undefined) {
redirect = true;
}
//1. Normal choice inputs
var my_choice = $(\'*[name*="choice[\'+question_id+\']"]\').serialize();
@ -844,7 +844,7 @@ if (!empty($error)) {
// Only for the first time
$("#save_for_now_"+question_id).html(" '.addslashes(Display::return_icon('loading1.gif')).'");
$.ajax({
type:"post",
async: false,
@ -869,9 +869,9 @@ if (!empty($error)) {
if (url_extra) {
url = url_extra;
}
$("#save_for_now_"+question_id).html("'.addslashes(Display::return_icon('save.png', get_lang('Saved'), array(), ICON_SIZE_SMALL)).'");
if (redirect) {
window.location = url;
}
@ -883,7 +883,7 @@ if (!empty($error)) {
});
return false;
}
function save_now_all(validate) {
//1. Input choice
var my_choice = $(\'*[name*="choice"]\').serialize();
@ -911,7 +911,7 @@ if (!empty($error)) {
}
}
});
//lok+(fgt)= data base
free_answers = $.param(free_answers);
@ -943,7 +943,7 @@ if (!empty($error)) {
return false;
}
</script>';
echo '<form id="exercise_form" method="post" action="'.api_get_self().'?'.api_get_cidreq().'&autocomplete=off&gradebook='.$gradebook."&exerciseId=" . $exerciseId .'" name="frm_exercise" '.$onsubmit.'>
<input type="hidden" name="formSent" value="1" />
<input type="hidden" name="exerciseId" value="'.$exerciseId . '" />
@ -956,7 +956,7 @@ if (!empty($error)) {
//Show list of questions
$i = 1;
$attempt_list = array();
if (isset($exe_id)) {
$attempt_list = get_all_exercise_event_by_exe_id($exe_id);
@ -964,17 +964,17 @@ if (!empty($error)) {
$remind_list = array();
if (isset($exercise_stat_info['questions_to_check']) && !empty($exercise_stat_info['questions_to_check'])) {
$remind_list = explode(',', $exercise_stat_info['questions_to_check']);
}
render_question_list($objExercise, $questionList, $current_question, $exerciseResult, $attempt_list, $remind_list, $media_questions);
}
render_question_list($objExercise, $questionList, $current_question, $exerciseResult, $attempt_list, $remind_list, $media_questions);
echo '</form>';
}
function render_question_list($objExercise, $questionList, $current_question, $exerciseResult, $attempt_list, $remind_list, $media_questions = array()) {
function render_question_list($objExercise, $questionList, $current_question, $exerciseResult, $attempt_list, $remind_list, $media_questions = array()) {
global $origin;
$i = 1;
//Normal question list render
foreach ($questionList as $questionId) {
foreach ($questionList as $questionId) {
// for sequential exercises
if ($objExercise->type == ONE_PER_PAGE) {
// if it is not the right question, goes to the next loop iteration
@ -986,7 +986,7 @@ function render_question_list($objExercise, $questionList, $current_question, $e
// if the user has already answered this question
if (isset($exerciseResult[$questionId])) {
// construction of the Question object
$objQuestionTmp = Question::read($questionId);
$objQuestionTmp = Question::read($questionId);
// destruction of the Question object
unset ($objQuestionTmp);
Display :: display_normal_message(get_lang('AlreadyAnswered'));
@ -996,16 +996,16 @@ function render_question_list($objExercise, $questionList, $current_question, $e
}
}
}
//Medias question render
if (isset($media_questions) && !empty($media_questions)) {
$media_question_list = $media_questions[$questionId];
$media_question_list = $media_questions[$questionId];
$objQuestionTmp = Question::read($questionId);
$counter = 1;
if ($objQuestionTmp->type == MEDIA_QUESTION) {
echo $objQuestionTmp->show_media_content();
$count_of_questions_inside_media = count($media_question_list);
//var_dump($media_question_list);
//Show questions that belongs to a media
@ -1016,14 +1016,14 @@ function render_question_list($objExercise, $questionList, $current_question, $e
}
render_question($objExercise, $my_question_id, $attempt_list, $remind_list, $i, $current_question, $media_question_list, $last_question_in_media);
$counter++;
}
}
}
} else {
render_question($objExercise, $questionId, $attempt_list, $remind_list, $i, $current_question);
}
} else {
//Normal question render
render_question($objExercise, $questionId, $attempt_list, $remind_list, $i, $current_question);
render_question($objExercise, $questionId, $attempt_list, $remind_list, $i, $current_question);
}
$i++;
@ -1033,7 +1033,7 @@ function render_question_list($objExercise, $questionList, $current_question, $e
break;
}
}
// end foreach()
if ($objExercise->type == ALL_ON_ONE_PAGE) {
$exercise_actions = $objExercise->show_button($questionId, $current_question);
@ -1041,7 +1041,7 @@ function render_question_list($objExercise, $questionList, $current_question, $e
}
}
function render_question($objExercise, $questionId, $attempt_list, $remind_list, $i, $current_question, $questions_in_media = array(), $last_question_in_media = false) {
function render_question($objExercise, $questionId, $attempt_list, $remind_list, $i, $current_question, $questions_in_media = array(), $last_question_in_media = false) {
global $origin;
$user_choice = isset($attempt_list[$questionId]) ? $attempt_list[$questionId] : null;
@ -1049,21 +1049,21 @@ function render_question($objExercise, $questionId, $attempt_list, $remind_list,
//Hides questions when reviewing a ALL_ON_ONE_PAGE exercise see #4542 no_remind_highlight class hide with jquery
if ($objExercise->type == ALL_ON_ONE_PAGE && isset($_GET['reminder']) && $_GET['reminder'] == 2) {
$remind_highlight = 'no_remind_highlight';
$remind_highlight = 'no_remind_highlight';
}
$is_remind_on = false;
$attributes = array('id' =>'remind_list['.$questionId.']');
if (in_array($questionId, $remind_list)) {
$is_remind_on = true;
$attributes['checked'] = 1;
$attributes['checked'] = 1;
$remind_highlight = ' remind_highlight ';
}
//Showing the question
$exercise_actions = null;
echo '<div id="question_div_'.$questionId.'" class="main_question '.$remind_highlight.'" >';
@ -1082,11 +1082,11 @@ function render_question($objExercise, $questionId, $attempt_list, $remind_list,
$exercise_actions .= Display::div($button, array('class'=>'exercise_save_now_button'));
break;
}
if (!empty($questions_in_media)) {
if (!empty($questions_in_media)) {
/*$button = '<a href="javascript://" class="btn" onclick="save_now(\''.$questionId.'\'); ">'.get_lang('SaveForNow').'</a>';
$button .= '<span id="save_for_now_'.$questionId.'"></span>&nbsp;';
$exercise_actions = Display::div($button, array('class'=>'exercise_save_now_button'));
$exercise_actions = Display::div($button, array('class'=>'exercise_save_now_button'));
$exercise_actions .= $objExercise->show_button($questionId, $current_question);*/
$count_of_questions_inside_media = count($questions_in_media);
if ($count_of_questions_inside_media > 1) {
@ -1094,8 +1094,8 @@ function render_question($objExercise, $questionId, $attempt_list, $remind_list,
$button .= '<span id="save_for_now_'.$questionId.'" class="exercise_save_mini_message"></span>&nbsp;';
$exercise_actions = Display::div($button, array('class'=>'exercise_save_now_button'));
}
if ($last_question_in_media) {
if ($last_question_in_media) {
$exercise_actions = $objExercise->show_button($questionId, $current_question, $questions_in_media);
}
}
@ -1105,7 +1105,7 @@ function render_question($objExercise, $questionId, $attempt_list, $remind_list,
$remind_question_div = Display::tag('label', Display::input('checkbox', 'remind_list['.$questionId.']', '', $attributes).get_lang('ReviewQuestionLater'), array('class' => 'checkbox', 'for' =>'remind_list['.$questionId.']'));
$exercise_actions .= Display::div($remind_question_div, array('class'=>'exercise_save_now_button'));
}
echo Display::div($exercise_actions, array('class'=>'form-actions'));
echo '</div>';
}

19
main/exercice/question_admin.inc.php
Unescape View File

@ -1,12 +1,11 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Statement (?) administration
* This script allows to manage the statements of questions.
* It is included from the script admin.php
* @package chamilo.exercise
* @author Olivier Brouckaert
* @version $Id: question_admin.inc.php 22126 2009-07-15 22:38:39Z juliomontoya $
* @author Julio Montoya
*/
/**
* Code
@ -16,7 +15,7 @@ $course_id = api_get_course_int_id();
// INIT QUESTION
if (isset($_GET['editQuestion'])) {
$objQuestion = Question::read ($_GET['editQuestion']);
$objQuestion = Question::read ($_GET['editQuestion']);
$action = api_get_self()."?".api_get_cidreq()."&myid=1&modifyQuestion=".$modifyQuestion."&editQuestion=".$objQuestion->id;
} else {
$objQuestion = Question :: getInstance($_REQUEST['answerType']);
@ -26,7 +25,7 @@ if (isset($_GET['editQuestion'])) {
if (is_object($objQuestion)) {
//FORM CREATION
$form = new FormValidator('question_admin_form','post', $action);
if(isset($_GET['editQuestion'])) {
$class="btn save";
$text=get_lang('ModifyQuestion');
@ -42,7 +41,7 @@ if (is_object($objQuestion)) {
// form title
$form->addElement('header', $text.': '.$form_title_extra);
// question form elements
$objQuestion->createForm($form);
@ -55,19 +54,19 @@ if (is_object($objQuestion)) {
}
// FORM VALIDATION
if (isset($_POST['submitQuestion']) && $form->validate()) {
// question
$objQuestion->processCreation($form, $objExercise);
// answers
// answers
$objQuestion->processAnswersCreation($form, $nb_answers);
// TODO: maybe here is the better place to index this tool, including answers text
// redirect
if ($objQuestion -> type != HOT_SPOT && $objQuestion -> type != HOT_SPOT_DELINEATION) {
if ($objQuestion -> type != HOT_SPOT && $objQuestion -> type != HOT_SPOT_DELINEATION) {
if(isset($_GET['editQuestion'])) {
echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&message=ItemUpdated"</script>';
} else {
@ -77,7 +76,7 @@ if (is_object($objQuestion)) {
} else {
echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&hotspotadmin='.$objQuestion->id.'"</script>';
}
} else {
} else {
echo '<h3>'.$questionName.'</h3>';
if(!empty($pictureName)){
echo '<img src="../document/download.php?doc_url=%2Fimages%2F'.$pictureName.'" border="0">';

Write Preview
Loading…
Cancel
Save