Merge pull request #136 from KQMATH/feat/report

Feat/report

backup/moodle2/backup_capquiz_stepslib.php

@@ -34,6 +34,10 @@ protected function define_structure() {
  $question = new backup_nested_element('question', ['id'], [
  'question_id', 'question_list_id', 'rating'
  ]);
+ $questionratings = new backup_nested_element('questionratings');
+ $questionrating = new backup_nested_element('question_rating', ['id'], [
+ 'capquiz_question_id', 'rating', 'manual', 'timecreated'
+ ]);
  $questionselections = new backup_nested_element('questionselections');
  $questionselection = new backup_nested_element('questionselection', ['id'], [
  'capquiz_id', 'strategy', 'configuration'
@@ -46,32 +50,46 @@ protected function define_structure() {
  $user = new backup_nested_element('user', ['id'], [
  'user_id', 'capquiz_id', 'rating', 'highest_level'
  ]);
+ $userratings = new backup_nested_element('userratings');
+ $userrating = new backup_nested_element('user_rating', ['id'], [
+ 'capquiz_user_id', 'rating', 'manual', 'timecreated'
+ ]);
  $attempts = new backup_nested_element('attempts');
  $attempt = new backup_nested_element('attempt', ['id'], [
- 'slot', 'user_id', 'question_id', 'reviewed', 'answered', 'time_answered', 'time_reviewed', 'feedback'
+ 'slot', 'user_id', 'question_id', 'reviewed', 'answered', 'time_answered', 'time_reviewed',
+ 'question_rating_id', 'previous_question_rating_id', 'user_rating_id', 'previous_user_rating_id', 'feedback'
  ]);
 
  // Build the tree.
- $capquiz->add_child($users);
- $users->add_child($user);
- $user->add_child($attempts);
- $attempts->add_child($attempt);
+ $capquiz->add_child($questionlist);
+ $questionlist->add_child($questions);
+ $questions->add_child($question);
+ $question->add_child($questionratings);
+ $questionratings->add_child($questionrating);
+
  $capquiz->add_child($questionselections);
  $questionselections->add_child($questionselection);
+
  $capquiz->add_child($ratingsystems);
  $ratingsystems->add_child($ratingsystem);
- $capquiz->add_child($questionlist);
- $questionlist->add_child($questions);
- $questions->add_child($question);
+
+ $capquiz->add_child($users);
+ $users->add_child($user);
+ $user->add_child($userratings);
+ $userratings->add_child($userrating);
+ $user->add_child($attempts);
+ $attempts->add_child($attempt);
 
  // Define sources.
  $capquiz->set_source_table('capquiz', ['id' => backup::VAR_ACTIVITYID]);
  $questionlist->set_source_table('capquiz_question_list', ['capquiz_id' => backup::VAR_PARENTID]);
  $question->set_source_table('capquiz_question', ['question_list_id' => backup::VAR_PARENTID]);
+ $questionrating->set_source_table('capquiz_question_rating', ['capquiz_question_id' => backup::VAR_PARENTID]);
  $questionselection->set_source_table('capquiz_question_selection', ['capquiz_id' => backup::VAR_PARENTID]);
  $ratingsystem->set_source_table('capquiz_rating_system', ['capquiz_id' => backup::VAR_PARENTID]);
  if ($this->get_setting_value('userinfo')) {
  $user->set_source_table('capquiz_user', ['capquiz_id' => backup::VAR_PARENTID]);
+ $userrating->set_source_table('capquiz_user_rating', ['capquiz_user_id' => backup::VAR_PARENTID]);
  $attempt->set_source_table('capquiz_attempt', ['user_id' => backup::VAR_PARENTID]);
  }
 

backup/moodle2/restore_capquiz_stepslib.php

@@ -30,10 +30,13 @@ protected function define_structure() {
  $this->add_question_usages($questionlist, $paths);
  $paths[] = $questionlist;
  $paths[] = new restore_path_element('capquiz_question', '/activity/capquiz/questionlist/questions/question');
+ $paths[] = new restore_path_element(
+ 'capquiz_question_rating', '/activity/capquiz/questionlist/questions/question/questionratings/question_rating');
  $paths[] = new restore_path_element('capquiz_question_selection', '/activity/capquiz/questionselections/questionselection');
  $paths[] = new restore_path_element('capquiz_rating_system', '/activity/capquiz/ratingsystems/ratingsystem');
  if ($this->get_setting_value('userinfo')) {
  $paths[] = new restore_path_element('capquiz_user', '/activity/capquiz/users/user');
+ $paths[] = new restore_path_element('capquiz_user_rating', '/activity/capquiz/users/user/userratings/user_rating');
  $paths[] = new restore_path_element('capquiz_attempt', '/activity/capquiz/users/user/attempts/attempt');
  }
  return $this->prepare_activity_structure($paths);
@@ -71,6 +74,15 @@ protected function process_capquiz_question($data) {
  $this->set_mapping('capquiz_question', $oldid, $newitemid);
  }
 
+ protected function process_capquiz_question_rating($data) {
+ global $DB;
+ $data = (object)$data;
+ $oldid = $data->id;
+ $data->capquiz_question_id = $this->get_new_parentid('capquiz_question');
+ $newitemid = $DB->insert_record('capquiz_question_rating', $data);
+ $this->set_mapping('capquiz_question_rating', $oldid, $newitemid);
+ }
+
  protected function process_capquiz_question_selection($data) {
  global $DB;
  $data = (object)$data;
@@ -97,6 +109,16 @@ protected function process_capquiz_user($data) {
  $data->capquiz_id = $this->get_new_parentid('capquiz');
  $newitemid = $DB->insert_record('capquiz_user', $data);
  $this->set_mapping('capquiz_user', $oldid, $newitemid);
+
+ }
+
+ protected function process_capquiz_user_rating($data) {
+ global $DB;
+ $data = (object)$data;
+ $oldid = $data->id;
+ $data->capquiz_user_id = $this->get_new_parentid('capquiz_user');
+ $newitemid = $DB->insert_record('capquiz_user_rating', $data);
+ $this->set_mapping('capquiz_user_rating', $oldid, $newitemid);
  }
 
  protected function process_capquiz_attempt($data) {
@@ -105,6 +127,10 @@ protected function process_capquiz_attempt($data) {
  $oldid = $data->id;
  $data->user_id = $this->get_new_parentid('capquiz_user');
  $data->question_id = $this->get_mappingid('capquiz_question', $data->question_id);
+ $data->question_rating_id = $this->get_mappingid('capquiz_question_rating', $data->question_rating_id);
+ $data->previous_question_rating_id = $this->get_mappingid('capquiz_question_rating', $data->previous_question_rating_id);
+ $data->user_rating_id = $this->get_mappingid('capquiz_user_rating', $data->user_rating_id);
+ $data->previous_user_rating_id = $this->get_mappingid('capquiz_user_rating', $data->previous_user_rating_id);
  $newitemid = $DB->insert_record('capquiz_attempt', $data);
  $this->set_mapping('capquiz_attempt', $oldid, $newitemid);
  }

classes/capquiz.php

@@ -70,6 +70,10 @@ public function id() : int {
  return $this->record->id;
  }
 
+ public function name() : string {
+ return $this->record->name;
+ }
+
  public function is_published() : bool {
  return $this->record->published;
  }

classes/capquiz_action_performer.php

@@ -118,7 +118,7 @@ public static function set_question_rating(capquiz $capquiz) {
  }
  $rating = optional_param('rating', null, PARAM_FLOAT);
  if ($rating !== null) {
- $question->set_rating($rating);
+ $question->set_rating($rating, true);
  }
  capquiz_urls::redirect_to_url(capquiz_urls::view_question_list_url());
  }
@@ -154,7 +154,8 @@ private static function create_capquiz_question(int $questionid, capquiz_questio
  $ratedquestion->question_list_id = $list->id();
  $ratedquestion->question_id = $questionid;
  $ratedquestion->rating = $rating;
- $DB->insert_record('capquiz_question', $ratedquestion);
+ $capquizquestionid = $DB->insert_record('capquiz_question', $ratedquestion, true);
+ capquiz_question_rating::insert_question_rating_entry($capquizquestionid, $rating);
  }
 
  private static function remove_capquiz_question(int $questionid, int $qlistid) {

classes/capquiz_question.php

@@ -30,6 +30,9 @@ class capquiz_question {
  /** @var \stdClass $record */
  private $record;
 
+ /** @var capquiz_question_rating $rating */
+ private $rating;
+
  public function __construct(\stdClass $record) {
  global $DB;
  $this->record = $record;
@@ -42,6 +45,12 @@ public function __construct(\stdClass $record) {
  $this->record->name = get_string('missing_question', 'capquiz');
  $this->record->text = $this->record->name;
  }
+ $rating = capquiz_question_rating::latest_question_rating_by_question($record->id);
+ if (is_null($rating)) {
+ $this->rating = capquiz_question_rating::insert_question_rating_entry($this->id(), $this->rating());
+ } else {
+ $this->rating = $rating;
+ }
  }
 
  public static function load(int $questionid) {
@@ -73,10 +82,18 @@ public function rating() : float {
  return $this->record->rating;
  }
 
- public function set_rating(float $rating) : bool {
+ public function get_capquiz_question_rating() : capquiz_question_rating {
+ return $this->rating;
+ }
+
+ public function set_rating($rating, bool $manual = false) {
  global $DB;
  $this->record->rating = $rating;
- return $DB->update_record('capquiz_question', $this->record);
+ $DB->update_record('capquiz_question', $this->record);
+
+ $questionrating = capquiz_question_rating::create_question_rating($this, $rating, $manual);
+ $this->rating = $questionrating;
+
  }
 
  public function name() : string {

classes/capquiz_question_attempt.php

@@ -163,6 +163,11 @@ public function is_correctly_answered() : bool {
  return $moodleattempt->get_state()->is_correct();
  }
 
+ public function get_state() : bool {
+ $moodleattempt = $this->quba->get_question_attempt($this->question_slot());
+ return $moodleattempt->get_state();
+ }
+
  public function is_reviewed() : bool {
  return $this->record->reviewed;
  }
@@ -215,6 +220,26 @@ public function update_student_comment(string $feedback) {
  $DB->update_record('capquiz_attempt', $this->record);
  }
 
+ public function set_question_rating(capquiz_question_rating $rating, $previous = false) {
+ global $DB;
+ if (!$previous) {
+ $this->record->question_rating_id = $rating->id();
+ } else {
+ $this->record->previous_question_rating_id = $rating->id();
+ }
+ $DB->update_record('capquiz_attempt', $this->record);
+ }
+
+ public function set_user_rating(capquiz_user_rating $rating, $previous = false) {
+ global $DB;
+ if (!$previous) {
+ $this->record->user_rating_id = $rating->id();
+ } else {
+ $this->record->previous_user_rating_id = $rating->id();
+ }
+ $DB->update_record('capquiz_attempt', $this->record);
+ }
+
  /**
  * @param int $questionid
  * @return array

classes/capquiz_question_engine.php

@@ -81,13 +81,15 @@ public function attempt_answered(capquiz_user $user, capquiz_question_attempt $a
  }
  $ratingsystem = $this->ratingsystemloader->rating_system();
  $attempt->mark_as_answered();
+ $attempt->set_user_rating($user->get_capquiz_user_rating(), true);
  $question = $this->capquiz->question_list()->question($attempt->question_id());
  if ($attempt->is_correctly_answered()) {
  $ratingsystem->update_user_rating($user, $question, 1);
  $this->set_new_highest_star_if_attained($user);
  } else {
  $ratingsystem->update_user_rating($user, $question, 0);
  }
+ $attempt->set_user_rating($user->get_capquiz_user_rating());
  $previousattempt = capquiz_question_attempt::previous_attempt($this->capquiz, $user);
  if ($previousattempt) {
  $this->update_question_rating($previousattempt, $attempt);
@@ -127,6 +129,9 @@ private function update_question_rating(capquiz_question_attempt $previous, capq
  $previouscorrect = $previous->is_correctly_answered();
  $currentquestion = $this->capquiz->question_list()->question($current->question_id());
  $previousquestion = $this->capquiz->question_list()->question($previous->question_id());
+
+ $current->set_question_rating($currentquestion->get_capquiz_question_rating(), true);
+
  if (!$currentquestion || !$previousquestion) {
  return;
  }
@@ -135,6 +140,8 @@ private function update_question_rating(capquiz_question_attempt $previous, capq
  } else if (!$previouscorrect && $currentcorrect) {
  $ratingsystem->question_victory_ratings($previousquestion, $currentquestion);
  }
+
+ $current->set_question_rating($currentquestion->get_capquiz_question_rating());
  }
 
 }

classes/capquiz_question_list.php

@@ -183,7 +183,8 @@ public function merge(capquiz_question_list $that) {
  $newquestion->question_list_id = $this->id();
  $newquestion->question_id = $question->question_id();
  $newquestion->rating = $question->rating();
- $DB->insert_record('capquiz_question', $newquestion);
+ $capquizquestionid = $DB->insert_record('capquiz_question', $newquestion, true);
+ capquiz_question_rating::insert_question_rating_entry($capquizquestionid, $newquestion->rating);
  }
  }
  }
@@ -230,7 +231,8 @@ private function copy_questions_to_list(int $qlistid) {
  $record = $question->entry();
  $record->id = null;
  $record->question_list_id = $qlistid;
- $DB->insert_record('capquiz_question', $record);
+ $capquizquestionid = $DB->insert_record('capquiz_question', $record, true);
+ capquiz_question_rating::insert_question_rating_entry($capquizquestionid, $record->rating);
  }
  }