From 8ee8195650ea2b8fc56c1f2faba398b45771645d Mon Sep 17 00:00:00 2001
From: Mark Nelson <markn@moodle.com>
Date: Wed, 25 Mar 2015 15:48:38 -0700
Subject: [PATCH] MDL-49680 core_question: added ability to order questions by
 dates

Backport of MDL-25721.
---
 mod/quiz/styles.css                            | 9 +++++++++
 question/classes/bank/creator_name_column.php  | 5 ++++-
 question/classes/bank/modifier_name_column.php | 5 ++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css
index a2e7b50c105..f5f3d168500 100644
--- a/mod/quiz/styles.css
+++ b/mod/quiz/styles.css
@@ -783,6 +783,15 @@ table.quizreviewsummary td.cell {
     font-weight: normal;
     font-size: 0.8em;
 }
+#categoryquestions td.modifiername,
+#categoryquestions td.creatorname {
+    line-height: 1em;
+}
+#categoryquestions td.modifiername span.date,
+#categoryquestions td.creatorname span.date {
+    font-weight: normal;
+    font-size: 0.8em;
+}
 table#categoryquestions {
     width: 100%;
     overflow: hidden;
diff --git a/question/classes/bank/creator_name_column.php b/question/classes/bank/creator_name_column.php
index 6b13efa7c03..9110a857f6c 100644
--- a/question/classes/bank/creator_name_column.php
+++ b/question/classes/bank/creator_name_column.php
@@ -37,7 +37,8 @@ class creator_name_column extends column_base {
         if (!empty($question->creatorfirstname) && !empty($question->creatorlastname)) {
             $u = new \stdClass();
             $u = username_load_fields_from_object($u, $question, 'creator');
-            echo fullname($u);
+            $date = userdate($question->timecreated, get_string('strftimedatetime', 'langconfig'));
+            echo fullname($u) . '<br>' . \html_writer::tag('span', $date, array('class' => 'date'));
         }
     }
 
@@ -51,6 +52,7 @@ class creator_name_column extends column_base {
         foreach ($allnames as $allname) {
             $requiredfields[] = 'uc.' . $allname . ' AS creator' . $allname;
         }
+        $requiredfields[] = 'q.timecreated';
         return $requiredfields;
     }
 
@@ -58,6 +60,7 @@ class creator_name_column extends column_base {
         return array(
             'firstname' => array('field' => 'uc.firstname', 'title' => get_string('firstname')),
             'lastname' => array('field' => 'uc.lastname', 'title' => get_string('lastname')),
+            'timecreated' => array('field' => 'q.timecreated', 'title' => get_string('date'))
         );
     }
 }
diff --git a/question/classes/bank/modifier_name_column.php b/question/classes/bank/modifier_name_column.php
index 6981f34ca87..f3b326df53e 100644
--- a/question/classes/bank/modifier_name_column.php
+++ b/question/classes/bank/modifier_name_column.php
@@ -36,7 +36,8 @@ class modifier_name_column extends column_base {
         if (!empty($question->modifierfirstname) && !empty($question->modifierlastname)) {
             $u = new \stdClass();
             $u = username_load_fields_from_object($u, $question, 'modifier');
-            echo fullname($u);
+            $date = userdate($question->timemodified, get_string('strftimedatetime', 'langconfig'));
+            echo fullname($u) . '<br>' . \html_writer::tag('span', $date, array('class' => 'date'));
         }
     }
 
@@ -50,6 +51,7 @@ class modifier_name_column extends column_base {
         foreach ($allnames as $allname) {
             $requiredfields[] = 'um.' . $allname . ' AS modifier' . $allname;
         }
+        $requiredfields[] = 'q.timemodified';
         return $requiredfields;
     }
 
@@ -57,6 +59,7 @@ class modifier_name_column extends column_base {
         return array(
             'firstname' => array('field' => 'um.firstname', 'title' => get_string('firstname')),
             'lastname' => array('field' => 'um.lastname', 'title' => get_string('lastname')),
+            'timemodified' => array('field' => 'q.timemodified', 'title' => get_string('date'))
         );
     }
 }