Exercise UI changes see BT#12292

ofaj
jmontoyaa 9 years ago
parent 35f3cc502e
commit c8da9339ff
  1. 8
      app/Resources/public/css/themes/rainbow/default.css
  2. 12
      main/exercise/exercise_result.php
  3. 10
      main/inc/lib/exercise.lib.php

@ -593,7 +593,7 @@ legend{
/* Large desktop */
@media (min-width: 1200px) {
}
/* Portrait tablet to landscape and desktop */
@ -636,7 +636,7 @@ legend{
/* Landscape phone to portrait tablet */
@media (max-width: 767px) {
}
/* Landscape phones and down */
@ -749,3 +749,7 @@ legend{
margin: 10px 0;
}
}
.question-result .dl-horizontal {
display:none;
}

@ -161,11 +161,6 @@ if ($objExercise->selectAttempts() > 0) {
);
$attemptMessage = sprintf(get_lang('RemainingXAttempts'), $remainingAttempts);
$remainingMessage = sprintf("<p>%s</p> %s", $attemptMessage, $attemptButton);
Display::display_normal_message(
$remainingMessage,
false
);
}
}
}
@ -180,7 +175,12 @@ $max_score = $objExercise->get_max_score();
Display::display_normal_message(get_lang('Saved').'<br />',false);
// Display and save questions
ExerciseLib::display_question_list_by_attempt($objExercise, $exe_id, true);
ExerciseLib::display_question_list_by_attempt(
$objExercise,
$exe_id,
true,
$remainingMessage
);
//Unset session for clock time
ExerciseLib::exercise_time_control_delete(

@ -3466,11 +3466,13 @@ HOTSPOT;
* @param Exercise $objExercise
* @param int $exe_id
* @param bool $save_user_result save users results (true) or just show the results (false)
* @param string $remainingMessage
*/
public static function display_question_list_by_attempt(
$objExercise,
$exe_id,
$save_user_result = false
$save_user_result = false,
$remainingMessage = ''
) {
global $origin;
@ -3755,7 +3757,6 @@ HOTSPOT;
$exercise_content
);
echo $total_score_text;
// Ofaj change BT#11784
@ -3769,8 +3770,11 @@ HOTSPOT;
echo $total_score_text;
}
if ($save_user_result) {
if (!empty($remainingMessage)) {
Display::display_normal_message($remainingMessage, false);
}
if ($save_user_result) {
// Tracking of results
$learnpath_id = $exercise_stat_info['orig_lp_id'];
$learnpath_item_id = $exercise_stat_info['orig_lp_item_id'];

Loading…
Cancel
Save