Changeset 1122

Timestamp:

07/14/09 17:24:01 (15 years ago)

Author:

rafaelraymundo

Message:

Ticket #576 - Configurar auto busca na Configuracao do servidor da agenda de eventos.

Location:

trunk/calendar

Files:

• inc/class.uicalendar.inc.php (modified) (4 diffs)
• setup/phpgw_pt-br.lang (modified) (previous)
• templates/celepar/config.tpl (modified) (1 diff)
• templates/celepar/js/edit_exmail.js (modified) (3 diffs)

trunk/calendar/inc/class.uicalendar.inc.php

@@ -4613 +4613 @@
                                                                 //Caso o minimo de caracteres para a busca nao tenha sido preenchido ele sera por padrao = 3
                                                                 if(!$GLOBALS['phpgw_info']['server']['min_num_characters']){
-                                                                        $GLOBALS['phpgw_info']['server']['min_num_characters'] = 3;
+                                                                        $GLOBALS['phpgw_info']['server']['min_num_characters'] = 0;
                                                                 }
 
@@ -4668 +4668 @@
                                                                                         "<script type='text/javascript'>var DEFAULT_URL = '".$module_name."/controller.php?action=';</script> ".                                                                                        
                                                                                         "<script type='text/javascript'>" .
-                                                                                        "var timeout_get_available_users = setTimeout('get_available_users(\"".$module_name."\",\'".$user_context."\',\'".($recursive ? "" : "search")."\')',1000);". 
+                                                                                        "var timeout_get_available_users = setTimeout('get_available_users(\"".$module_name."\",\'".$GLOBALS['phpgw_info']['server']['auto_search']."\',\'".$user_context."\',\'".($recursive ? "" : "search")."\')',1000);". 
                                                                                         "</script> "
                                                                 );
@@ -4731 +4731 @@
                                         // just get the first one see above!!!
                                         list($key,$alarm) = @each($event['alarm']);
+
+
+                                        //if abaixo trata o caso de um evento repetido nao ter uma data final;
+                                        //se isto acontecer, nao havera alarmes definidos;
+                                        //$alarm['time'] recebe $start para $days, $hours e $min ficarem iguais a 0
+                                        if(!$alarm['time']) {
+                                                $alarm['time'] = $start;
+                                        }
+
                                         $diff  = $start - $alarm['time'];
                                         $days  = (int)($diff / (24*3600));
                                         $hours = (int)(($diff - ($days * 24 * 3600))/3600);
                                         $min   = (int)(($diff - ($days * 24 * 3600) - ($hours * 3600))/60);
+
+                                        if(@isset($_POST['edit_type']) && $_POST['edit_type'] == 'single') {
+                                                $days = $diff;
+                                        }
                                 }
 
@@ -4808 +4821 @@
                         }
                         $var['recure_day'] = Array(
-                                'field' => lang('Repeat Day').'<br>'.lang('(for weekly)'),
+                                'field' => lang('Repeat Day').'<br>'.lang('(required for weekly recursivity)'),
                                 'data'  => $boxes
                         );

trunk/calendar/templates/celepar/config.tpl

@@ -73 +73 @@
    <td>{lang_Minimum_number_of_characters_to_start_the_search_for_participants}</td>
    <td>
-      <input type="text" id="minNum" value="{value_min_num_characters}" name="newsettings[min_num_characters]" size=2 maxlength=1/>
+      <input type="text" id="minNum" value="{value_min_num_characters}" name="newsettings[min_num_characters]" size=2 maxlength=2/>
    </td>
+   </tr>
+
+   <tr bgcolor="{row_on}">
+     <td>{lang_Do_you_wish_enable_autosearch?}</td>
+     <td>
+       <select name="newsettings[auto_search]">
+        <option value=""{selected_auto_search_False}>{lang_No}</option>
+        <option value="True"{selected_auto_search_True}>{lang_Yes}</option>
+       </select>
+     </td>
    </tr>
 <!-- END body -->

trunk/calendar/templates/celepar/js/edit_exmail.js

@@ -20 +20 @@
 var is_firefox_0 = agt.indexOf('firefox/1.0') != -1 && agt.indexOf('firefox/0.') ? true : false;
  
-function get_available_users(filter)
+function get_available_users(filter,autoSearch)
 //function get_available_users(path,context,type)
 {
+        text= document.getElementById("cal_input_searchUser");
+        
+        if((autoSearch == 'True') && (!text.value)){
+                var search = "   ";
+                get_available_users(search);
+        }
         var handler_get_available_users = function(data)
         {       
@@ -77 +83 @@
                 var oWait = document.getElementById("cal_span_searching");
                 var oText = document.getElementById(id);
-                        
                 if (oText.value.length < numMin) {
                                 oWait.innerHTML = '';
@@ -96 +101 @@
                 }
 }
+        function autoOptionFinder(){
+                var oWait = document.getElementById("cal_span_searching");
+                var oText = document.getElementById(id);
+                var select_available_users_tmp = document.getElementById('user_list_in');
+                for(var i = 0;i < select_available_users_tmp.options.length; i++)
+                        select_available_users_tmp.options[i--] = null;
+                var RegExp_name = new RegExp("\\b   ", "i");
+                oWait.innerHTML = '&nbsp;';
+        }
 
 function add_user()