Minor: RemedialCourse: Flinci Fix- refs BT#18165

pull/3729/head
Carlos Alvarado 5 years ago
parent 6965823c00
commit 23b0e2673d
No known key found for this signature in database
GPG Key ID: B612DB1EE6658FBB
  1. 26
      main/exercise/exercise.class.php
  2. 2
      main/exercise/exercise_report.php
  3. 6
      main/exercise/exercise_result.php
  4. 2
      main/exercise/overview.php

@ -6808,7 +6808,7 @@ class Exercise
);
$message .= $this->advanceCourseList($userId, api_get_session_id());
if ($attemptCount >= $exerciseAttempts) {
$message .= $this->remedialCourseList($userId, api_get_session_id());
$message .= $this->remedialCourseList($userId, api_get_session_id());
}
}
// 4. We check if the student have attempts
@ -6856,7 +6856,7 @@ class Exercise
get_lang('ExerciseBlockBecausePercentageX'),
$blockPercentage
);
$isVisible = false;// See BT#18165
$isVisible = false; // See BT#18165
$message .= $this->remedialCourseList(api_get_user_id(), api_get_session_id());
}
}
@ -10856,14 +10856,14 @@ class Exercise
if (!isset($bestAttempt['exe_result'])) {
// In the case that the result is 0, get_best_attempt_exercise_results_per_user does not return data,
// for that this block is used
if(count($attemp)==0) {
if (count($attemp) == 0) {
$exerciseStatInfo = Event::getExerciseResultsByUser(
$userId,
$this->id,
$this->course_id,
$sessionId
);
}else{
} else {
$exerciseStatInfo = $attemp;
}
@ -10903,7 +10903,9 @@ class Exercise
if (false === $canRemedial && isset($advanceCourseExcerciseField['value'])) {
$coursesIds = explode(';', $advanceCourseExcerciseField['value']);
if ('' == $advanceCourseExcerciseField['value'] || count($coursesIds)==0) return null;
if ('' == $advanceCourseExcerciseField['value'] || count($coursesIds) == 0) {
return null;
}
$isInASession = !empty($sessionId);
$courses = [];
foreach ($coursesIds as $course) {
@ -10960,11 +10962,11 @@ class Exercise
ORAL_EXPRESSION,
ANNOTATION,
];
$userId = empty($userId) ? api_get_user_id() : (int)$userId;
$userId = empty($userId) ? api_get_user_id() : (int) $userId;
$extraMessage = null;
if(count($attemp)!= 0){
if (count($attemp) != 0) {
$exercise_stat_info = $attemp;
}else{
} else {
$exercise_stat_info = Event::getExerciseResultsByUser(
$userId,
$this->id,
@ -10988,12 +10990,12 @@ class Exercise
$questionOpen = 0;
$totalQuestionExcluded = count($questionExcluded);
for ($i = 0; $i < $totalQuestionExcluded; $i++) {
if ($question->type == (int)$questionExcluded[$i]) {
if ($question->type == (int) $questionExcluded[$i]) {
$questionOpen = 1;
break;
}
}
if($review == true){
if ($review == true) {
$questionOpen = 0;
}
if (1 == $questionOpen) {
@ -11025,7 +11027,9 @@ class Exercise
// Remedial course
if ($canRemedial) {
$coursesIds = explode(';', $remedialExcerciseField['value']);
if ('' == $remedialExcerciseField['value'] || count($coursesIds)==0) return null;
if ('' == $remedialExcerciseField['value'] || count($coursesIds) == 0) {
return null;
}
$courses = [];
$isInASession = !empty($sessionId);
foreach ($coursesIds as $course) {

@ -266,7 +266,7 @@ if (isset($_REQUEST['comments']) &&
Database::query($sql);
// See BT#18165
$remedialMessage = $objExerciseTmp->remedialCourseList($student_id, api_get_session_id(),[],true);
$remedialMessage = $objExerciseTmp->remedialCourseList($student_id, api_get_session_id(), [], true);
if (null != $remedialMessage) {
Display::addFlash(
Display::return_message($remedialMessage, 'warning', false)

@ -115,7 +115,7 @@ $learnpath_id = isset($exercise_stat_info['orig_lp_id']) ? $exercise_stat_info['
$learnpath_item_id = isset($exercise_stat_info['orig_lp_item_id']) ? $exercise_stat_info['orig_lp_item_id'] : 0;
$learnpath_item_view_id = isset($exercise_stat_info['orig_lp_item_view_id'])
? $exercise_stat_info['orig_lp_item_view_id'] : 0;
$exerciseId = isset($exercise_stat_info['exe_exo_id'])?$exercise_stat_info['exe_exo_id']:0;
$exerciseId = isset($exercise_stat_info['exe_exo_id']) ? $exercise_stat_info['exe_exo_id'] : 0;
$logInfo = [
'tool' => TOOL_QUIZ,
@ -276,13 +276,13 @@ $exerciseStatInfo = Event::getExerciseResultsByUser(
api_get_course_int_id(),
api_get_session_id()
);
$advanceCourseMessage = $objExercise->advanceCourseList(api_get_user_id(), api_get_session_id(),$exerciseStatInfo);
$advanceCourseMessage = $objExercise->advanceCourseList(api_get_user_id(), api_get_session_id(), $exerciseStatInfo);
if (null != $advanceCourseMessage) {
Display::addFlash(
Display::return_message($advanceCourseMessage, 'info', false)
);
}
$remedialMessage = $objExercise->remedialCourseList(api_get_user_id(),api_get_session_id(),$exerciseStatInfo);
$remedialMessage = $objExercise->remedialCourseList(api_get_user_id(), api_get_session_id(), $exerciseStatInfo);
if (null != $remedialMessage) {
Display::addFlash(
Display::return_message($remedialMessage, 'warning', false)

@ -212,7 +212,7 @@ $exercise_stat_info = Event::getExerciseResultsByUser(
$objExercise->course_id,
api_get_session_id()
);
$attempt_count= count($exercise_stat_info)+1;
$attempt_count = count($exercise_stat_info) + 1;
if ($exerciseAttempts > 0) {
if ($attempt_count >= $exerciseAttempts) {
$remedialMessage .= $objExercise->remedialCourseList(api_get_user_id(), api_get_session_id());

Loading…
Cancel
Save