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

Remonving button and adding a message when saving a hot spot question see #3345

Browse Source
skala
Julio Montoya 15 years ago
parent 2104c69171
commit c19da61b00
2 changed files with 38 additions and 38 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. 50
      main/exercice/admin.php
  2. 26
      main/exercice/hotspot_admin.inc.php

50
main/exercice/admin.php
Unescape View File

@ -118,10 +118,10 @@ $objQuestion = $_SESSION['objQuestion'];
$objAnswer = $_SESSION['objAnswer'];
// document path
$documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
// picture path
$picturePath=$documentPath.'/images';
$picturePath = $documentPath.'/images';
// audio path
$audioPath=$documentPath.'/audio';
@ -136,7 +136,7 @@ $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
$TBL_REPONSES = Database::get_course_table(TABLE_QUIZ_ANSWER);
$TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
if($_GET['action'] == 'exportqti2' && !empty($_GET['questionId'])) {
if ($_GET['action'] == 'exportqti2' && !empty($_GET['questionId'])) {
require_once('export/qti2/qti2_export.php');
$export = export_question((int)$_GET['questionId'],true);
$qid = (int)$_GET['questionId'];
@ -161,7 +161,7 @@ if($_GET['action'] == 'exportqti2' && !empty($_GET['questionId'])) {
}
// intializes the Exercise object
if(!is_object($objExercise)) {
if (!is_object($objExercise)) {
// construction of the Exercise object
$objExercise=new Exercise();
@ -182,17 +182,18 @@ if(!$fromExercise) {
}
}
$nbrQuestions=$objExercise->selectNbrQuestions();
$nbrQuestions = $objExercise->selectNbrQuestions();
// intializes the Question object
if($editQuestion || $newQuestion || $modifyQuestion || $modifyAnswers) {
if($editQuestion || $newQuestion) {
if ($editQuestion || $newQuestion || $modifyQuestion || $modifyAnswers) {
if ($editQuestion || $newQuestion) {
// reads question data
if($editQuestion) {
if ($editQuestion) {
// question not found
if(!$objQuestion = Question::read($editQuestion)) {
die(get_lang('QuestionNotFound'));
if (!$objQuestion = Question::read($editQuestion)) {
//die(get_lang('QuestionNotFound'));
api_not_allowed();
}
// saves the object into the session
api_session_register('objQuestion');
@ -207,7 +208,7 @@ if($editQuestion || $newQuestion || $modifyQuestion || $modifyAnswers) {
}
// if cancelling an exercise
if($cancelExercise) {
if ($cancelExercise) {
// existing exercise
if($exerciseId) {
unset($modifyExercise);
@ -243,7 +244,7 @@ if($cancelAnswers) {
// modifies the query string that is used in the link of tool name
if($editQuestion || $modifyQuestion || $newQuestion || $modifyAnswers) {
$nameTools=get_lang('QuestionManagement');
$nameTools = get_lang('QuestionManagement');
}
if (isset($_SESSION['gradebook'])){
@ -439,34 +440,31 @@ if ($show_quiz_edition) {
echo '</div>';
if(isset($_GET['message'])) {
if (in_array($_GET['message'], array('ExerciseStored'))) {
if (isset($_GET['message'])) {
if (in_array($_GET['message'], array('ExerciseStored', 'ItemUpdated'))) {
Display::display_confirmation_message(get_lang($_GET['message']));
}
}
/*
$description = $objExercise->selectDescription();
echo '<div class="sectiontitle">'.$objExercise->selectTitle().'</div>';
if(!empty($description))
{
echo '<div class="sectioncomment">'.stripslashes($description).'</div>';
}
*/
if ($newQuestion || $editQuestion) {
// statement management
$type = $_REQUEST['answerType'];
?><input type="hidden" name="Type" value="<?php echo $type; ?>" />
<?php
<?php
require 'question_admin.inc.php';
}
if (isset($_GET['hotspotadmin'])) {
if (!is_object($objQuestion)) {
$objQuestion = Question :: read($_GET['hotspotadmin']);
}
if (!$objQuestion) {
api_not_allowed();
}
require 'hotspot_admin.inc.php';
}
if(!$newQuestion && !$modifyQuestion && !$editQuestion && !isset($_GET['hotspotadmin'])) {
if (!$newQuestion && !$modifyQuestion && !$editQuestion && !isset($_GET['hotspotadmin'])) {
// question list management
require 'question_list_admin.inc.php';
}

26
main/exercice/hotspot_admin.inc.php
Unescape View File

@ -12,7 +12,7 @@ if (!defined('ALLOWED_TO_INCLUDE')) {
}
$modifyAnswers = intval($_GET['hotspotadmin']);
if(!is_object($objQuestion)) {
if (!is_object($objQuestion)) {
$objQuestion = Question :: read($modifyAnswers);
}
@ -126,7 +126,7 @@ if ($submitAnswers || $buttonBack) {
$editQuestion=$questionId;
unset($modifyAnswers);
echo '<script type="text/javascript">window.location.href="'.$hotspot_admin_url.'"</script>';
echo '<script type="text/javascript">window.location.href="'.$hotspot_admin_url.'&message=ItemUpdated"</script>';
}
if($debug>0){echo '$modifyIn was set - end'."<br />\n";}
@ -281,10 +281,8 @@ if ($submitAnswers || $buttonBack) {
$editQuestion=$questionId;
unset($modifyAnswers);
echo '<script type="text/javascript">window.location.href="'.$hotspot_admin_url.'"</script>';
echo '<script type="text/javascript">window.location.href="'.$hotspot_admin_url.'&message=ItemUpdated"</script>';
}
if($debug>0){echo '$modifyIn was set - end'."<br />\n";}
}
}
@ -491,6 +489,12 @@ if ($modifyAnswers) {
<td colspan="2" valign="bottom">
<?php
$navigator_info = api_get_navigator();
//cancel button
/*
* <input type="submit" class="cancel" name="cancelAnswers" value="<?php echo get_lang('Cancel'); ?>" onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;" >
* <button type="submit" class="cancel" name="cancelAnswers" value="<?php echo get_lang('Cancel'); ?>" onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;" ><?php echo get_lang('Cancel'); ?></button>
* */
//ie6 fix
if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') {
?>
@ -500,20 +504,18 @@ if ($modifyAnswers) {
<?php } else { ?>
<input type="submit" class="minus" name="lessAnswers" value="<?php echo get_lang('LessHotspots'); ?>" >
<input type="submit" class="plus" name="moreAnswers" value="<?php echo get_lang('MoreHotspots'); ?>" />
<?php } ?>
<input type="submit" class="cancel" name="cancelAnswers" value="<?php echo get_lang('Cancel'); ?>" onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;" >
<?php } ?>
<input type="submit" class="save" name="submitAnswers" value="<?php echo get_lang('Ok'); ?>" />
<?php
} else {
?>
<?php if ($answerType==HOT_SPOT_DELINEATION) {?>
} else {
if ($answerType==HOT_SPOT_DELINEATION) {?>
<button type="submit" class="minus" name="lessAnswers" value="<?php echo get_lang('LessOAR'); ?>" ><?php echo get_lang('LessOAR'); ?></button>
<button type="submit" class="plus" name="moreOARAnswers" value="<?php echo get_lang('MoreOAR'); ?>" /><?php echo get_lang('MoreOAR'); ?></button>
<?php } else { ?>
<button type="submit" class="minus" name="lessAnswers" value="<?php echo get_lang('LessHotspots'); ?>" ><?php echo get_lang('LessHotspots'); ?></button>
<button type="submit" class="plus" name="moreAnswers" value="<?php echo get_lang('MoreHotspots'); ?>" /><?php echo get_lang('MoreHotspots'); ?></button>
<?php } ?>
<button type="submit" class="cancel" name="cancelAnswers" value="<?php echo get_lang('Cancel'); ?>" onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;" ><?php echo get_lang('Cancel'); ?></button>
<?php } ?>
<button type="submit" class="save" name="submitAnswers" value="<?php echo get_lang('Ok'); ?>" /><?php echo get_lang('AddQuestionToExercise'); ?></button>
<?php
}

Write Preview
Loading…
Cancel
Save