Changeset 7938 for branches/2.5/prototype
- Timestamp:
- 03/01/13 17:03:42 (11 years ago)
- Location:
- branches/2.5/prototype
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.5/prototype/config/calendarSignature.ini
r6996 r7938 33 33 backgroundColor = background_color 34 34 borderColor = border_color 35 hidden = hidden -
branches/2.5/prototype/modules/calendar/js/calendar.codecs.js
r7798 r7938 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 if( !!Calendar.currentView[ signature.calendar.id ]) 78 { 79 if(signature.hidden == true ) 80 Calendar.currentView[ signature.calendar.id ].hidden = true; 81 else 82 Calendar.currentView[ signature.calendar.id ].hidden = false; 83 } 84 77 85 var view = Calendar.currentView[ signature.calendar.id ]; 86 87 78 88 callback( view && !view.hidden ? view : [] ); 79 89 }, … … 201 211 202 212 Calendar.rerenderView(true); 203 if(updateActivity) 213 if(updateActivity){ 214 215 DataLayer.remove('taskToActivity', false); 204 216 refreshTaskActivity(); 217 } 218 205 219 }); 206 220 } -
branches/2.5/prototype/modules/calendar/js/helpers.js
r7864 r7938 2102 2102 2103 2103 }); 2104 2105 2104 2105 $('ul.list-calendars .cal-list-options-btn').on('click',function(){doMenu();}); 2106 2106 2107 2107 … … 2275 2275 show_modal_search_shared(); 2276 2276 }); 2277 2278 2279 //TODO Implementar ocultar agendas. 2277 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' ); -
branches/2.5/prototype/modules/calendar/templates/calendar_list.ejs
r7097 r7938 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.