Changeset 5376 for trunk/prototype/modules/calendar/js/calendar.codecs.js

Timestamp:

01/13/12 09:10:28 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Estabilizacao da nova api, correcoes de bug e melhorias na nova agenda

File:

• trunk/prototype/modules/calendar/js/calendar.codecs.js (modified) (7 diffs)

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

@@ -109 +109 @@
           for( var i = 0; i < this.signatures.length; i++ )
           {
-              this.signatureOf[ this.calendarIds[i] = this.signatures[i].calendar.id ] = this.signatures[i];
-              //this.signatureOf[ this.calendarIds[i] = this.signatures[i].calendar ] = this.signatures[i];
+              this.signatureOf[ this.calendarIds[i] = ( this.calendars[ this.calendars.length ] = this.signatures[i].calendar ).id ] = this.signatures[i];
           }
-
-          this.calendars = DataLayer.get( "calendar", {filter: ["IN", "id", this.calendarIds], criteria: {order: 'name'}} );
-
           delete Calendar.currentViewKey;
       }
@@ -179 +175 @@
 Calendar.load();
 
-DataLayer.poll( "schedulable" );
+//DataLayer.poll( "schedulable" );
 
 DataLayer.listen( "schedulable", function( status ){
@@ -320 +316 @@
         
         encoder: function (evtObjt){
+        
+                        if(notArray = typeof(evtObjt) == 'array' )
+                                evtObjt = [evtObjt];
+                        
                         var res = $.map(evtObjt, function( objEvent ){  
                                 var timezone = User.timezones[objEvent.schedulable.timezone];
@@ -377 +377 @@
 
                 var res = $.map(evtObj, function( form ){
-                        var event = {};
-                        event.id = form.idEvent;
-                        event.calendar = form.calendar; 
-                        var isCurrentParticipant = function(user, event){
-                                var participant =  DataLayer.get('participant', ['AND',['=', 'user', user],['=', 'schedulable', event]]);
-                                if(participant != '')
-                                        return participant[0].id;
-                                else
-                                        return false;
-                        };  
-                        
-                        event.participants = [];
-                        var participant = {};
-                        participant.user = User.me.id,
-                        participant.status = form.status;
-                        if((form.idEvent) && (id = isCurrentParticipant(participant.user, form.idEvent)))
-                                participant.id = id;
-                        
-                        if(typeof(form.alarmTime) != 'undefined'){
-                                participant.alarms = $.map( form.alarmTime || [], function( alarmTime, i ){
-
-                                        if( alarmTime === "" )
-                                                return( null );
-
-                                        if(form.alarmId[i] === "")
-                                                return { type: form.alarmType[i],unit: form.alarmUnit[i], time: form.alarmTime[i] };
-                                        else
-                                                return { type: form.alarmType[i], unit: form.alarmUnit[i], time: form.alarmTime[i], id: form.alarmId[i] };
-                                });     
+                        
+                        return {
+                                id: form.idEvent,
+                                calendar: form.calendar,
+                                participants : [{
+                                        user: User.me.id,
+                                        status: form.status,
+                                        id: form.attendee_organizer[0],
+                                        isOrganizer: 0,
+                                        alarms: typeof(form.alarmTime) != 'undefined' ? 
+                                                $.map( form.alarmTime || [], function( alarmTime, i ){
+
+                                                        if( alarmTime === "" )
+                                                                return( null );
+
+                                                        if(form.alarmId[i] === "")
+                                                                return { type: form.alarmType[i],unit: form.alarmUnit[i], time: form.alarmTime[i] };
+                                                        else
+                                                                return { type: form.alarmType[i], unit: form.alarmUnit[i], time: form.alarmTime[i], id: form.alarmId[i] };
+                                                }) : []
+                                        }]
                         }
-                        
-                        event.participants[0] = participant;
-                        
-                        return event;
                 });
-        return notArray ? res[0] : res;
+                
+                return notArray ? res[0] : res;
     },
 
@@ -460 +449 @@
                                 data.setTime(time);
                                 return dateFormat(setDateTimezone(data, timezone, existsTimezone, idCalendar), User.preferences.hourFormat.replace(/m/g,'M'))                   
-                        }       
-                        var temp = [];
-                        var tempAlarm = [];
-                                        
-                        var typeAlarm = function(obj){
-                                var alarm = [];
-                                for(var i = 0; i < obj.length; i++){
-                                        if(tempAlarm[obj[i].id]) 
-                                                continue; 
-                                        tempAlarm[obj[i].id] = true;
-                                        
-                                        if(obj[i].type == "1"){
-                                                obj[i].type = 'alert';
-                                        }else if(obj[i].type == "2"){
-                                                obj[i].type = 'mail';
-                                        }else{
-                                                obj[i].type = 'sms';
-                                        }
-                                        alarm.push(obj[i]);
+                        }                                               
+                        var alarmParticipant = function(obj){
+                                var alarms = [];
+                                for(var i = 0; i < obj.length; i++){ 
+                                        alarms.push(DataLayer.get('alarm', obj[i]));
                                 }
-                                return alarm;
+                                return alarms;
                         }
                     return {
@@ -499 +474 @@
                               allDay: !!parseInt( objEvent.allDay ),
           //                            attachments: this.decode( "attachment:detail", form ),
-                              attendee: $.map(objEvent.participants || [], function( participant, i ){
-                                                if(participant.indexOf('java') >= 0) 
-                                                        return (null); 
-                                                if(temp[participant]) 
-                                                        return (null); 
-                                                temp[participant] = true;
-                                                
+                              attendee: $.map(objEvent.participants || [], function( participant, i ){                                          
+                                        
                                         var attend = DataLayer.get('participant', participant);
                                         attend.user = DataLayer.get('user', attend.user)
@@ -520 +490 @@
                                           {
                                               participantInfo.status = attend.status;
-                                              participantInfo.alarms = typeAlarm(objEvent.alarms);
+                                              participantInfo.alarms = alarmParticipant(attend.alarms);
+                                                  me.uid = attend.id;
                                           }
                                           if( parseInt( attend.isOrganizer ) )