Get correct exercise id see BT#14242

pull/2539/head
jmontoyaa 8 years ago
parent e337b88ee5
commit 21b622ff01
  1. 11
      main/gradebook/lib/be/exerciselink.class.php

@ -183,15 +183,18 @@ class ExerciseLink extends AbstractLink
in exercise/exercise.php, look for note-query-exe-results marker*/ in exercise/exercise.php, look for note-query-exe-results marker*/
$sessionId = $this->get_session_id(); $sessionId = $this->get_session_id();
$courseId = $this->getCourseId(); $courseId = $this->getCourseId();
$exerciseData = $this->get_exercise_data();
$exerciseId = $exerciseData['id'];
$exercise = new Exercise($courseId); $exercise = new Exercise($courseId);
$exercise->read($this->get_ref_id()); $exercise->read($exerciseData['id']);
$stud_id = (int) $stud_id; $stud_id = (int) $stud_id;
if (!$this->is_hp) { if (!$this->is_hp) {
if ($exercise->exercise_was_added_in_lp == false) { if ($exercise->exercise_was_added_in_lp == false) {
$sql = "SELECT * FROM $tblStats $sql = "SELECT * FROM $tblStats
WHERE WHERE
exe_exo_id = ".$this->get_ref_id()." AND exe_exo_id = ".$exerciseId." AND
orig_lp_id = 0 AND orig_lp_id = 0 AND
orig_lp_item_id = 0 AND orig_lp_item_id = 0 AND
status <> 'incomplete' AND status <> 'incomplete' AND
@ -209,7 +212,7 @@ class ExerciseLink extends AbstractLink
$sql = "SELECT * $sql = "SELECT *
FROM $tblStats FROM $tblStats
WHERE WHERE
exe_exo_id = ".$this->get_ref_id()." AND exe_exo_id = ".$exerciseId." AND
orig_lp_id = $lpId AND orig_lp_id = $lpId AND
status <> 'incomplete' AND status <> 'incomplete' AND
session_id = $sessionId AND session_id = $sessionId AND
@ -226,7 +229,7 @@ class ExerciseLink extends AbstractLink
ON (hp.exe_name = doc.path AND doc.c_id = hp.c_id) ON (hp.exe_name = doc.path AND doc.c_id = hp.c_id)
WHERE WHERE
hp.c_id = $courseId AND hp.c_id = $courseId AND
doc.id = ".$this->get_ref_id(); doc.id = ".$exerciseId;
if (!empty($stud_id)) { if (!empty($stud_id)) {
$sql .= " AND hp.exe_user_id = $stud_id "; $sql .= " AND hp.exe_user_id = $stud_id ";

Loading…
Cancel
Save