Browse Source

[svn r18785] logic changes - allow to hide user list - (partial FS#3703)

Isaac Flores 16 years ago
parent
commit
6286f36745
3 changed files with 13 additions and 9 deletions
  1. 3 3
      main/messages/new_message.php
  2. 6 3
      main/social/index.php
  3. 4 3
      main/social/select_options.php

+ 3 - 3
main/messages/new_message.php

@@ -1,4 +1,4 @@
-<?php // $Id: new_message.php 18698 2009-02-25 18:13:46Z cvargas1 $
+<?php // $Id: new_message.php 18785 2009-03-03 23:09:24Z iflorespaz $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -153,13 +153,13 @@ function manage_form ($default, $select_from_user_list = null) {
 		$form = new FormValidator('compose_message');
 	}
 	if (isset($select_from_user_list)) {
-		$form->add_textfield('id_text_name',get_lang('SendMessageTo'),true,array('size' => 40,'id'=>'id_text_name','onclick'=>'send_request_and_search()'));
+		$form->add_textfield('id_text_name',get_lang('SendMessageTo'),true,array('size' => 40,'id'=>'id_text_name','onclick'=>'send_request_and_search()','onmouseout'=>'list_search_hide ()'));
 		$form->addRule('id_text_name', get_lang('ThisFieldIsRequired'), 'required');
 		$form->addElement('html','<div id="id_div_search" class="message-search">&nbsp;</div>');
 		$form->addElement('hidden','user_list',0,array('id'=>'user_list'));
 	} else {
 		if ($default['user_list']==0) {
-			$form->add_textfield('id_text_name',get_lang('SendMessageTo'),true,array('size' => 40,'id'=>'id_text_name','onclick'=>'send_request_and_search()'));
+			$form->add_textfield('id_text_name',get_lang('SendMessageTo'),true,array('size' => 40,'id'=>'id_text_name','onclick'=>'send_request_and_search()','onmouseout'=>'list_search_hide ()'));
 			$form->addRule('id_text_name', get_lang('ThisFieldIsRequired'), 'required');
 			$form->addElement('html','<div id="id_div_search" class="message-search">&nbsp;</div>');
 		}

+ 6 - 3
main/social/index.php

@@ -283,11 +283,12 @@ function send_request_and_search() {
 				data: "search="+name,
 				success: function(datos){
 				$("#id_div_search").html(datos)
-				$("#id_search_name").bind("click", function(){
+				$("#id_search_name").bind("click", function() {
 					name_option=$("select#id_search_name option:selected").text();
 					code_option=$("select#id_search_name option:selected").val();
 					 $("#user_list").attr("value", code_option);
 					 $("#id_text_name").attr("value", name_option);
+					 
 					 $("#id_div_search").html("");
 					 cont++;
 				 });
@@ -356,9 +357,11 @@ function delete_one_message_outbox (num_id) {
 		});
 }
 function list_search_hide () {
-	$("div#id_div_search").html("");	
+		setTimeout("hide_search_list()",1500);
+}
+function hide_search_list () {
+	$("div#id_div_search").html("");
 }
-
 </script>';
 $htmlHeadXtra[] = '<link rel="stylesheet" href="../inc/lib/javascript/jquery.tabs.css" type="text/css" media="print, projection, screen">';
 $htmlHeadXtra[] = '

+ 4 - 3
main/social/select_options.php

@@ -6,11 +6,12 @@ $track_online_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ONLI
 $tbl_my_user = Database :: get_main_table(TABLE_MAIN_USER);
 $tbl_my_user_friend = Database :: get_main_table(TABLE_MAIN_USER_FRIEND);
 $search=$_POST['search'];
-$html_form='<select id="id_search_name" name="id_search_name" size="8"" class="message-select-box">';
+$date_inter=date('Y-m-d H:i:s',time()-120); 
+$html_form='<select id="id_search_name" name="id_search_name" size="8"" class="message-select-box" onmouseout="list_search_hide()">';
 $sql='SELECT DISTINCT u.user_id as id,concat(u.firstname," ",u.lastname," ","( ",u.email," )") as name
  FROM '.$tbl_my_user.' u INNER JOIN '.$track_online_table.' t ON u.user_id=t.login_user_id
- WHERE u.firstname like "%'.$search.'%" OR u.lastname like "%'.$search.'%"
- OR CONCAT(u.firstname," ",u.lastname) like CONCAT("%","'.$search.'","%");';
+ WHERE t.login_date >'."'".$date_inter."'".' AND (u.firstname like "%'.$search.'%" OR u.lastname like "%'.$search.'%"
+ OR CONCAT(u.firstname," ",u.lastname) like CONCAT("%","'.$search.'","%"))';
 if (api_get_setting('allow_social_tool')=='true') {
 	//$sql.=' INNER JOIN '.$tbl_my_user_friend.' uf ON uf.friend_user_id=u.user_id ';
 }