Changeset 5437 for trunk/prototype/modules/calendar/js

Timestamp:

01/27/12 15:37:21 (12 years ago)

Author:

cristiano

Message:

Ticket #2434 - Atualização modulo agenda e API

Location:

trunk/prototype/modules/calendar/js

Files:

• calendar.codecs.js (modified) (4 diffs)
• calendar.date.js (modified) (1 diff)
• helpers.js (modified) (3 diffs)

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

@@ -91 +91 @@
 
                 for( var i = 0; i < this.signatures.length; i++ ){
-                        this.signatureOf[ ( this.calendarOf[ this.calendarIds[i] = ( this.calendars[ this.calendars.length ] = this.signatures[i].calendar ).id ] = this.signatures[i].calendar ).id ] = this.signatures[i];
+                        this.signatureOf[ this.calendarIds[i] = ( this.calendars[ this.calendars.length ] = this.calendarOf[ this.signatures[i].id ] = this.signatures[i].calendar ).id ] = this.signatures[i];
                 }
 
@@ -272 +272 @@
                                 user: User.me.id,       
                                 calendar: {
-                                        id: Calendar.signatureOf[form.signature].calendar.id,
+                                        id: Calendar.calendarOf[form.signature].id,
                                         name: Encoder.htmlEncode(form.name),
                                         description: Encoder.htmlEncode(form.description),
@@ -351 +351 @@
                                         user: User.me.id,
                                         status: form.status,
-                                        id: form.attendee_organizer[0],
+                                        id: form.meId,
                                         isOrganizer: 0,
                                         alarms: typeof(form.alarmTime) != 'undefined' ? 
@@ -468 +468 @@
         var res = $.map(evtObj, function( form ){
     
-                    var tzId =  form.timezone || Calendar.calendarOf[form.calendar].timezone || User.preferences.timezone,
+                    var tzId =  form.timezone || Calendar.signatureOf[form.calendar].calendar.timezone || User.preferences.timezone,
 
                     formatString = ( typeof form.allDay !== "undefined" && !!form.allDay )? pref.dateFormat+" HH:mm" : pref.dateFormat + " " + pref.hourFormat,

trunk/prototype/modules/calendar/js/calendar.date.js

@@ -48 +48 @@
         dayOfWeek:
                 {
-                        'SAN': 0,
+                        'SUN': 0,
                         'MON': 1,
                         'TUE': 2,

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

@@ -153 +153 @@
                 
                 /*Seleciona a agenda padrão para criação de um evento*/
-                UI.dialogs.addEvent.find('option[value="'+User.preferences.defaultCalendar+'"]').attr('selected','selected').trigger('change');
+                UI.dialogs.addEvent.find('option[value="'+objEvent.calendar || User.preferences.defaultCalendar+'"]').attr('selected','selected').trigger('change');
                 
                 /*Adicionar alarms padrões, quando alterado a agenda do usuário*/               
@@ -1249 +1249 @@
 
 function mountCriteriaList(view, page_index, calerdars_selecteds){
-        var criteria = {deepness: 2, order: 'startTime'}
+        var rangeStart , rangeEnd;
         switch (view){
                 case 'basicDay':
                 case 'day':
-                        return {filter: ['AND', ['IN', 'calendar',  calerdars_selecteds], ['=', 'rangeEnd', new Date().add({days: page_index}).toString("yyyy-MM-dd")]], criteria: criteria}; 
+                        rangeStart = new Date().add({days: page_index}).toString("yyyy-MM-dd");
+                        rangeEnd = rangeStart;
+                         break;
                 case 'agendaWeek':
                 case 'week':
-                        var dateStart = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekDefault]); 
-                        var dateEnd = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekDefault]); 
-                        return {filter: ['AND', ['IN', 'calendar',  calerdars_selecteds], ['AND',['>=', 'rangeEnd', dateStart.add({days: (7 * page_index)}).toString("yyyy-MM-dd")], ['<=', 'rangeEnd', dateEnd.add({days: (7 * page_index)+7}).toString("yyyy-MM-dd")]]], criteria: criteria}; 
+                        var dateStart = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekStart]); 
+                        var dateEnd = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekStart]); 
+                        rangeStart = dateStart.add({days: (7 * page_index)}).toString("yyyy-MM-dd");
+                        rangeEnd = dateEnd.add({days: (7 * page_index)+7}).toString("yyyy-MM-dd");
+                        break;
                 case 'month':
                         var date = new Date().add({months: page_index}) 
-                        return {filter: ['AND',['IN', 'calendar',  calerdars_selecteds], ['AND',['>=', 'rangeEnd', date.moveToFirstDayOfMonth().toString("yyyy-MM-dd")], ['<=', 'rangeEnd', date.moveToLastDayOfMonth().toString("yyyy-MM-dd")]]], criteria: criteria}; 
+                        rangeStart = date.moveToFirstDayOfMonth().toString("yyyy-MM-dd");
+                        rangeEnd = date.moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                         break;
                 case 'year':
                         var dateStart = new Date().add({years: page_index});    
@@ -1269 +1275 @@
                         if(dateEnd.getMonth() != 11)
                                 dateEnd.moveToMonth(11) 
-                        return {filter: ['AND', ['IN', 'calendar',  calerdars_selecteds], ['AND',['>=', 'rangeEnd', dateStart.moveToFirstDayOfMonth().toString("yyyy-MM-dd")], ['<=', 'rangeEnd', dateEnd.moveToLastDayOfMonth().toString("yyyy-MM-dd")]]], criteria: criteria}; 
-        }
+                         rangeStart =    dateStart.moveToFirstDayOfMonth().toString("yyyy-MM-dd");
+                         rangeEnd = dateEnd.moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                           break;  
+                        }
+   return {filter: ['AND', ['>=', 'rangeStart', rangeStart], ['<=', 'rangeEnd', rangeEnd] , ['IN', 'calendar',  calerdars_selecteds]], criteria: {deepness: 2, order: 'startTime'}}; 
+
 }