WIP: Add log when deleting an exercise result attempt (exe_id) see #2215

New page added: course_log_events.php

main/exercise/exercise_report.php

@@ -379,6 +379,13 @@ if (($is_allowedToEdit || $is_tutor || api_is_coach()) &&
         Database::query($sql);
         $sql = 'DELETE FROM '.$TBL_TRACK_ATTEMPT.' WHERE exe_id = '.$exe_id;
         Database::query($sql);
+
+        Event::addEvent(
+            LOG_EXERCISE_ATTEMPT_DELETE,
+            LOG_EXERCISE_ATTEMPT,
+            $exe_id,
+            api_get_utc_datetime()
+        );
         header('Location: exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id);
         exit;
     }

main/inc/ajax/model.ajax.php

@@ -778,8 +778,8 @@ switch ($action) {
         $result = Statistics::getActivitiesData(
             $start,
             $limit,
-            $column,
-            $direction,
+            $sidx,
+            $sord,
             $courseId,
             $sessionId
         );

main/inc/lib/api.lib.php

@@ -220,7 +220,11 @@ define('LOG_CAREER_DELETE', 'career_deleted');
 define('LOG_USER_PERSONAL_DOC_DELETED', 'user_doc_deleted');
 define('LOG_WIKI_ACCESS', 'wiki_page_view');
 
+// All results from an exercise
 define('LOG_EXERCISE_RESULT_DELETE', 'exe_result_deleted');
+
+// Logs only the one attempt
+define('LOG_EXERCISE_ATTEMPT_DELETE', 'exe_attempt_deleted');
 define('LOG_LP_ATTEMPT_DELETE', 'lp_attempt_deleted');
 define('LOG_QUESTION_RESULT_DELETE', 'qst_attempt_deleted');
 
@@ -253,6 +257,7 @@ define('LOG_EXERCISE_ID', 'exercise_id');
 define('LOG_EXERCISE_AND_USER_ID', 'exercise_and_user_id');
 define('LOG_LP_ID', 'lp_id');
 define('LOG_EXERCISE_ATTEMPT_QUESTION_ID', 'exercise_a_q_id');
+define('LOG_EXERCISE_ATTEMPT', 'exe_id');
 
 define('LOG_WORK_DIR_DELETE', 'work_dir_delete');
 define('LOG_WORK_FILE_DELETE', 'work_file_delete');

main/inc/lib/statistics.lib.php

@@ -251,6 +251,7 @@ class Statistics
         $column = intval($column);
         $from = intval($from);
         $numberOfItems = intval($numberOfItems);
+        $direction = strtoupper($direction);
 
         if (!in_array($direction, array('ASC', 'DESC'))) {
             $direction = 'DESC';
@@ -304,7 +305,7 @@ class Statistics
         if (!empty($column) && !empty($direction)) {
             $sql .= " ORDER BY col$column $direction";
         } else {
-            $sql .= " ORDER BY col5 DESC ";
+            $sql .= " ORDER BY col7 DESC ";
         }
         $sql .= " LIMIT $from, $numberOfItems ";
 
@@ -814,7 +815,7 @@ class Statistics
             'activities',
             array('Statistics', 'getNumberOfActivities'),
             array('Statistics', 'getActivitiesData'),
-            5,
+            7,
             50,
             'DESC'
         );

main/tracking/course_log_events.php

@@ -88,17 +88,16 @@ $column_model = array(
     ),
     array(
         'name' => 'col6',
-        'index' => 'col6',
+        'index' => '6',
         'width' => '50',
         'align' => 'left',
         'sortable' => 'false',
     ),
     array(
         'name' => 'col7',
-        'index' => 'col7',
+        'index' => '7',
         'width' => '50',
-        'align' => 'left',
-        'sortable' => 'false',
+        'align' => 'left'
     )
 );
 
@@ -107,13 +106,6 @@ $extra_params['autowidth'] = 'true';
 // height auto
 $extra_params['height'] = 'auto';
 
-$action_links = '
-function action_formatter(cellvalue, options, rowObject) {
-    return \'<a href="course_log_tools.php?id_session=0&cidReq='.$course_code.'&gidReq=\'+options.rowId+\'">'.Display::return_icon('2rightarrow.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'.
-    '\';
-}';
-
-
 // Add the JS needed to use the jqgrid
 $htmlHeadXtra[] = api_get_jqgrid_js();
 $htmlHeadXtra[] = '