Allow all people when select students and evaluation - refs BT#7674 BT#7673

main/inc/ajax/course.ajax.php

@@ -202,10 +202,11 @@ switch ($action) {
             }
             if (!empty($data)) 
             {
+                $data[] = array('id' => 'T', 'text' => 'TODOS');
                 echo json_encode($data);
             } else
             {
-                echo json_encode(array());
+                echo json_encode(array(array('id' => 'T', 'text' => 'TODOS')));
             }
         }
         break;

main/inc/ajax/model.ajax.php

@@ -620,16 +620,12 @@ switch ($action) {
         );
         break;
     case 'get_exercise_progress':
-        $sessionId = 0;
-        if (!empty($_GET['course_id']) && !empty($_GET['exercise_id']))
-        {
-            $sessionId  = intval($_GET['session_id']);
-            $courseId   = intval($_GET['course_id']);
-            $exerciseId = intval($_GET['exercise_id']);
-            $date_from  = $_GET['date_from'];
-            $date_to    = $_GET['date_to'];
-        }
-
+        $sessionId  = intval($_GET['session_id']);
+        $courseId   = intval($_GET['course_id']);
+        $exerciseId = intval($_GET['exercise_id']);
+        $date_from  = $_GET['date_from'];
+        $date_to    = $_GET['date_to'];
+        
         $columns = array(
             'session',
             'exercise_id',

main/inc/lib/tracking.lib.php

@@ -3498,7 +3498,7 @@ class Tracking
         $ttrack_attempt    = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
 
         require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.lib.php';
-
+        
         $sessions = array();
         $courses = array();
         // if session ID is defined but course ID is empty, get all the courses
@@ -3514,7 +3514,7 @@ class Tracking
             $sessionsTemp = SessionManager::get_session_by_course($course['code']);
             $courses[$courseId] = $course;
             foreach ($sessionsTemp as $sessionItem) {
-                $sessions[$sessionItem['id']] = $sessionItem['name'];
+                $sessions[$sessionItem['id']] = $sessionItem;
             }
         } elseif (!empty($courseId) && !empty($sessionId)) {
             //none is empty
@@ -3607,7 +3607,7 @@ class Tracking
             $rs = Database::query($sql_query);
             $userIds = array();
             $questionIds = array();
-            $answerIds = array();
+            $answerIds = array(); 
             while ($row = Database::fetch_array($rs)) {
                 //only show if exercise is visible
                 if (api_get_item_visibility($courseData, 'quiz', $row['exercise_id'])) {
@@ -3627,6 +3627,7 @@ class Tracking
 
             $resQuestions = Database::query($sqlQuestions);
             $answer = array();
+            $question = array();
             while ($rowQuestion = Database::fetch_assoc($resQuestions)) {
                 $questionId = $rowQuestion['question_id'];
                 $answerId = $rowQuestion['answer_id'];
@@ -3646,7 +3647,7 @@ class Tracking
             while ($rowUser = Database::fetch_assoc($resUsers)) {
                 $users[$rowUser['user_id']] = $rowUser;
             }
-            
+           
             foreach ($data as $id => $row) {
                 $rowQuestId = $row['question_id'];
                 $rowAnsId = $row['answer_id'];
@@ -3657,10 +3658,9 @@ class Tracking
                 $data[$id]['username'] = $users[$row['user_id']]['username'];
                 $data[$id]['answer'] = $answer[$rowQuestId][$rowAnsId]['answer'];
                 $data[$id]['correct'] = ($answer[$rowQuestId][$rowAnsId]['correct'] == 0 ? get_lang('No') : get_lang('Yes'));
-                $data[$id]['question'] = $question[$questionId]['question'];
+                $data[$id]['question'] = $question[$rowQuestId]['question'];
                 $data[$id]['question_id'] = $rowQuestId;
             }
-
             /*
             The minimum expected array structure at the end is:
             attempt_id,

main/lang/spanish/trad4all.inc.php

@@ -1496,4 +1496,5 @@ $DataTableSearch = "Buscar";
 $HideColumn = "Ocultar columna";
 $DisplayColumn = "Mostrar columna";
 $LegalAgreementAccepted = "Condiciones legales aceptadas";
+$ChooseEvaluation = "Seleccione la Evaluación";
 ?>

main/lang/spanish_latin/trad4all.inc.php

@@ -396,4 +396,5 @@ $Assessment = "Asignaciones";
 $AssessmentQuestions = "¿ Cómo van a ser evaluados los estudiantes ? ¿ Cuáles son las estrategias para que éstos acaben dominando la materia ?";
 $AssessmentInformation = "Ejemplos de las preguntas de examen. Criterios de evaluación. Pistas y trucos.";
 $LowerCaseUser = "usuario";
+$ChooseEvaluation = "Seleccione la Evaluación";
 ?>

main/mySpace/index.php

@@ -711,8 +711,12 @@ if ($is_platform_admin && in_array($view, array('admin')) && $display != 'yourst
             $exerciseId = isset($_GET['exercise_id']) ? Security::remove_XSS($_GET['exercise_id']) : null;
             if (!empty($exerciseId)) {
                 $exerciseList = array();
-                $exerciseInfo = current(get_exercise_by_id($exerciseId, $courseId));
-                $exerciseList[] = array('id' => $exerciseInfo['id'], 'text' => api_html_entity_decode($exerciseInfo['title']));
+                if ($exerciseId == 'T') {
+                    $exerciseList[] = array('id' => 'T', 'text' => 'TODOS');
+                } else {
+                    $exerciseInfo = current(get_exercise_by_id($exerciseId, $courseId));
+                    $exerciseList[] = array('id' => $exerciseInfo['id'], 'text' => api_html_entity_decode($exerciseInfo['title']));
+                }
             }
             $sessionFilter->addElement('select_ajax', 'exercise_name', get_lang('Search') . " " . get_lang('Assessment'), null, array('url' => $url, 'defaults' => $exerciseList, 'width' => '400px', 'minimumInputLength' => $minimumInputLength));
 
@@ -1051,7 +1055,7 @@ if ($is_platform_admin && in_array($view, array('admin')) && $display != 'yourst
             if (!empty($_GET['exercise_id'])) {
                 echo MySpace::display_tracking_exercise_progress_overview(intval($_GET['session_id']), intval($_GET['course_id']), intval($_GET['exercise_id']), $_GET['date_from'], $_GET['date_to']);
             } else {
-                Display::display_warning_message(get_lang('ChooseExercise'));
+                Display::display_warning_message(get_lang('ChooseEvaluation'));
             }
         } else {
             Display::display_warning_message(get_lang('ChooseCourse'));

main/mySpace/myspace.lib.php

@@ -484,7 +484,7 @@ class MySpace {
      * Display a sortable table that contains an overview off all the progress of the user in a session
      * @author César Perales <cesar.perales@beeznest.com>, Beeznest Team
      */
-    function display_tracking_progress_overview($sessionId = 0, $courseId = 0,  $date_from, $date_to) {
+    static function display_tracking_progress_overview($sessionId = 0, $courseId = 0,  $date_from, $date_to) {
 
        //The order is important you need to check the the $column variable in the model.ajax.php file
         $columns = array(