MDL-40047 events: Replace add_to_logs with new events in feedback

mod/feedback/classes/event/course_module_viewed.php

@@ -99,7 +99,7 @@ class course_module_viewed extends \core\event\content_viewed {
         if ($this->other['anonymous'] == FEEDBACK_ANONYMOUS_YES) {
             return null;
         } else {
-            return array($this->courseid, 'feedback', 'view', 'view.php?id=' . $this->other['cmid'], $this->other['instanceid'],
+            return array($this->courseid, 'feedback', 'view', 'view.php?id=' . $this->other['cmid'], $this->objectid,
                     $this->other['cmid']);
         }
     }
@@ -116,9 +116,6 @@ class course_module_viewed extends \core\event\content_viewed {
         if (!isset($this->other['cmid'])) {
             throw new \coding_exception("Field other['cmid'] cannot be empty");
         }
-        if (!isset($this->other['instanceid'])) {
-            throw new \coding_exception("Field other['instanceid'] cannot be empty");
-        }
 
         // Call parent validations.
         parent::validate_data();

mod/feedback/complete.php

@@ -204,21 +204,12 @@ if ($feedback_can_submit) {
         if (!isset($SESSION->feedback->is_started) OR !$SESSION->feedback->is_started == true) {
             print_error('error', '', $CFG->wwwroot.'/course/view.php?id='.$course->id);
         }
-        //checken, ob alle required items einen wert haben
+        // Check if all required items have a value.
         if (feedback_check_values($startitempos, $lastitempos)) {
             $userid = $USER->id; //arb
             if ($completedid = feedback_save_values($USER->id, true)) {
-                if ($userid > 0) {
-                    add_to_log($course->id,
-                               'feedback',
-                               'startcomplete',
-                               'view.php?id='.$cm->id,
-                               $feedback->id,
-                               $cm->id,
-                               $userid);
-                }
                 if (!$gonextpage AND !$gopreviouspage) {
-                    $preservevalues = false;//es kann gespeichert werden
+                    $preservevalues = false;// It can be stored.
                 }
 
             } else {
@@ -265,14 +256,6 @@ if ($feedback_can_submit) {
             if ($new_completed_id) {
                 $savereturn = 'saved';
                 if ($feedback->anonymous == FEEDBACK_ANONYMOUS_NO) {
-                    add_to_log($course->id,
-                              'feedback',
-                              'submit',
-                              'view.php?id='.$cm->id,
-                              $feedback->id,
-                              $cm->id,
-                              $userid);
-
                     feedback_send_email($cm, $feedback, $course, $userid);
                 } else {
                     feedback_send_email_anonym($cm, $feedback, $course, $userid);

mod/feedback/complete_guest.php

@@ -208,12 +208,6 @@ if ($feedback_can_submit) {
         if (feedback_check_values($startitempos, $lastitempos)) {
             $userid = $USER->id; //arb
             if ($completedid = feedback_save_guest_values(sesskey())) {
-                add_to_log($course->id,
-                           'feedback',
-                           'startcomplete',
-                           'view.php?id='.$cm->id,
-                           $feedback->id);
-
                 //now it can be saved
                 if (!$gonextpage AND !$gopreviouspage) {
                     $preservevalues = false;

mod/feedback/delete_completed.php

@@ -76,13 +76,6 @@ if ($mform->is_cancelled()) {
 if (isset($formdata->confirmdelete) AND $formdata->confirmdelete == 1) {
     if ($completed = $DB->get_record('feedback_completed', array('id'=>$completedid))) {
         feedback_delete_completed($completedid);
-        add_to_log($course->id,
-                   'feedback',
-                   'delete',
-                   'view.php?id='.$cm->id,
-                   $feedback->id,
-                   $cm->id);
-
         if ($return == 'entriesanonym') {
             redirect('show_entries_anonym.php?id='.$id);
         } else {

mod/feedback/index.php

@@ -40,8 +40,9 @@ $context = context_course::instance($course->id);
 require_login($course);
 $PAGE->set_pagelayout('incourse');
 
-add_to_log($course->id, 'feedback', 'view all', $url->out(false), $course->id);
-
+// Trigger instances list viewed event.
+$event = \mod_feedback\event\instances_list_viewed::create(array('context' => $context));
+$event->trigger();
 
 /// Print the page header
 $strfeedbacks = get_string("modulenameplural", "feedback");

mod/feedback/lib.php

@@ -1908,6 +1908,23 @@ function feedback_save_tmp_values($feedbackcompletedtmp, $feedbackcompleted, $us
     //drop all the tmpvalues
     $DB->delete_records('feedback_valuetmp', array('completed'=>$tmpcplid));
     $DB->delete_records('feedback_completedtmp', array('id'=>$tmpcplid));
+
+    // Trigger event for the delete action we performed.
+    $cm = get_coursemodule_from_instance('feedback', $feedbackcompleted->feedback);
+    $event = \mod_feedback\event\response_submitted::create(array(
+        'relateduserid' => $userid,
+        'objectid' => $feedbackcompleted->id,
+        'context' => context_module::instance($cm->id),
+        'other' => array(
+            'cmid' => $cm->id,
+            'instanceid' => $feedbackcompleted->feedback,
+            'anonymous' => $feedbackcompleted->anonymous_response
+        )
+    ));
+
+    $event->add_record_snapshot('feedback_completed', $feedbackcompleted);
+
+    $event->trigger();
     return $feedbackcompleted->id;
 
 }
@@ -2662,8 +2679,25 @@ function feedback_delete_completed($completedid) {
     if ($completion->is_enabled($cm) && $feedback->completionsubmit) {
         $completion->update_state($cm, COMPLETION_INCOMPLETE, $completed->userid);
     }
-    //last we delete the completed-record
-    return $DB->delete_records('feedback_completed', array('id'=>$completed->id));
+    // Last we delete the completed-record.
+    $return = $DB->delete_records('feedback_completed', array('id'=>$completed->id));
+
+    // Trigger event for the delete action we performed.
+    $event = \mod_feedback\event\response_deleted::create(array(
+        'relateduserid' => $completed->userid,
+        'objectid' => $completedid,
+        'courseid' => $course->id,
+        'context' => context_module::instance($cm->id),
+        'other' => array('cmid' => $cm->id, 'instanceid' => $feedback->id, 'anonymous' => $completed->anonymous_response)
+    ));
+
+    $event->add_record_snapshot('feedback_completed', $completed);
+    $event->add_record_snapshot('course', $course);
+    $event->add_record_snapshot('feedback', $feedback);
+
+    $event->trigger();
+
+    return $return;
 }
 
 ////////////////////////////////////////////////

mod/feedback/view.php

@@ -96,9 +96,21 @@ if ($courseid AND $courseid != SITEID) {
     }
 }
 
-if ($feedback->anonymous == FEEDBACK_ANONYMOUS_NO) {
-    add_to_log($course->id, 'feedback', 'view', 'view.php?id='.$cm->id, $feedback->id, $cm->id);
-}
+// Trigger module viewed event.
+$event = \mod_feedback\event\course_module_viewed::create(array(
+    'objectid' => $feedback->id,
+    'context' => $context,
+    'other' => array(
+        'cmid' => $cm->id,
+        'instanceid' => $feedback->id,
+        'anonymous' => $feedback->anonymous,
+        'content' => 'feedbackmoduleview'
+        )
+    ));
+$event->add_record_snapshot('course_modules', $cm);
+$event->add_record_snapshot('course', $course);
+$event->add_record_snapshot('feedback', $feedback);
+$event->trigger();
 
 /// Print the page header
 $strfeedbacks = get_string("modulenameplural", "feedback");