Merge pull request #3445 from carlangas159/3428

Exercise: Exercise result per question, incoherent data.

Author: ywarnier

main/exercise/stats.php

@@ -68,7 +68,8 @@
             $question_id,
             $exerciseId,
             $courseCode,
-            $sessionId
+            $sessionId,
+            true
         );
 
         $count_users = ExerciseLib::get_number_students_question_with_answer_count(
@@ -137,7 +138,8 @@
             $question_id,
             $exerciseId,
             $courseCode,
-            $sessionId
+            $sessionId,
+            true
         );
 
         $answer = new Answer($question_id);

main/inc/lib/exercise.lib.php

@@ -3795,27 +3795,56 @@ public static function get_exercises_to_be_taken($course_code, $session_id)
      * @param int    $exercise_id
      * @param string $course_code
      * @param int    $session_id
+     * @param bool   $onlyStudent Filter only enrolled students
      *
      * @return array
      */
     public static function get_student_stats_by_question(
         $question_id,
         $exercise_id,
         $course_code,
-        $session_id
+        $session_id,
+        $onlyStudent = false
     ) {
         $track_exercises = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
         $track_attempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+        $courseUser = Database::get_main_table(TABLE_MAIN_COURSE_USER);
 
         $question_id = (int) $question_id;
         $exercise_id = (int) $exercise_id;
         $course_code = Database::escape_string($course_code);
         $session_id = (int) $session_id;
         $courseId = api_get_course_int_id($course_code);
 
+        if (empty($session_id)) {
+            $courseCondition = "
+            INNER JOIN $courseUser c
+            ON (
+                        e.exe_user_id = c.user_id AND
+                        e.c_id = c.c_id AND
+                        c.status = ".STUDENT."
+                        AND relation_type <> 2
+                )
+            ";
+        } else {
+            $courseCondition = "
+            INNER JOIN $courseUser c
+            ON (
+                        e.exe_user_id = c.user_id AND
+                        e.c_id = c.c_id AND
+                        c.status = 0
+                )
+            ";
+        }
+
         $sql = "SELECT MAX(marks) as max, MIN(marks) as min, AVG(marks) as average
     		FROM $track_exercises e
-    		INNER JOIN $track_attempt a
+    		";
+        if ($onlyStudent == true) {
+            $sql .= $courseCondition;
+        }
+        $sql .= "
+            INNER JOIN $track_attempt a
     		ON (
     		    a.exe_id = e.exe_id AND
     		    e.c_id = a.c_id AND
@@ -3826,7 +3855,7 @@ public static function get_student_stats_by_question(
                 a.c_id = $courseId AND
                 e.session_id = $session_id AND
                 question_id = $question_id AND
-                status = ''
+                e.status = ''
             LIMIT 1";
         $result = Database::query($sql);
         $return = [];