Changeset 7938 for branches/2.5

Timestamp:

03/01/13 17:03:42 (11 years ago)

Author:

douglas

Message:

Ticket #3363 - Manter preferencia do checkbox de visualizacao das agendas no ExpressoCalendar?

Location:

branches/2.5

Files:

• expressoCalendar/setup/setup.inc.php (modified) (1 diff)
• expressoCalendar/setup/tables_current.inc.php (modified) (1 diff)
• expressoCalendar/setup/tables_update.inc.php (modified) (1 diff)
• prototype/config/calendarSignature.ini (modified) (1 diff)
• prototype/modules/calendar/js/calendar.codecs.js (modified) (2 diffs)
• prototype/modules/calendar/js/helpers.js (modified) (3 diffs)
• prototype/modules/calendar/templates/calendar_list.ejs (modified) (3 diffs)

branches/2.5/expressoCalendar/setup/setup.inc.php

@@ -13 +13 @@
         $setup_info['expressoCalendar']['title']        = 'Expresso Calendar';
         /* Ao incrementar versão, não esquecer de declarar função do tables_update.inc.php*/
-        $setup_info['expressoCalendar']['version']      = '1.011';
+        $setup_info['expressoCalendar']['version']      = '1.012';
         $setup_info['expressoCalendar']['app_order']    = 10;
 

branches/2.5/expressoCalendar/setup/tables_current.inc.php

@@ -313 +313 @@
                 'background_color' => array(  'type' => 'varchar','precision' => '6', 'nullable' => True),
                 'border_color' => array(  'type' => 'varchar','precision' => '6', 'nullable' => True),
-                'type' => array('type' => 'int', 'precision' => '2' ,'nullable' => false, 'default' => 0)
+                'type' => array('type' => 'int', 'precision' => '2' ,'nullable' => false, 'default' => 0), 
+                'hidden' => array('type' => 'int', 'precision' => '2' ,'nullable' => false, 'default' => 0) 
             ),
             'pk' => array('id'),

branches/2.5/expressoCalendar/setup/tables_update.inc.php

@@ -234 +234 @@
         return $GLOBALS['setup_info']['expressoCalendar']['currentver'];
     };
+ 
+    $test[] = '1.011'; 
+    function expressoCalendar_upgrade1_011() { 
+        $oProc = $GLOBALS['phpgw_setup']->oProc; 
+ 
+        $oProc->query("ALTER TABLE calendar_signature ADD COLUMN hidden integer"); 
+ 
+        $GLOBALS['setup_info']['expressoCalendar']['currentver'] = '1.012'; 
+        return $GLOBALS['setup_info']['expressoCalendar']['currentver']; 
+    }; 
         
 ?>

branches/2.5/prototype/config/calendarSignature.ini

@@ -33 +33 @@
 backgroundColor = background_color
 borderColor = border_color
+hidden = hidden

branches/2.5/prototype/modules/calendar/js/calendar.codecs.js

@@ -75 +75 @@
                         Calendar.currentView =  DataLayer.encode('schedulable:calendar', DataLayer.dispatch('modules/calendar/schedules', DataLayer.criteria('schedulable:calendar', {start: start,end: end}))  );   //DataLayer.get( 'schedulable:calendar', {start: start,end: end} );
                     }
+             if( !!Calendar.currentView[ signature.calendar.id ]) 
+            { 
+                if(signature.hidden == true  ) 
+                    Calendar.currentView[ signature.calendar.id ].hidden = true; 
+                else 
+                    Calendar.currentView[ signature.calendar.id ].hidden = false; 
+            } 
+ 
                     var view = Calendar.currentView[ signature.calendar.id ];
+ 
+ 
                     callback( view && !view.hidden ? view : [] );
                 },
@@ -201 +211 @@
 
             Calendar.rerenderView(true);
-            if(updateActivity)
+            if(updateActivity){ 
+ 
+                DataLayer.remove('taskToActivity', false); 
                 refreshTaskActivity();
+            } 
+ 
         });
     }

branches/2.5/prototype/modules/calendar/js/helpers.js

@@ -2102 +2102 @@
                 
         });
-        
-        $('ul.list-calendars .cal-list-options-btn').on('click',function(){doMenu();});         
+ 
+     $('ul.list-calendars .cal-list-options-btn').on('click',function(){doMenu();});         
         
 
@@ -2275 +2275 @@
         show_modal_search_shared();
     });
-                
-                
-    //TODO Implementar ocultar agendas.
+        
+        
     meu_container.find('.title-signed-calendars').click(function(evt){
         var status = $(this).parent().find('.status-list-shared');
@@ -2295 +2294 @@
             var checkBox = $(this);
             if(!!Calendar.currentView[ checkBox.val() ]){
+ 
+        $.each(Calendar.signatures , function(index, value) { 
+ 
+            if(value.calendar.id == checkBox.val()) 
+            { 
+                value.hidden = checkBox.is(':checked') ? 0 : 1  ; 
+ 
+                DataLayer.put('calendarSignature', {id: ''+value.id , hidden: value.hidden }  ); 
+                DataLayer.commit(); 
+            } 
+ 
+        }); 
+ 
                 Calendar.currentView[ checkBox.val() ].hidden = !checkBox.is(':checked');
                 $('#calendar').fullCalendar( 'refetchEvents' );

branches/2.5/prototype/modules/calendar/templates/calendar_list.ejs

@@ -22 +22 @@
 
                 <div>
-                    <input class="calendar-view" type="checkbox" name="" value="<%= signatures['taskGroup'][i].calendar.id %>" checked="checked"/>
+                    <input class="calendar-view" type="checkbox" name="" value="<%= signatures['taskGroup'][i].calendar.id %>" <% if( signatures['taskGroup'][i].hidden != '1' ) { %> checked="checked" <% } %> />
                     <label><%= signatures['taskGroup'][i].calendar.name %></label>
 
@@ -57 +57 @@
 
                 <div>
-                    <input class="calendar-view" type="checkbox" name="" value="<%= signatures['calendar'][i].calendar.id %>" checked="checked"/>
+                    <input class="calendar-view" type="checkbox" name="" value="<%= signatures['calendar'][i].calendar.id %>" <% if( signatures['calendar'][i].hidden != '1') { %> checked="checked" <% } %> />
                     <label><%= signatures['calendar'][i].calendar.name %></label>
 
@@ -91 +91 @@
                 <li class="list-calendars-item list-calendars-item-<%= signatures['sharedCalendar'][i].calendar.id %>" title="<%= signatures['sharedCalendar'][i].calendar.name %>">
                  <div>
-                            <input class="calendar-view" type="checkbox" name="" value="<%= signatures['sharedCalendar'][i].calendar.id %>" checked="checked"/>
+                            <input class="calendar-view" type="checkbox" name="" value="<%= signatures['sharedCalendar'][i].calendar.id %>" <% if( signatures['sharedCalendar'][i].hidden  != '1') { %> checked="checked" <% } %> />
                             <label><%= signatures['sharedCalendar'][i].calendar.name %></label>
                          </div>