Changeset 6359

Timestamp:

05/31/12 11:06:40 (12 years ago)

Author:

acoutinho

Message:

Ticket #2818 - Inconsistência na remoção de eventos na listagem de eventos

Location:

trunk/prototype/modules/calendar

Files:

• js/calendar.codecs.js (modified) (2 diffs)
• js/helpers.js (modified) (2 diffs)
• templates/event_list.ejs (modified) (1 diff)

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

@@ -212 +212 @@
 
     rerenderView: function(force){
-                //TODO - Remover if quando centralizar o objeto User que contem as informações do usuário logado em um local acessível a todos módulos
-                if(User.moduleName == "expressoCalendar"){
-                        if(force){
-                                delete Calendar.currentViewKey;
-                                $('#calendar').fullCalendar( 'refetchEvents' );
-                                Refresh.init()
-                        }
-
-                        var calendarNotSelected = getSelectedCalendars( true );
-                        for(var i = 0; i < calendarNotSelected.length; i++)
-                                if(!!Calendar.currentView[ calendarNotSelected[i] ])
-                                Calendar.currentView[ calendarNotSelected[i] ].hidden = true;
-
-                        $('#calendar').fullCalendar( 'refetchEvents' ); 
-
-                        contentMenu();
-                }
+        //TODO - Remover if quando centralizar o objeto User que contem as informações do usuário logado em um local acessível a todos módulos
+        if(User.moduleName == "expressoCalendar"){
+            if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') == 0){
+                if(force){
+                    delete Calendar.currentViewKey;
+                    $('#calendar').fullCalendar( 'refetchEvents' );
+
+                    //Recarrega os alarmes de eventos    
+                    Alarms.load();
+
+                    Refresh.init();
+                }
+
+                var calendarNotSelected = getSelectedCalendars( true );
+                for(var i = 0; i < calendarNotSelected.length; i++)
+                        if(!!Calendar.currentView[ calendarNotSelected[i] ])
+                        Calendar.currentView[ calendarNotSelected[i] ].hidden = true;
+
+                $('#calendar').fullCalendar( 'refetchEvents' ); 
+
+                contentMenu();
+            }else if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') != 0)
+                pageselectCallback($('.events-list-win.active [name=keyword]').val(), 0);
+        }
     }
 }
@@ -313 +320 @@
     if( status === 'serverclient' ){
         DataLayer.commit( false, false, function(){     
-            if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') == 0){
-                Calendar.rerenderView(true);
-            }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();
+            Calendar.rerenderView(true);
         });
     }

trunk/prototype/modules/calendar/js/helpers.js

@@ -1913 +1913 @@
             if(clicked == 'Sim'){
 
-                var schedulable = DataLayer.get('schedulable', '88');
-                
-                schedulable.calendar = idCalendar;
-                
+                var schedulable = DataLayer.get('schedulable', ''+eventId);
+                schedulable.calendar = ''+idCalendar;
                 var schudableDecode = DataLayer.encode( "schedulable:preview", schedulable);
                 var me = schudableDecode.me.user ? schudableDecode.me.user.id : schudableDecode.me.id;
@@ -2486 +2484 @@
                 .find('.button.delete').click(function(){
                     var eventId = $(this).siblings('[name="eventid"]').val();
-                    $.Zebra_Dialog('Tem certeza que deseja excluir o evento?', {
-                        'type':     'question',
-                        'overlay_opacity': '0.5',
-                        'buttons':  ['Sim', 'Não'],
-                        'onClose':  function(clicked) {
-                            if(clicked == 'Sim'){
-                                DataLayer.remove('schedulable', eventId);
-                            }
-                        }
-                    });
+                    var calendarId = $(this).siblings('[name="calendarid"]').val();
+
+                    remove_event(eventId, calendarId);
                 })
                 .end().find('.button.edit').click(function(){                           

trunk/prototype/modules/calendar/templates/event_list.ejs

@@ -167 +167 @@
                                                         <div class="menu-container footer-container">
                                                                 <input name="eventid" type="hidden" value="<%=_event.id%>"></input>
+                                                                <input name="calendarid" type="hidden" value="<%=_event.calendar%>"></input>
                                                                 <a class="button delete" href="#">Excluir</a>
                                                                 <a class="button edit" href="#">Editar</a>