- Timestamp:
- 02/28/13 18:05:55 (11 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoCalendar/setup/setup.inc.php
r7645 r7928 13 13 $setup_info['expressoCalendar']['title'] = 'Expresso Calendar'; 14 14 /* Ao incrementar versão, não esquecer de declarar função do tables_update.inc.php*/ 15 $setup_info['expressoCalendar']['version'] = '1.01 1';15 $setup_info['expressoCalendar']['version'] = '1.012'; 16 16 $setup_info['expressoCalendar']['app_order'] = 10; 17 17 -
trunk/expressoCalendar/setup/tables_current.inc.php
r7916 r7928 313 313 'background_color' => array( 'type' => 'varchar','precision' => '6', 'nullable' => True), 314 314 'border_color' => array( 'type' => 'varchar','precision' => '6', 'nullable' => True), 315 'type' => array('type' => 'int', 'precision' => '2' ,'nullable' => false, 'default' => 0) 315 'type' => array('type' => 'int', 'precision' => '2' ,'nullable' => false, 'default' => 0), 316 'hidden' => array('type' => 'int', 'precision' => '2' ,'nullable' => false, 'default' => 0) 316 317 ), 317 318 'pk' => array('id'), -
trunk/expressoCalendar/setup/tables_update.inc.php
r7579 r7928 234 234 return $GLOBALS['setup_info']['expressoCalendar']['currentver']; 235 235 }; 236 237 $test[] = '1.011'; 238 function expressoCalendar_upgrade1_011() { 239 $oProc = $GLOBALS['phpgw_setup']->oProc; 240 241 $oProc->query("ALTER TABLE calendar_signature ADD COLUMN hidden integer"); 242 243 $GLOBALS['setup_info']['expressoCalendar']['currentver'] = '1.012'; 244 return $GLOBALS['setup_info']['expressoCalendar']['currentver']; 245 }; 236 246 237 247 ?> -
trunk/prototype/modules/calendar/js/calendar.codecs.js
r7898 r7928 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} ); 76 76 } 77 78 if( !!Calendar.currentView[ signature.calendar.id ]) 79 { 80 if(signature.hidden == true ) 81 Calendar.currentView[ signature.calendar.id ].hidden = true; 82 else 83 Calendar.currentView[ signature.calendar.id ].hidden = false; 84 } 85 77 86 var view = Calendar.currentView[ signature.calendar.id ]; 87 88 78 89 callback( view && !view.hidden ? view : [] ); 79 90 }, -
trunk/prototype/modules/calendar/js/helpers.js
r7857 r7928 2102 2102 2103 2103 }); 2104 2105 $('ul.list-calendars .cal-list-options-btn').on('click',function(){doMenu();}); 2104 2105 $('ul.list-calendars .cal-list-options-btn').on('click',function(){doMenu();}); 2106 2106 2107 2107 … … 2276 2276 }); 2277 2277 2278 2279 //TODO Implementar ocultar agendas. 2278 2280 2279 meu_container.find('.title-signed-calendars').click(function(evt){ 2281 2280 var status = $(this).parent().find('.status-list-shared'); … … 2295 2294 var checkBox = $(this); 2296 2295 if(!!Calendar.currentView[ checkBox.val() ]){ 2296 2297 $.each(Calendar.signatures , function(index, value) { 2298 2299 if(value.calendar.id == checkBox.val()) 2300 { 2301 value.hidden = checkBox.is(':checked') ? 0 : 1 ; 2302 2303 DataLayer.put('calendarSignature', {id: ''+value.id , hidden: value.hidden } ); 2304 DataLayer.commit(); 2305 } 2306 2307 }); 2308 2297 2309 Calendar.currentView[ checkBox.val() ].hidden = !checkBox.is(':checked'); 2298 2310 $('#calendar').fullCalendar( 'refetchEvents' ); -
trunk/prototype/modules/calendar/templates/calendar_list.ejs
r7097 r7928 22 22 23 23 <div> 24 <input class="calendar-view" type="checkbox" name="" value="<%= signatures['taskGroup'][i].calendar.id %>" checked="checked"/>24 <input class="calendar-view" type="checkbox" name="" value="<%= signatures['taskGroup'][i].calendar.id %>" <% if( signatures['taskGroup'][i].hidden != '1' ) { %> checked="checked" <% } %> /> 25 25 <label><%= signatures['taskGroup'][i].calendar.name %></label> 26 26 … … 57 57 58 58 <div> 59 <input class="calendar-view" type="checkbox" name="" value="<%= signatures['calendar'][i].calendar.id %>" checked="checked"/>59 <input class="calendar-view" type="checkbox" name="" value="<%= signatures['calendar'][i].calendar.id %>" <% if( signatures['calendar'][i].hidden != '1') { %> checked="checked" <% } %> /> 60 60 <label><%= signatures['calendar'][i].calendar.name %></label> 61 61 … … 91 91 <li class="list-calendars-item list-calendars-item-<%= signatures['sharedCalendar'][i].calendar.id %>" title="<%= signatures['sharedCalendar'][i].calendar.name %>"> 92 92 <div> 93 <input class="calendar-view" type="checkbox" name="" value="<%= signatures['sharedCalendar'][i].calendar.id %>" checked="checked"/>93 <input class="calendar-view" type="checkbox" name="" value="<%= signatures['sharedCalendar'][i].calendar.id %>" <% if( signatures['sharedCalendar'][i].hidden != '1') { %> checked="checked" <% } %> /> 94 94 <label><%= signatures['sharedCalendar'][i].calendar.name %></label> 95 95 </div>
Note: See TracChangeset
for help on using the changeset viewer.