Changeset 5409 for trunk/expressoMail1_2

Timestamp:

01/21/12 00:18:54 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Limpeza, melhorias e correcoes na camada javascript do novo modulo

Location:

trunk/expressoMail1_2

Files:

• inc/class.db_functions.inc.php (modified) (1 diff)
• index.php (modified) (1 diff)
• js/draw_api.js (modified) (1 diff)
• js/main.js (modified) (4 diffs)

trunk/expressoMail1_2/inc/class.db_functions.inc.php

@@ -410 +410 @@
                                         {
                                                 $return = false;
-                                                $output = unserialize($output);
-                                        
-                                                ob_start();
-                                                var_dump($output[0]);                                           
-                                                $l = ob_get_clean();
-                                                file_put_contents( "/tmp/acoutinho.log",  $l , FILE_APPEND);
-
-                                                
-                                                
+                                                $output = unserialize($output);                                                                         
                                                 foreach($output[0] as $key => &$value){
                                                 

trunk/expressoMail1_2/index.php

@@ -45 +45 @@
                                         <script type='text/javascript' src='../prototype/plugins/alphanumeric/jquery.alphanumeric.js'></script>
                                         <script type='text/javascript' src='../prototype/plugins/timepicker/localization/jquery-ui-timepicker-pt-BR.js'></script>
+                                        <script type='text/javascript' src='../prototype/modules/calendar/js/calendar.date.js'></script>
                                         <script type='text/javascript' src='../prototype/modules/calendar/js/helpers.js'></script>
                                         <script type='text/javascript' src='../prototype/modules/calendar/js/calendar.codecs.js'></script>
+                                        <script type='text/javascript' src='../prototype/modules/calendar/js/timezone.js'></script>
                                         <script type='text/javascript' src='../prototype/plugins/encoder/encoder.js'></script>
                                         <script type='text/javascript' src='../prototype/plugins/qtip/jquery.qtip-1.0.0-rc3.min.js'></script>

trunk/expressoMail1_2/js/draw_api.js

@@ -2609 +2609 @@
                         DataLayer.dispatchPath = "../prototype/";
                         var path = "../prototype/modules/calendar/";
+                        
+                        var startEvent = new Date();  
+                        if(startEvent.toString('mm') < 30) 
+                                startEvent.add({minutes: (30 - parseInt(startEvent.toString('mm')))}); 
+                        else 
+                                startEvent.add({hours: 1, minutes: '-'+startEvent.toString('mm')}); 
+                        var endEvent = function(date){ 
+                                if(!!User.preferences.defaultCalendar){ 
+                                        return  parseInt(date.getTime()) + 
+                                                (       !!Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration ?  
+                                                        (Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration * 60000) :
+                                                        (User.preferences.defaultDuration * 60000)
+                                                );
+                                }else 
+                                        return parseInt(date.getTime()) + (User.preferences.defaultDuration * 60000); 
+                        };       
                         eventDetails({ 
                                         summary : $("#subject_"+ID).text(),
                                         description : $("#body_" + ID).text(),
-                                        startTime: $.now(),
-                                        endTime:!!User.preferences.defaultCalendar ? Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration != "" ? ($.now() + Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration * 60000) : (User.preferences.defaultDuration * 60000)
-                                        : $.now() + (User.preferences.defaultDuration * 60000)
+                                        startTime: startEvent.getTime(),
+                                        endTime: endEvent(startEvent)
                         }, true, path);
                         

trunk/expressoMail1_2/js/main.js

@@ -3388 +3388 @@
 
 
-                                var createDialog = function(isCorrentEvent){
+                                var createDialog = function(isCorrentEvent, propaget){
 
                                         if(!(!!isCorrentEvent)){
@@ -3410 +3410 @@
                                                                      success: function(msg){
 
-                                                                            msg = connector.unserialize(msg) == "ok" ? "Importado com sucesso para " : "Ocorreu um erro ao importar o evento para a agenda ";
-
-                                                                            alert( msg + $("#select-agenda option:selected").text() );
-                                                                            
-                                                                            $( this ).dialog( "close" );
+                                                                            var alt = ( (msg = connector.unserialize(msg)) == "ok") ? "Importado com sucesso para " : "Ocorreu um erro ao importar o evento para a agenda ";
+                                                                            alert( alt + $("#select-agenda option:selected").text() );
                                                                     }
                                                                 });
-                                                        }
+                                                        
+                                                                                                                        $( this ).dialog( "close" );
+                                                                                                                }
                                                     }
                                                  });                                    
@@ -3435 +3434 @@
                                                            if ($(".ui-dialog-buttonpane").find(".ui-button:last").children().html() == 'Atualizar'){
                                                                
-                                                               var isOk = DataLayer.put('participant', { id: ( DataLayer.get('participant', ['AND', ['=', 'user', User.me.id], ['=', 'schedulable', isCorrentEvent[0].schedulable]] ) )[0].id, 
+                                                                                                                           
+                                                                                                                           
+                                                               var isOk = propaget || DataLayer.put('participant', { id: ( DataLayer.get('participant', ['AND', ['=', 'user', User.me.id], ['=', 'schedulable', isCorrentEvent[0].schedulable]] ) )[0].id, 
                                                                                                          status: $("#select-status option:selected").val() });
 
@@ -3465 +3466 @@
                                         }, createDialog);
                                 }else{
-                                        createDialog(false);
+                                        createDialog(true, true);
                                 }
                 }});