" + html + "
", js);
+ return promises[0];
+ }.bind(this)).then(function(data) {
+ numberreceived = data.contacts.length;
+ return templates.render('core_message/message_area_contacts', data);
+ }).then(function(html, js) {
+ // Remove the loading icon.
+ this.messageArea.find(this.messageArea.SELECTORS.SEARCHRESULTSAREA + " " +
+ this.messageArea.SELECTORS.LOADINGICON).remove();
+ // Only append data if we got data back.
+ if (numberreceived > 0) {
+ // Show the new content.
+ templates.appendNodeContents(this.messageArea.SELECTORS.SEARCHRESULTSAREA, html, js);
+ // Increment the number of contacts displayed.
+ this._numMessagesDisplayed += numberreceived;
+ }
+ // Mark that we are no longer busy loading data.
+ this._isLoading = false;
+ }.bind(this)).fail(notification.exception);
+ };
+
+
+ /**
+ * Handles searching for people.
+ *
+ * @private
+ * @returns {Promise} The promise resolved when the search area has been rendered
+ */
+ Search.prototype._searchPeople = function() {
+ var str = this.messageArea.find(this.messageArea.SELECTORS.SEARCHBOX).val();
+
+ // Call the web service to get our data.
+ var promises = ajax.call([{
+ methodname: 'core_message_data_for_messagearea_search_people',
+ args: {
+ userid: this.messageArea.getCurrentUserId(),
+ search: str,
+ limitnum: this._numPeopleToRetrieve
+ }
+ }]);
+
+ // Perform the search and replace the content.
+ return templates.render('core/loading', {}).then(function(html, js) {
+ templates.replaceNodeContents(this.messageArea.SELECTORS.SEARCHRESULTSAREA,
+ "" + html + "
", js);
+ return promises[0];
+ }.bind(this)).then(function(data) {
+ return templates.render('core_message/message_area_people_search_results', data);
+ }).then(function(html, js) {
+ templates.replaceNodeContents(this.messageArea.SELECTORS.SEARCHRESULTSAREA, html, js);
+ }.bind(this)).fail(notification.exception);
+ };
+
+ /**
+ * Handles searching for people in a course.
+ *
+ * @private
+ * @returns {Promise} The promise resolved when the search area has been rendered
+ */
+ Search.prototype._searchPeopleInCourse = function() {
+ if (this._isLoading) {
+ return;
+ }
+
+ var str = this.messageArea.find(this.messageArea.SELECTORS.SEARCHBOX).val();
+
+ // Tell the user we are loading items.
+ this._isLoading = true;
+
+ // Call the web service to get our data.
+ var promises = ajax.call([{
+ methodname: 'core_message_data_for_messagearea_search_people_in_course',
+ args: {
+ userid: this.messageArea.getCurrentUserId(),
+ courseid: this._courseid,
+ search: str,
+ limitfrom: this._numPeopleDisplayed,
+ limitnum: this._numPeopleToRetrieve
+ }
+ }]);
+
+ // Keep track of the number of contacts
+ var numberreceived = 0;
+ // Add loading icon to the end of the list.
+ return templates.render('core/loading', {}).then(function(html, js) {
+ templates.appendNodeContents(this.messageArea.SELECTORS.SEARCHRESULTSAREA,
+ "" + html + "
", js);
+ return promises[0];
+ }.bind(this)).then(function(data) {
+ numberreceived = data.contacts.length;
+ return templates.render('core_message/message_area_people_search_results', data);
+ }).then(function(html, js) {
+ // Remove the loading icon.
+ this.messageArea.find(this.messageArea.SELECTORS.SEARCHRESULTSAREA + " " +
+ this.messageArea.SELECTORS.LOADINGICON).remove();
+ // Only append data if we got data back.
+ if (numberreceived > 0) {
+ // Show the new content.
+ templates.appendNodeContents(this.messageArea.SELECTORS.SEARCHRESULTSAREA, html, js);
+ // Increment the number of contacts displayed.
+ this._numPeopleDisplayed += numberreceived;
+ }
+ // Mark that we are no longer busy loading data.
+ this._isLoading = false;
+ }.bind(this)).fail(notification.exception);
+ };
+
+ /**
+ * Sets placeholder text for search input.
+ *
+ * @private
+ * @param {String} text The placeholder text
+ * @return {Promise} The promise resolved when the placeholder text has been set
+ */
+ Search.prototype._setPlaceholderText = function(text) {
+ return str.get_string(text, 'message').then(function(s) {
+ this.messageArea.find(this.messageArea.SELECTORS.SEARCHTEXTAREA + ' input').attr('placeholder', s);
+ }.bind(this));
+ };
+
+
+ /**
+ * Sets filter for search input.
+ *
+ * @private
+ * @param {String} text The filter text
+ */
+ Search.prototype._setFilter = function(text) {
+ this.messageArea.find(this.messageArea.SELECTORS.SEARCHBOX).val('');
+ this.messageArea.find(this.messageArea.SELECTORS.CONTACTSAREA).addClass('searchfilter');
+ this.messageArea.find(this.messageArea.SELECTORS.SEARCHFILTERAREA).show();
+ this.messageArea.find(this.messageArea.SELECTORS.SEARCHFILTER).html(text);
+ };
+
+ /**
+ * Hides filter for search input.
+ *
+ * @private
+ */
+ Search.prototype._clearFilters = function() {
+ this.messageArea.find(this.messageArea.SELECTORS.CONTACTSAREA).removeClass('searchfilter');
+ this.messageArea.find(this.messageArea.SELECTORS.SEARCHFILTER).empty();
+ this.messageArea.find(this.messageArea.SELECTORS.SEARCHFILTERAREA).hide();
+ };
+
+ /**
+ * Handles clearing the search area.
+ *
+ * @private
+ */
+ Search.prototype._clearSearchArea = function() {
+ this.messageArea.find(this.messageArea.SELECTORS.SEARCHRESULTSAREA).empty();
+ };
+
+ /**
+ * Handles hiding the search area.
+ *
+ * @private
+ */
+ Search.prototype._hideSearchResults = function() {
+ this._clearFilters();
+ this.messageArea.find(this.messageArea.SELECTORS.SEARCHTEXTAREA + ' input').val('');
+ this._clearSearchArea();
+ this.messageArea.find(this.messageArea.SELECTORS.SEARCHRESULTSAREA).hide();
+ };
+
+ return Search;
+});
\ No newline at end of file
diff --git a/message/classes/api.php b/message/classes/api.php
index 3f1eb8c05ac..51545defed3 100644
--- a/message/classes/api.php
+++ b/message/classes/api.php
@@ -36,6 +36,184 @@ defined('MOODLE_INTERNAL') || die();
*/
class api {
+ /**
+ * Handles searching for messages in the message area.
+ *
+ * @param int $userid The user id doing the searching
+ * @param string $search The string the user is searching
+ * @param int $limitfrom
+ * @param int $limitnum
+ * @return \core_message\output\messagearea\message_search_results
+ */
+ public static function search_messages($userid, $search, $limitfrom = 0, $limitnum = 0) {
+ global $DB;
+
+ // Get the user fields we want.
+ $ufields = \user_picture::fields('u', array('lastaccess'), 'userfrom_id', 'userfrom_');
+ $ufields2 = \user_picture::fields('u2', array('lastaccess'), 'userto_id', 'userto_');
+
+ // Get all the messages for the user.
+ $sql = "SELECT m.id, m.useridfrom, m.useridto, m.subject, m.fullmessage, m.fullmessagehtml, m.fullmessageformat,
+ m.smallmessage, m.notification, m.timecreated, 0 as isread, $ufields, $ufields2
+ FROM {message} m
+ JOIN {user} u
+ ON m.useridfrom = u.id
+ JOIN {user} u2
+ ON m.useridto = u2.id
+ WHERE ((useridto = ? AND timeusertodeleted = 0)
+ OR (useridfrom = ? AND timeuserfromdeleted = 0))
+ AND notification = 0
+ AND u.deleted = 0
+ AND u2.deleted = 0
+ AND " . $DB->sql_like('smallmessage', '?', false) . "
+ UNION ALL
+ SELECT mr.id, mr.useridfrom, mr.useridto, mr.subject, mr.fullmessage, mr.fullmessagehtml, mr.fullmessageformat,
+ mr.smallmessage, mr.notification, mr.timecreated, 1 as isread, $ufields, $ufields2
+ FROM {message_read} mr
+ JOIN {user} u
+ ON mr.useridfrom = u.id
+ JOIN {user} u2
+ ON mr.useridto = u2.id
+ WHERE ((useridto = ? AND timeusertodeleted = 0)
+ OR (useridfrom = ? AND timeuserfromdeleted = 0))
+ AND notification = 0
+ AND u.deleted = 0
+ AND u2.deleted = 0
+ AND " . $DB->sql_like('smallmessage', '?', false) . "
+ ORDER BY timecreated DESC";
+ $params = array($userid, $userid, '%' . $search . '%',
+ $userid, $userid, '%' . $search . '%');
+
+ // Convert the messages into searchable contacts with their last message being the message that was searched.
+ $contacts = array();
+ if ($messages = $DB->get_records_sql($sql, $params, $limitfrom, $limitnum)) {
+ foreach ($messages as $message) {
+ $prefix = 'userfrom_';
+ if ($userid == $message->useridfrom) {
+ $prefix = 'userto_';
+ // If it from the user, then mark it as read, even if it wasn't by the receiver.
+ $message->isread = true;
+ }
+ $message->messageid = $message->id;
+ $contacts[] = \core_message\helper::create_contact($message, $prefix);
+ }
+ }
+
+ return new \core_message\output\messagearea\message_search_results($userid, $contacts);
+ }
+
+ /**
+ * Handles searching for people in a particular course in the message area.
+ *
+ * @param int $userid The user id doing the searching
+ * @param int $courseid The id of the course we are searching in
+ * @param string $search The string the user is searching
+ * @param int $limitfrom
+ * @param int $limitnum
+ * @return \core_message\output\messagearea\people_search_results
+ */
+ public static function search_people_in_course($userid, $courseid, $search, $limitfrom = 0, $limitnum = 0) {
+ global $DB;
+
+ // Get all the users in the course.
+ list($esql, $params) = get_enrolled_sql(\context_course::instance($courseid), '', 0, true);
+ $sql = "SELECT u.*
+ FROM {user} u
+ JOIN ($esql) je ON je.id = u.id
+ WHERE u.deleted = 0";
+ // Add more conditions.
+ $fullname = $DB->sql_fullname();
+ $sql .= " AND u.id != :userid
+ AND " . $DB->sql_like($fullname, ':search', false) . "
+ ORDER BY " . $DB->sql_fullname();
+ $params = array_merge(array('userid' => $userid, 'search' => '%' . $search . '%'), $params);
+
+
+ // Convert all the user records into contacts.
+ $contacts = array();
+ if ($users = $DB->get_records_sql($sql, $params, $limitfrom, $limitnum)) {
+ foreach ($users as $user) {
+ $contacts[] = \core_message\helper::create_contact($user);
+ }
+ }
+
+ return new \core_message\output\messagearea\people_search_results($contacts);
+ }
+
+ /**
+ * Handles searching for people in the message area.
+ *
+ * @param int $userid The user id doing the searching
+ * @param string $search The string the user is searching
+ * @param int $limitnum
+ * @return \core_message\output\messagearea\people_search_results
+ */
+ public static function search_people($userid, $search, $limitnum = 0) {
+ global $CFG, $DB;
+
+ require_once($CFG->dirroot . '/lib/coursecatlib.php');
+
+ // Used to search for contacts.
+ $fullname = $DB->sql_fullname();
+ $ufields = \user_picture::fields('u', array('lastaccess'));
+
+ // Users not to include.
+ $excludeusers = array($userid, $CFG->siteguest);
+ list($exclude, $excludeparams) = $DB->get_in_or_equal($excludeusers, SQL_PARAMS_NAMED, 'param', false);
+
+ // Ok, let's search for contacts first.
+ $contacts = array();
+ $sql = "SELECT $ufields
+ FROM {user} u
+ JOIN {message_contacts} mc
+ ON u.id = mc.contactid
+ WHERE mc.userid = :userid
+ AND u.deleted = 0
+ AND u.confirmed = 1
+ AND " . $DB->sql_like($fullname, ':search', false) . "
+ AND u.id $exclude
+ ORDER BY " . $DB->sql_fullname();
+ if ($users = $DB->get_records_sql($sql, array('userid' => $userid, 'search' => '%' . $search . '%') +
+ $excludeparams, 0, $limitnum)) {
+ foreach ($users as $user) {
+ $contacts[] = \core_message\helper::create_contact($user);
+ }
+ }
+
+ // Now, let's get the courses.
+ $courses = array();
+ if ($arrcourses = \coursecat::search_courses(array('search' => $search), array('limit' => $limitnum))) {
+ foreach ($arrcourses as $course) {
+ $data = new \stdClass();
+ $data->id = $course->id;
+ $data->shortname = $course->shortname;
+ $data->fullname = $course->fullname;
+ $courses[] = $data;
+ }
+ }
+
+ // Let's get those non-contacts. Toast them gears boi.
+ $noncontacts = array();
+ $sql = "SELECT $ufields
+ FROM {user} u
+ WHERE u.deleted = 0
+ AND u.confirmed = 1
+ AND " . $DB->sql_like($fullname, ':search', false) . "
+ AND u.id $exclude
+ AND u.id NOT IN (SELECT contactid
+ FROM {message_contacts}
+ WHERE userid = :userid)
+ ORDER BY " . $DB->sql_fullname();
+ if ($users = $DB->get_records_sql($sql, array('userid' => $userid, 'search' => '%' . $search . '%') +
+ $excludeparams, 0, $limitnum)) {
+ foreach ($users as $user) {
+ $noncontacts[] = \core_message\helper::create_contact($user);
+ }
+ }
+
+ return new \core_message\output\messagearea\people_search_results($contacts, $courses, $noncontacts);
+ }
+
/**
* Returns the contacts and their conversation to display in the contacts area.
*
diff --git a/message/classes/helper.php b/message/classes/helper.php
index ba78aa94510..30d46c4afce 100644
--- a/message/classes/helper.php
+++ b/message/classes/helper.php
@@ -122,9 +122,10 @@ class helper {
* Helper function for creating a contact renderable.
*
* @param \stdClass $contact
+ * @param string $prefix
* @return \core_message\output\messagearea\contact
*/
- public static function create_contact($contact) {
+ public static function create_contact($contact, $prefix = '') {
global $CFG, $PAGE;
// Variables to check if we consider this user online or not.
@@ -135,7 +136,7 @@ class helper {
$time = time() - $timetoshowusers;
// Create the data we are going to pass to the renderable.
- $userfields = \user_picture::unalias($contact, array('lastaccess'));
+ $userfields = \user_picture::unalias($contact, array('lastaccess'), $prefix . 'id', $prefix);
$data = new \stdClass();
$data->userid = $userfields->id;
$data->fullname = fullname($userfields);
@@ -146,10 +147,13 @@ class helper {
$userpicture->size = 0; // Size f2.
$data->profileimageurlsmall = $userpicture->get_url($PAGE)->out(false);
// Store the message if we have it.
+ $data->lastmessage = null;
+ $data->messageid = null;
if (isset($contact->smallmessage)) {
$data->lastmessage = $contact->smallmessage;
- } else {
- $data->lastmessage = null;
+ if (isset($contact->messageid)) {
+ $data->messageid = $contact->messageid;
+ }
}
// Check if the user is online.
$data->isonline = $userfields->lastaccess >= $time;
diff --git a/message/classes/output/messagearea/contact.php b/message/classes/output/messagearea/contact.php
index dd64793bbfc..8b2cefb59f7 100644
--- a/message/classes/output/messagearea/contact.php
+++ b/message/classes/output/messagearea/contact.php
@@ -61,6 +61,7 @@ class contact implements templatable, renderable {
$contact->fullname = $this->contact->fullname;
$contact->profileimageurl = $this->contact->profileimageurl;
$contact->profileimageurlsmall = $this->contact->profileimageurlsmall;
+ $contact->messageid = $this->contact->messageid;
if ($this->contact->lastmessage) {
$contact->lastmessage = shorten_text($this->contact->lastmessage, self::MAX_MSG_LENGTH);
} else {
diff --git a/message/classes/output/messagearea/message_search_results.php b/message/classes/output/messagearea/message_search_results.php
new file mode 100644
index 00000000000..1dda2ab1699
--- /dev/null
+++ b/message/classes/output/messagearea/message_search_results.php
@@ -0,0 +1,70 @@
+.
+
+/**
+ * Contains class used to display message search results.
+ *
+ * @package core_message
+ * @copyright 2016 Mark Nelson
+
diff --git a/message/templates/message_area_contacts_area.mustache b/message/templates/message_area_contacts_area.mustache
index d6840c01a11..e3badbf2cec 100644
--- a/message/templates/message_area_contacts_area.mustache
+++ b/message/templates/message_area_contacts_area.mustache
@@ -1,14 +1,19 @@
-
+
+
{{> core_message/message_area_contacts }}
-{{! Hidden div to load the other tabs items in via JS when appropriate. }}
+{{! Hidden divs to load the other tab and search panels via JS when appropriate. }}
+
{{#pix}}t/message, moodle{{/pix}}
diff --git a/message/templates/message_area_people_search_results.mustache b/message/templates/message_area_people_search_results.mustache
new file mode 100644
index 00000000000..6ad2ad7eb02
--- /dev/null
+++ b/message/templates/message_area_people_search_results.mustache
@@ -0,0 +1,19 @@
+{{#hascontacts}}
+ {{#contacts}}
+ {{> core_message/message_area_contact }}
+ {{/contacts}}
+{{/hascontacts}}
+{{#hascourses}}
+ {{#str}}courses{{/str}}
+ {{#courses}}
+
+ {{fullname}}
+
+ {{/courses}}
+{{/hascourses}}
+{{#hasnoncontacts}}
+ {{#str}}noncontacts, message{{/str}}
+ {{#noncontacts}}
+ {{> core_message/message_area_contact }}
+ {{/noncontacts}}
+{{/hasnoncontacts}}
\ No newline at end of file
diff --git a/theme/bootstrapbase/less/moodle/message.less b/theme/bootstrapbase/less/moodle/message.less
index 218dbdae9fa..db48e588a1b 100644
--- a/theme/bootstrapbase/less/moodle/message.less
+++ b/theme/bootstrapbase/less/moodle/message.less
@@ -51,7 +51,18 @@
border-right: 1px solid #e3e3e3;
height: 600px;
- .searcharea {
+ &.searchfilter {
+
+ .searchtextarea {
+ height: 80px;
+ }
+
+ .searcharea {
+ height: 470px;
+ }
+ }
+
+ .searchtextarea {
padding: 5px;
text-align: center;
height: 50px;
@@ -85,6 +96,42 @@
transition: background-color linear 0.2s;
}
}
+
+ .searchfilterarea {
+ line-height: 20px;
+
+ .searchfilter {
+ float: left;
+ }
+
+ .searchfilterdelete {
+ float: left;
+ margin-left: 5px;
+ cursor: pointer;
+ }
+ }
+ }
+
+ .searcharea {
+
+ .heading {
+ text-align: center;
+ border-top: 1px solid black;
+ border-bottom: 1px solid black;
+ font-size: 14px;
+ font-weight: bold;
+ }
+
+ .course {
+ text-align: center;
+
+ &:hover {
+ background-color: #4f94cd;
+ color: #fff;
+ border: none;
+ cursor: pointer;
+ }
+ }
}
.contacts {
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 9663330a7c9..c50ea376a8c 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -5795,7 +5795,13 @@ a.ygtvspacer:hover {
border-right: 1px solid #e3e3e3;
height: 600px;
}
-.messaging-area-container .messaging-area .contacts-area .searcharea {
+.messaging-area-container .messaging-area .contacts-area.searchfilter .searchtextarea {
+ height: 80px;
+}
+.messaging-area-container .messaging-area .contacts-area.searchfilter .searcharea {
+ height: 470px;
+}
+.messaging-area-container .messaging-area .contacts-area .searchtextarea {
padding: 5px;
text-align: center;
height: 50px;
@@ -5804,7 +5810,7 @@ a.ygtvspacer:hover {
background-color: #fff;
transition: background-color linear 0.2s;
}
-.messaging-area-container .messaging-area .contacts-area .searcharea input {
+.messaging-area-container .messaging-area .contacts-area .searchtextarea input {
background-color: #f5f5f5;
border: 0;
width: 90%;
@@ -5813,19 +5819,46 @@ a.ygtvspacer:hover {
box-shadow: none;
transition: background-color linear 0.2s;
}
-.messaging-area-container .messaging-area .contacts-area .searcharea input:focus {
+.messaging-area-container .messaging-area .contacts-area .searchtextarea input:focus {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
-.messaging-area-container .messaging-area .contacts-area .searcharea.searching {
+.messaging-area-container .messaging-area .contacts-area .searchtextarea.searching {
background-color: #f5f5f5;
transition: background-color linear 0.2s;
}
-.messaging-area-container .messaging-area .contacts-area .searcharea.searching input {
+.messaging-area-container .messaging-area .contacts-area .searchtextarea.searching input {
background-color: #fff;
transition: background-color linear 0.2s;
}
+.messaging-area-container .messaging-area .contacts-area .searchtextarea .searchfilterarea {
+ line-height: 20px;
+}
+.messaging-area-container .messaging-area .contacts-area .searchtextarea .searchfilterarea .searchfilter {
+ float: left;
+}
+.messaging-area-container .messaging-area .contacts-area .searchtextarea .searchfilterarea .searchfilterdelete {
+ float: left;
+ margin-left: 5px;
+ cursor: pointer;
+}
+.messaging-area-container .messaging-area .contacts-area .searcharea .heading {
+ text-align: center;
+ border-top: 1px solid black;
+ border-bottom: 1px solid black;
+ font-size: 14px;
+ font-weight: bold;
+}
+.messaging-area-container .messaging-area .contacts-area .searcharea .course {
+ text-align: center;
+}
+.messaging-area-container .messaging-area .contacts-area .searcharea .course:hover {
+ background-color: #4f94cd;
+ color: #fff;
+ border: none;
+ cursor: pointer;
+}
.messaging-area-container .messaging-area .contacts-area .contacts {
height: 500px;
overflow-y: scroll;