Changeset 5724

Timestamp:

03/14/12 17:52:13 (11 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Correcao no envio de alarmes javascript e email

Location:

trunk/prototype

Files:

• api/datalayer.js (modified) (1 diff)
• modules/calendar/alarms.php (modified) (1 diff)
• modules/calendar/interceptors/DBMapping.php (modified) (1 diff)
• modules/calendar/js/calendar.codecs.js (modified) (2 diffs)

trunk/prototype/api/datalayer.js

@@ -142 +142 @@
     templates: {},
     criterias: {},
-    tasks: [],
+    tasks: {},
 
     render: function( templateName, data, filter, formatter, force ){

trunk/prototype/modules/calendar/alarms.php

@@ -10 +10 @@
           array( '='  , 'sent' , '0') ,
           array( '='  , 'type' , ALARM_MAIL) ,  
-          array( '>=' , 'rangeStart' , gmdate('Y-m-d')) ,
-          array( '<=' , 'rangeEnd' , gmdate('Y-m-d'))
+          array( '>=' , 'rangeStart' ,(gmdate('U') - 300 ).'000') ,
+          array( '<=' , 'rangeEnd' , (gmdate('U') + 86400).'000')
           ); 
 

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -683 +683 @@
                       array( '='  , 'type' ,  ALARM_ALERT) ,  
                       array( '>=' , 'rangeStart' , $criteria['filter'][2]) ,
-                      array( '<=' , 'rangeEnd' , $criteria['filter'][2]) ); 
+                      array( '<=' , 'rangeEnd' , $criteria['filter'][2] + 86400000) ); 
 
             //Busca os Alarmes no Range

trunk/prototype/modules/calendar/js/calendar.codecs.js

@@ -201 +201 @@
         
         addAlarm: function( eventDay ){
-                DataLayer.task( parseInt(eventDay.sendTime) , function( timestamp ){
-                        DataLayer.render('templates/alarm.ejs',{event: eventDay}, function( html ){
+                if(!DataLayer.tasks[parseInt(eventDay.sendTime)]){
+                    DataLayer.task( parseInt(eventDay.sendTime) , function( timestamp ){
+                        DataLayer.render('templates/alarm.ejs',{event: eventDay}, function( html ){
                                 var dlgAlarm = jQuery('#div-alarm').html( html ).find('.alarm-event.active');
                                 dlgAlarm.dialog({resizable: false, modal:true, width:400, minHeight: 100,position: 'center', close:function(){$(this).dialog('destroy');$(this).dialog('open');}});
                         });
-                });
+                    });
+                }
         }
 }
@@ -268 +270 @@
                         }else if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') != 0)
                                 pageselectCallback($('.events-list-win.active [name=keyword]').val(), 0);
+                        //Recarrega os alarmes de eventos    
+                        Alarms.load();
                 });
     }