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

Timestamp:

08/10/12 19:11:37 (12 years ago)

Author:

acoutinho

Message:

Ticket #2966 - Merge de novas funcionalidades com trunk #2951, #2952

Location:

trunk/prototype/modules/calendar/js

Files:

• activity.helpers.js (copied) (copied from sandbox/2.4.2-expresso1/prototype/modules/calendar/js/activity.helpers.js)
• calendar.alarms.js (copied) (copied from sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.alarms.js)
• calendar.codecs.js (modified) (16 diffs)
• calendar.shared.js (modified) (2 diffs)
• desktop.notification.js (copied) (copied from sandbox/2.4.2-expresso1/prototype/modules/calendar/js/desktop.notification.js)
• helpers.js (modified) (43 diffs)
• init.js (modified) (5 diffs)
• load.js (modified) (5 diffs)
• map.disponibility.js (modified) (11 diffs)
• task.helpers.js (copied) (copied from sandbox/2.4.2-expresso1/prototype/modules/calendar/js/task.helpers.js)

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

@@ -22 +22 @@
             fontColor: "fff",
             timezone: 'America/Sao_Paulo',
-            weekStart: 'SUN'
+            weekStart: 'SUN',
+            useDesktopNotification: 0
         };
 
@@ -31 +32 @@
     }
 }
+
+updateActivity = false;
 
 constantsParticipant = {
@@ -195 +198 @@
         DataLayer.commit( false, false, function(){     
             Calendar.rerenderView(true);
+            if(updateActivity)
+                refreshTaskActivity();
         });
     }
@@ -262 +267 @@
                 user: User.me.id,       
                 calendar: {
-                    id: Calendar.calendarOf[form.signature].id,
+                    id: !!!parseInt(form.type) ? Calendar.calendarOf[form.signature].id : Calendar.groupOf[form.signature].id,
                     name: Encoder.htmlEncode(form.name),
                     description: Encoder.htmlEncode(form.description),
@@ -384 +389 @@
 
       
+});
+
+DataLayer.codec( "schedulable", "taskEdit", {
+
+    decoder: function( evtObj ){
+        Encoder.EncodeType = "entity";
+        
+        if( notArray = $.type(evtObj) !== "array" )
+            evtObj = [ evtObj ];
+
+        var pref = User.preferences;
+                
+        var res = $.map(evtObj, function( form ){
+                        
+            return DataLayer.merge({
+                id: form.idTask,
+                percentage: form.percentage,
+                type: '2', 
+                status: form.taskStatus,
+                participants : $.map(form.attendee, function( attendee, i ){
+                    if(isNaN(attendee)){
+                        return{
+                            id: attendee,
+                            acl: form.attendeeAcl[i],
+                            delegatedFrom: !!form.delegatedFrom[i] ? form.delegatedFrom[i] : 0,
+                            isOrganizer: (form.attendee_organizer == attendee ? 1 : 0 ),
+                            isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0,
+                            acl: form.attendeeAcl[i].replace('o', '')
+                        };
+                    }else{
+                        if(DataLayer.get('participant', attendee).user == User.me.id){
+                            var me = {
+                                user: User.me.id,
+                                status: form.status,
+                                id: attendee,
+                                isOrganizer: 0,
+                                receiveNotification : (!!form.receiveNotification ? 1 : 0),
+                                alarms: typeof(form.alarmTime) != 'undefined' ? 
+                                $.map( form.alarmTime || [], function( alarmTime, i ){
+
+                                    if( alarmTime === "" )
+                                        return( null );
+
+                                    return !!form.alarmId[i] ?
+                                    {
+                                        type: form.alarmType[i], 
+                                        unit: form.alarmUnit[i], 
+                                        time: form.alarmTime[i], 
+                                        id: form.alarmId[i]
+                                        } : 
+{
+                                        type: form.alarmType[i],
+                                        unit: form.alarmUnit[i], 
+                                        time: form.alarmTime[i]
+                                        };
+                                }) : []
+                            };
+                                                        
+                            if(form.startDate){
+                                var tzId =  DataLayer.get('schedulable', form.idEvent).timezone || User.preferences.timezone,
+                                formatString = pref.dateFormat + " " + pref.hourFormat;
+                                                                
+                                DataLayer.put('notification', {
+                                    participant: me.id,
+                                    type: 'suggestion',
+                                    startTime: Date.parseExact(form.startDate + (!!form.allDay ? " 00:00": " "+$.trim(form.startHour)) , formatString ).toString('yyyy-MM-dd HH:mm:00'),
+                                    endTime:  Date.parseExact(form.endDate + ( !!form.allDay ? " 00:00": " "+$.trim(form.endHour)), formatString ).toString('yyyy-MM-dd HH:mm:00'),
+                                    allDay: ( !!form.allDay ? 1 : 0 ),
+                                    schedulable: form.idEvent
+                                });
+                                                        
+                            }
+                            return me;
+                        }else return(null);
+                    };
+                })
+            }, (form.group != form.lastGroup? {calendar: form.group, lastCalendar: form.lastGroup} : {}))
+        });
+        return notArray ? res[0] : res;
+    },
+
+    encoder: function( evtObj ){}
+
 });
 
@@ -510 +598 @@
                 calendar: objEvent.calendar,
                 summary: objEvent.summary,
+        type: !!objEvent.type ? objEvent.type : 1,
                 description: objEvent.description,
                 timezone: objEvent.timezone,
@@ -595 +684 @@
 });
 
+DataLayer.codec( "schedulable", "task", {
+
+    decoder: function( evtObj ){
+    Encoder.EncodeType = "entity";
+    
+    if( notArray = $.type(evtObj) !== "array" )
+        evtObj = [ evtObj ];
+
+    var pref = User.preferences;
+
+    var res = $.map(evtObj, function( form ){
+    
+        var tzId =  form.timezone || Calendar.signatureOf[form.group].calendar.timezone || User.preferences.timezone,
+
+        formatString = pref.dateFormat + " " + pref.hourFormat;
+
+        return DataLayer.merge({
+        "class": form["class"],
+        startTime: Date.parseExact(form.startDate + " "+$.trim(form.startHour) , formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'),
+        endTime:  Date.parseExact(form.endDate + " "+$.trim(form.endHour), formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'),  //+ (!!form.allDay ? 86400000 : 0) ,
+        due: (form.dueDate == '' )? 0 : Date.parseExact(form.dueDate + " "+$.trim(form.dueTime) , formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'),
+        allDay: ( !!form.allDay ? 1 : 0 ),      
+        status: form.taskStatus,      
+        id: form.idTask,
+        location: form.location,
+        type: !!form.type ?  form.type : 2,
+        percentage: form.percentage,
+        priority: form.priority,
+        category: form.category,
+        summary: form.summary == '' ? 'Tarefa sem título' : form.summary,
+        description: form.description,
+        timezone: tzId,
+        attachments: $.map(form.attachment || [], function( attachment, i ){
+            return {
+            attachment: attachment
+            }
+        }),
+        participants: $.map( form.attendee || [], function( attendee, i ){
+
+            if( !attendee || attendee === "" )
+            return( null );
+
+            var participant = {};
+            participant.user = (attendee!= User.me.id) ? DataLayer.get('participant', attendee).user : attendee ;
+
+            if( participant.user === User.me.id ){
+            return DataLayer.merge({
+                id: attendee,
+                isOrganizer: (form.attendee_organizer == attendee ? 1 : 0 ),
+                alarms: participant.alarms = $.map( form.alarmTime || [], function( alarmTime, i ){
+                if( alarmTime === "" )
+                    return( null );
+                return !!form.alarmId[i] ? {
+                    type: form.alarmType[i], 
+                    unit: form.alarmUnit[i], 
+                    time: form.alarmTime[i], 
+                    id: form.alarmId[i]
+                    }:
+
+                    {
+                    type: form.alarmType[i],
+                    unit: form.alarmUnit[i], 
+                    time: form.alarmTime[i]
+                    };
+                }),
+                status: !!form.status ? form.status : 3
+            }, (form.delegatedFrom[i] != '0' && form.delegatedFrom[i] != '')  ? {
+                delegatedFrom: form.delegatedFrom[i]
+                } : {});
+            }else{
+                return {
+                    id: attendee,
+                    isOrganizer: (form.attendee_organizer == attendee ? 1 : 0 ),
+                    isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0
+                    };
+            };
+        })
+        }, form.lastGroup ? (( form.lastGroup == form.group ) ? {} : {calendar: form.group, lastGroup: form.lastGroup}) : {calendar: form.group});
+    });
+
+    return notArray ? res[0] : res;
+    },
+
+    encoder: function( evtObj ){
+
+    var notArray = false;
+      
+    if( notArray = $.type(evtObj) !== "array" )
+        evtObj = [ evtObj ];
+
+    var statusParticipants = {},  isAttendee = false,
+   
+    statusLabels = [ '', 'accepted', 'tentative', 'cancelled', 'unanswered', 'delegated' ],
+
+    participantInfo = {}, delegatedFrom = {}, me = DataLayer.copy( User.me );
+    
+    var delegateAttendee = {};
+    
+    for( var i = 0; i < statusLabels.length; i++ )
+        statusParticipants[ statusLabels[i] ] = 0;
+    
+    var res = $.map(evtObj, function( objEvent ){           
+            
+        if(!(typeof(objEvent) == 'object'))
+            return (null);
+
+        var limitAttendee = false;
+
+        return {
+        "class": objEvent["class"],
+        id: objEvent.id,
+        location: objEvent.location,
+        category: objEvent.category,
+        taskStatus: objEvent.status,
+        groups: Calendar.groups,
+        group: objEvent.group ? objEvent.group : objEvent.calendar,
+        summary: objEvent.summary,
+        type: !!objEvent.type ? objEvent.type : 2,
+        description: objEvent.description,
+        timezone: objEvent.timezone,
+        timezones: Timezone.timezones,
+        percentage: (objEvent.percentage) ? objEvent.percentage : '0',
+        priority: objEvent.priority,
+        startDate: new Date( parseInt(objEvent.startTime) ).setTimezoneOffset( Timezone.timezone( objEvent.timezone ) ).toString( User.preferences.dateFormat ),
+        startHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(objEvent.startTime)), objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'startTime'), User.preferences.hourFormat),
+        endDate: new Date( parseInt(objEvent.endTime) - (!!parseInt(objEvent.allDay) ? 86400000 : 0)  ).setTimezoneOffset( Timezone.timezone( objEvent.timezone ) ).toString( User.preferences.dateFormat ),
+        endHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date(parseInt(objEvent.endTime)),  objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'endTime'), User.preferences.hourFormat),
+        dueDate: (!objEvent.due || objEvent.due == '' || objEvent.due == '0') ? '' : new Date( parseInt(objEvent.due) ).setTimezoneOffset( Timezone.timezone( objEvent.timezone ) ).toString( User.preferences.dateFormat ),
+        dueTime: (!objEvent.due || objEvent.due == '' || objEvent.due == '0') ? '' : dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(objEvent.due)), objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'startTime'), User.preferences.hourFormat),
+        allDay: !!parseInt( objEvent.allDay ),
+            historic: !!objEvent.historic ? decodeHistoric(objEvent) : [] ,
+        attachments: $.map(objEvent.attachments || [], function( attachment, i ){
+            var attach = DataLayer.get('schedulableToAttachment', attachment, false);
+            //TODO - Verificar na API retorno de id sobre os conceitos em que s?o utilizados tabelas de liga??o
+            if(!attach.name) return(null); 
+            
+            var ext = attach.name.split('.');
+            attach.name = attach.name.length < 10 ?  attach.name : ( ext.length == 1 ? attach.name.substr(0, 10) : (attach.name.substr(0, 6) + '.' +  ext[ext.length -1]));
+            attach.size = formatBytes(attach.size);
+            return attach;
+        }),                     
+        attendee: $.map(objEvent.participants || [], function( participant, i ){                        
+
+            if(delegateAttendee[participant])
+                return(null);
+
+            var attend = DataLayer.get('participant', (participant.id || participant));
+            attend.user = DataLayer.get('user', attend.user);
+
+            statusParticipants[ statusLabels[attend.status] ]++;    
+
+            if(attend.user.mail == User.me.mail)
+                isAttendee = true;
+
+            if( attend.user.id ===  me.id ){
+                participantInfo.user = {
+                    id: attend.id,
+                    status : attend.status,
+                    delegatedFrom: attend.delegatedFrom || '0',
+                    acl: attend.acl,
+                    receiveNotification : attend.receiveNotification,
+                    alarms : $.map(attend.alarms || [], function( alarm ){
+                    var alarm = DataLayer.get('alarm', alarm);
+                    return (alarm == "" ? (null) : alarm);
+                    })
+                };
+                me = attend;
+                return(null);
+            };
+
+            var person = {
+                id: attend.id,
+                name: attend.user.name != 'false' ? attend.user.name : '',
+                mail: attend.user.mail,
+                status : attend.status,
+                isExternal: attend.isExternal,
+                acl: attend.acl,
+                delegatedFrom: attend.delegatedFrom
+            };
+
+            if(!!parseInt(attend.delegatedFrom)){
+                delegatedFrom[attend.delegatedFrom] = DataLayer.copy(person);
+                return(null);
+            }
+
+            if( !!parseInt(attend.isOrganizer)){
+                participantInfo.organizer = DataLayer.copy(person);
+                return(null);
+            };                  
+
+            return (person);
+        }),
+        organizer: participantInfo.organizer || me,
+        isOrganizer: (participantInfo.organizer || me).id == me.id,
+        alarms: !!participantInfo.user ? participantInfo.user.alarms : [],
+        status: !!participantInfo.user ? participantInfo.user.status : 1,
+        isAttendee: isAttendee,
+        me: me,
+        delegatedFrom: delegatedFrom,
+        statusParticipants: (objEvent.sizeAttendees != "") ? objEvent.statusAttendees : statusParticipants,
+        sizeAttendeeLimit: (objEvent.sizeAttendees != "") ? objEvent.sizeAttendees : false
+        };
+    });
+    return (notArray ? res[0] : res);
+    }
+});
+
+function decodeHistoric ( evt ) {
+    var historic = evt.historic;
+    var decoded = [];
+    var attributeDecoded = {
+        'startTime': 'Data de inicio',
+        'endTime' : 'Data de fim',
+        'summary' : 'Título',
+        'description': 'Descrição',
+        'status': 'Status',
+        'percentage': 'Porcentagem',
+        'priority': 'Priorudade',
+        'due' : 'Previsão de término'
+    }
+    
+    var statusDecoded = {
+        1: 'Sem ações',
+        2: 'Em processo',
+        3: 'Finalzada',
+        4: 'Cancelada',
+    }
+
+    var decodeDate = function(time){
+        return new Date( parseInt( time) ).setTimezoneOffset( Timezone.timezone( evt.timezone ) ).toString( User.preferences.dateFormat+' - '+User.preferences.hourFormat );
+    };
+
+    var decodeItem = function(historic){
+        switch(historic.attribute){
+            case 'startTime':
+            case 'endTime' :
+            case 'due':
+                return {
+                    user :$.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user),
+                    attribute : attributeDecoded[historic.attribute],
+                    beforeValue : decodeDate(historic.beforeValue),
+                    afterValue : decodeDate(historic.afterValue),
+                    time: decodeDate(historic.time)
+                }
+            break;
+            case 'participant':
+                return{
+                    user :$.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user),
+                    attribute : historic.beforeValue == '' ? ('Novo participante') : ('Rem. participante'),
+                    beforeValue : historic.beforeValue == '' ? '' : historic.beforeValue.mail,
+                    afterValue : historic.afterValue == '' ? '' : historic.afterValue.mail,
+                    time: decodeDate(historic.time)
+                }
+            break;
+            case 'attachment':
+                return{
+                    user : $.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user),
+                    attribute : historic.beforeValue == '' ? ('Novo anexo') : ('Rem. anexo'),
+                    beforeValue : historic.beforeValue,
+                    afterValue : historic.afterValue,
+                    time: decodeDate(historic.time)
+                }
+            case 'percentage':
+                    return{
+                    user :$.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user),
+                    attribute :attributeDecoded[historic.attribute],
+                    beforeValue : historic.beforeValue+' %',
+                    afterValue : historic.afterValue+' %',
+                    time: decodeDate(historic.time)
+                }
+            case 'status':
+                    return{
+                    user :$.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user),
+                    attribute :attributeDecoded[historic.attribute],
+                    beforeValue : statusDecoded[historic.beforeValue],
+                    afterValue : statusDecoded[historic.afterValue],
+                    time: decodeDate(historic.time)
+                }
+            break;
+            default:
+                return {
+                    user : $.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user),
+                    attribute : attributeDecoded[historic.attribute],
+                    beforeValue : historic.beforeValue,
+                    afterValue : historic.afterValue,
+                    time: decodeDate(historic.time)
+                }
+            break;
+
+        }
+    }
+
+    for(var i = 0; i < historic.length; i++)
+        decoded.push(decodeItem(historic[i]));
+
+    return decoded;
+
+}
+
+DataLayer.codec( "schedulable", "taskSearch", {
+
+    decoder: function( evtObj ){
+
+    },
+
+    encoder: function( evtObj ){
+
+    var notArray = false;
+      
+    if( notArray = $.type(evtObj) !== "array" )
+        evtObj = [ evtObj ];
+
+    var res = $.map(evtObj, function( objEvent ){           
+            
+        if(!(typeof(objEvent) == 'object'))
+            return (null);
+
+        return {
+            id: objEvent.id,
+            description: !!objEvent.summary ? objEvent.summary : objEvent.description,
+            startDate: new Date( parseInt(objEvent.startTime) ).setTimezoneOffset( Timezone.timezone( objEvent.timezone ) ).toString( User.preferences.dateFormat ),
+            startHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(objEvent.startTime)), objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'startTime'), User.preferences.hourFormat),
+            endDate: new Date( parseInt(objEvent.endTime) - (!!parseInt(objEvent.allDay) ? 86400000 : 0)  ).setTimezoneOffset( Timezone.timezone( objEvent.timezone ) ).toString( User.preferences.dateFormat ),
+            endHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date(parseInt(objEvent.endTime)),  objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'endTime'), User.preferences.hourFormat),
+            dueDate: (!objEvent.due || objEvent.due == '' || objEvent.due == '0') ? '' : new Date( parseInt(objEvent.due) ).setTimezoneOffset( Timezone.timezone( objEvent.timezone ) ).toString( User.preferences.dateFormat ),
+            dueTime: (!objEvent.due || objEvent.due == '' || objEvent.due == '0') ? '' : dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(objEvent.due)), objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'startTime'), User.preferences.hourFormat),
+            allDay: !!parseInt( objEvent.allDay ),
+            percentage: (objEvent.percentage) ? objEvent.percentage : '0',
+                        status: objEvent.status
+        }
+    });
+    return (notArray ? res[0] : res);
+    }
+});
+
+DataLayer.codec( "schedulable", "activity", {
+
+    decoder: function( evtObj ){
+    Encoder.EncodeType = "entity";
+    
+    if( notArray = $.type(evtObj) !== "array" )
+        evtObj = [ evtObj ];
+
+    var pref = User.preferences;
+
+    var res = $.map(evtObj, function( form ){
+    
+        var tzId =  form.timezone || Calendar.signatureOf[form.group].calendar.timezone || User.preferences.timezone,
+        formatString = pref.dateFormat + " " + pref.hourFormat;
+
+        var decodeParticipants = function(attend){
+            return [DataLayer.merge(
+                {  
+                    user: User.me.id, 
+                    isOrganizer: 1,
+                    acl: 'row',
+                    alarms: $.map( form.alarmTime || [], function( alarmTime, i ){
+                        if( alarmTime === "" )
+                            return( null );
+                        return !!form.alarmId[i] ? {
+                            type: form.alarmType[i], 
+                            unit: form.alarmUnit[i], 
+                            time: form.alarmTime[i], 
+                            id: form.alarmId[i]
+                            }:
+
+                            {
+                            type: form.alarmType[i],
+                            unit: form.alarmUnit[i], 
+                            time: form.alarmTime[i]
+                            };
+                    })
+                }, attend != '0' ? {id: attend} : {})];
+        };
+
+        return DataLayer.merge({
+        "class": form["class"],
+        startTime: Date.parseExact(form.startDate + " "+$.trim(form.startHour) , formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'),
+        endTime:  Date.parseExact(form.endDate + " "+$.trim(form.endHour), formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'),  //+ (!!form.allDay ? 86400000 : 0) ,
+        due: (form.dueDate == '' )? 0 : Date.parseExact(form.dueDate + " "+$.trim(form.dueHour) , formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'),
+        allDay: ( !!form.allDay ? 1 : 0 ),      
+        status: form.activityStatus,      
+        id: form.idActivity,
+        type: !!form.type ?  form.type : 2,
+        percentage: form.percentage,
+        priority: form.priority,
+        category: form.category,
+        summary: form.summary == '' ? 'Atividade sem título' : form.summary,
+        description: form.description,
+        timezone: tzId,
+        attachments: $.map(form.attachment || [], function( attachment, i ){
+            return {
+            attachment: attachment
+            }
+        }),
+        participants: decodeParticipants(form.idAttendee),
+        taskToActivity:$.map( form.idtask || [], function( task, i ){
+
+            return DataLayer.merge({
+                task: task,
+                owner: User.me.id
+            }, form.idTaskToActivity[i] != '' ? {id: form.idTaskToActivity[i]} : {});
+
+        })
+        }, form.lastGroup ? (( form.lastGroup == form.group ) ? {} : {calendar: form.group, lastGroup: form.lastGroup}) : {calendar: form.group});
+    });
+
+    return notArray ? res[0] : res;
+    },
+
+    encoder: function( evtObj ){
+
+    var notArray = false;
+      
+    if( notArray = $.type(evtObj) !== "array" )
+        evtObj = [ evtObj ];
+    
+    var res = $.map(evtObj, function( objEvent ){           
+            
+        if(!(typeof(objEvent) == 'object'))
+            return (null);
+        
+        var historic = [];
+
+        var decodeTasks = function(obj){
+
+            var tasks = {}, task = {};
+
+            for(var i =0; i < obj.taskToActivity.length; i++){
+
+                taskToActivity = DataLayer.get('taskToActivity', obj.taskToActivity[i]); 
+                task = taskToActivity.task;
+
+                if($.type(task) != 'object')
+                    task = DataLayer.get('schedulable', task);
+
+                tasks[task.id] = {
+                    taskToActivity: taskToActivity.id,
+                    allDay: !!parseInt(task.allDay),
+                    dueDate: (!task.due || task.due == '' || task.due == '0') ? '' : new Date( parseInt(task.due) ).setTimezoneOffset( Timezone.timezone( task.timezone ) ).toString( User.preferences.dateFormat ),
+                    dueTime: (!task.due || task.due == '' || task.due == '0') ? '' : dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(task.due)), task.timezone, obj.calendar, obj.DayLigth, 'startTime'), User.preferences.hourFormat),
+                    startDate: new Date( parseInt(task.startTime) ).setTimezoneOffset( Timezone.timezone( task.timezone ) ).toString( User.preferences.dateFormat ),
+                    startHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(task.startTime)), task.timezone, task.calendar, obj.DayLigth, 'startTime'), User.preferences.hourFormat),
+                    endDate: new Date( parseInt(task.endTime) - (!!parseInt(task.allDay) ? 86400000 : 0)  ).setTimezoneOffset( Timezone.timezone( task.timezone ) ).toString( User.preferences.dateFormat ),
+                    endHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date(parseInt(task.endTime)),  task.timezone, obj.calendar, obj.DayLigth, 'endTime'), User.preferences.hourFormat),
+                    status: task.status,
+                    percentage: task.percentage
+                }
+
+                tasks[task.id].description = tasks[task.id].startDate + ' - ' + (!!task.summary ? task.summary : task.description);
+
+                historic.push({'task': (!!task.summary ? task.summary : task.description) , 'historic': decodeHistoric(task)});
+            }
+
+            tasks.length = obj.taskToActivity.length;
+            return tasks;
+
+        };
+
+        return {
+        "class": objEvent["class"],
+        id: objEvent.id,
+        location: objEvent.location,
+        category: objEvent.category,
+        activityStatus: objEvent.status,
+        groups: Calendar.groups,
+        group: objEvent.group ? objEvent.group : objEvent.calendar,
+        summary: objEvent.summary,
+        type: !!objEvent.type ? objEvent.type : 2,
+        description: objEvent.description,
+        timezone: objEvent.timezone,
+        timezones: Timezone.timezones,
+        percentage: (objEvent.percentage) ? objEvent.percentage : '0',
+        priority: objEvent.priority,
+        startDate: new Date( parseInt(objEvent.startTime) ).setTimezoneOffset( Timezone.timezone( objEvent.timezone ) ).toString( User.preferences.dateFormat ),
+        startHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(objEvent.startTime)), objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'startTime'), User.preferences.hourFormat),
+        endDate: new Date( parseInt(objEvent.endTime) - (!!parseInt(objEvent.allDay) ? 86400000 : 0)  ).setTimezoneOffset( Timezone.timezone( objEvent.timezone ) ).toString( User.preferences.dateFormat ),
+        endHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date(parseInt(objEvent.endTime)),  objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'endTime'), User.preferences.hourFormat),
+        dueDate: (!objEvent.due || objEvent.due == '' || objEvent.due == '0') ? '' : new Date( parseInt(objEvent.due) ).setTimezoneOffset( Timezone.timezone( objEvent.timezone ) ).toString( User.preferences.dateFormat ),
+        dueTime: (!objEvent.due || objEvent.due == '' || objEvent.due == '0') ? '' : dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(objEvent.due)), objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'startTime'), User.preferences.hourFormat),
+        allDay: !!parseInt( objEvent.allDay ),
+        historic: historic,
+        tasks: objEvent.taskToActivity ? decodeTasks(objEvent) : {},
+        attachments: $.map(objEvent.attachments || [], function( attachment, i ){
+            var attach = DataLayer.get('schedulableToAttachment', attachment, false);
+            //TODO - Verificar na API retorno de id sobre os conceitos em que s?o utilizados tabelas de liga??o
+            if(!attach.name) return(null); 
+            
+            var ext = attach.name.split('.');
+            attach.name = attach.name.length < 10 ?  attach.name : ( ext.length == 1 ? attach.name.substr(0, 10) : (attach.name.substr(0, 6) + '.' +  ext[ext.length -1]));
+            attach.size = formatBytes(attach.size);
+            return attach;
+        }),
+        me : User.me,
+        attendee: $.map(objEvent.participants || [], function( participant, i ){                        
+
+            var attend = DataLayer.get('participant', (participant.id || participant));
+            attend.user = DataLayer.get('user', attend.user);
+
+            return {
+                id: attend.id,
+                alarms : $.map(attend.alarms || [], function( alarm ){
+                    var alarm = DataLayer.get('alarm', alarm);
+                    return (alarm == "" ? (null) : alarm);
+                })
+            };
+        })
+
+        };
+    });
+    return (notArray ? res[0] : res);
+    }
+});
 
 function decodeOwnerCalendar(calendar){
@@ -727 +1329 @@
                 id: form.idEvent,
                 location: form.location,
+                type: 1,
                 category: form.category,
-                summary: form.summary,
+                summary: form.summary == '' ? 'Evento sem título' : form.summary,
                 description: form.description,
                 timezone: tzId,
@@ -800 +1403 @@
 
         var pref = User.preferences;
-
-        var res =  DataLayer.encode('schedulable:preview', evtObj);
+    var res = [];
+
+    for(var i = 0; i < evtObj.length; i++){
+           res.push(DataLayer.encode('schedulable:' + (evtObj[i].type == '1' ?  'preview' : ( !!evtObj[i].taskToActivity ? 'activity': 'task')) , evtObj[i]));
+    }
 
         if( !notArray ){
@@ -814 +1420 @@
 
             for (var i=0; i < res.length; i++) {
+
+        res[i].type = (res[i].type == '2' && !!res[i].tasks) ? '3' : res[i].type;
                           
                 var startDate = Date.parseExact( res[i]['startDate'], User.preferences.dateFormat );
@@ -836 +1444 @@
                         'endDate': new Date( occurrences[ii] + duration ).toString( User.preferences.dateFormat )
                         } );
-                                  
-                                  
-                                  
-                                  
-                    res2.repeat = typeRepeat[res[i].repeat.frequency];
+
+                    if(res[i].repeat)
+                res2.repeat = typeRepeat[res[i].repeat.frequency];
                                   
                     while (counter.compareTo( currentDate ) == 0) {
@@ -864 +1470 @@
 
         return notArray ? res[0] : res;
+    }
+
+});
+
+
+DataLayer.codec( "schedulable", "print", {
+
+    decoder: function( evtObj ){
+
+    },
+
+
+    encoder: function( evtObj ){
+    
+    if(!(!!evtObj))
+        evtObj = [];
+
+    var notArray = false;
+          
+    if( notArray = $.type(evtObj) !== "array" )
+        evtObj = [ evtObj ];
+
+    var pref = User.preferences;
+    var res = [];
+
+    for(var i = 0; i < evtObj.length; i++){
+       res.push(DataLayer.encode('schedulable:' + (evtObj[i].type == '1' ?  'preview' : 'task'), evtObj[i]));
+    }
+
+    if( !notArray ){
+        var dates = {};
+
+        var typeRepeat = {
+        'none': false, 
+        'daily': 'Repetição diária',
+        'weekly': 'Repetição semanal',
+        'monthly': 'Repetição mensal',
+        'yearly': 'repetição anual'
+        }
+
+        for (var i=0; i < res.length; i++) {
+            var startDate = Date.parseExact( res[i]['startDate'], User.preferences.dateFormat );
+            var endDate   = Date.parseExact( res[i]['endDate'], User.preferences.dateFormat );
+                  
+            var duration = parseInt( endDate.getTime() ) - parseInt( startDate.getTime() );
+            
+            var occurrences = [ startDate.getTime() ];
+                    
+            if( res[i].occurrences )
+            {
+                occurrences = res[i].occurrences;
+            }
+
+            for( var ii = 0; ii < occurrences.length; ii++ )
+            {
+                var currentDate = new Date( occurrences[ii] );
+                var counter = currentDate.clone();
+                        
+                var res2 = $.extend( {}, res[i], {
+                    'startDate': currentDate.toString( User.preferences.dateFormat ), 
+                    'endDate': new Date( occurrences[ii] + duration ).toString( User.preferences.dateFormat )
+                });
+
+                if(res[i].repeat)
+                    res2.repeat = typeRepeat[res[i].repeat.frequency];
+                      
+                var index = dateCalendar.dayNames[counter.getDay()] +' '+counter.toString('dd/MM');
+
+                if(!dates[index] || !$.isArray(dates[index].events))
+                    dates[index] = {events:  []};                    
+
+                                res2['isOneDay'] = res2.startDate == res2.endDate ? true : false;
+
+                dates[index].events.push(res2);
+                  
+            }
+        }
+
+        var calendarView = $('#calendar').fullCalendar('getView');
+        var start = calendarView.start.getTime();
+        var end = (calendarView.end.getTime() - (calendarView.name == 'month' ? 86400000 : 0 ));
+        var next = start;
+        var response = [];
+
+        while (next){
+            var index = dateCalendar.dayNames[new Date(next).getDay()] +' '+ new Date(next).toString('dd/MM');
+            
+            var event = {};
+            event[index] = {events: dates[index] ? dates[index].events : false};
+
+            response[response.length] = event;
+            next = (next + 86400000) > end ? false : (next + 86400000);
+        }
+        res = {events: response};
+    }
+
+    return notArray ? res[0] : res;
     }
 
@@ -952 +1655 @@
                         attendee = DataLayer.get('participant', evt.participants[i]);
                         if(attendee.user == User.me.id)
-                            return (attendee.acl.indexOf('w') >= 0 || attendee.acl.indexOf('o') >= 0 ) ? {
+                                            return (attendee.acl.indexOf('w') >= 0 || attendee.acl.indexOf('o') >= 0 ) ? 
+                                                {
                                 selectable: true, 
                                 className: 'fullcalendar-context-menu  event-id-'+idEvent+' calendar-id-'+calendar.id+ (isRecurrence ? ' isRecurrence Recurrence-id-'+Recurrence : '')
@@ -978 +1682 @@
                         return returns;
                     }                           
-                    return DataLayer.merge({
+                    return DataLayer.merge(
+                        {
                         editable: aclSignature.acl['write'] && !isRecurrence,
                         disableResizing : (((aclSignature.acl['busy'] && !aclSignature.acl['write']) || (!aclSignature.acl['write'] && aclSignature.acl['read'])) ? true : false),
                         disableDragging  : (((aclSignature.acl['busy'] && !aclSignature.acl['write']) || (!aclSignature.acl['write'] && aclSignature.acl['read'])) ? true: false),
                         className: mountClass(aclSignature.acl)
-                    }, aclSignature.acl['busy'] ? {
-                        title: 'Ocupado', 
-                        selectable: false
-                    } : {
-                        selectable: true
-                    });
+                        }, aclSignature.acl['busy'] ? 
+                        {
+                            title: 'Ocupado', 
+                            selectable: false
+                        } : {
+                            selectable: true
+                        });     
                 }
-                        
             }
                 
@@ -1005 +1710 @@
 
             //occurrences = DataLayer.unique( occurrences ).sort();
-                  
-            for( var i = 0; i < occurrences.length; i++ )
-                grouped[ evt.calendar ].push( DataLayer.merge({
-                    id: evt.URI || evt.id+ '-' + i,
-                    title: Encoder.htmlDecode(evt.summary),
-                    start: Timezone.getDateCalendar(new Date( parseInt( occurrences[i] ) ), calendar.timezone,  !!evt.DayLigth ? evt.DayLigth.calendar.startTime : Timezone.daylightSaving),
-                    end:   Timezone.getDateCalendar(new Date( parseInt( occurrences[i] ) + duration - (!!parseInt(evt.allDay) ? 86400000 : 0)), calendar.timezone, !!evt.DayLigth ? evt.DayLigth.calendar.startTime : Timezone.daylightSaving),
-                    allDay: parseInt( evt.allDay ),
-                    isRepeat: isRepeat,
-                    occurrence: i,
-                    calendar: evt.calendar
-                    }, eventEditable(evt.id, isRepeat, i ) ) );
+                var typeEvent;  
+            for( var i = 0; i < occurrences.length; i++ ){
+
+            typeEvent = (evt.type == 2 && evt.taskToActivity ? 3 : evt.type)
+                grouped[ evt.calendar ].push( DataLayer.merge(
+                {
+                    id: evt.URI || evt.id+ '-' + i,
+                    title: Encoder.htmlDecode(evt.summary),
+                    start: Timezone.getDateCalendar(new Date( parseInt( occurrences[i] ) ), calendar.timezone,  !!evt.DayLigth ? evt.DayLigth.calendar.startTime : Timezone.daylightSaving),
+                    end:   Timezone.getDateCalendar(new Date( parseInt( occurrences[i] ) + duration - (!!parseInt(evt.allDay) ? 86400000 : 0)), calendar.timezone, !!evt.DayLigth ? evt.DayLigth.calendar.startTime : Timezone.daylightSaving),
+                    allDay: parseInt( evt.allDay ),
+                    isRepeat: isRepeat,
+                    occurrence: i,
+                    type: typeEvent,
+                    calendar: evt.calendar
+                    }, (parseInt(typeEvent) == 1 ? eventEditable(evt.id, isRepeat, i ) : (parseInt(typeEvent) == 2 ? {editable: true, disableResizing: false, disableDragging: false} : {editable: false, disableResizing: true, disableDragging: true}) )) );
+        }
         });
 
@@ -1049 +1759 @@
                             ]
                         ],
-                        ['IN', 'calendar',  Calendar.calendarIds]
+                        ['IN', 'calendar',  $.merge( Calendar.calendarIds, Calendar.groupIds )]
                 ], 
             criteria: {

trunk/prototype/modules/calendar/js/calendar.shared.js

@@ -1 +1 @@
 function show_modal_shared(calendarId){
-
-        var html = DataLayer.render('templates/shared_calendar.ejs', {
+    $('.qtip.qtip-blue').remove();
+
+    var html = DataLayer.render('templates/shared_calendar.ejs', {
         calendar: Calendar.calendars,
         signature : Calendar.signatures
@@ -337 +338 @@
 
 function show_modal_search_shared(){
+    $('.qtip.qtip-blue').remove();
 
     var html = DataLayer.render('templates/shared_calendar.ejs', {});   

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

@@ -101 +101 @@
 }
 
-/*
-function listEvents(){
-        var list = $('.fc-header-right').find('.fc-button.fc-button-agendaDay').clone();
+function printNow(){
+
+        var window_print = window.open('','ExpressoCalendar','width=800,height=600,scrollbars=yes');        
+        window_print.document.open();
+
+        var start = $("#calendar").fullCalendar('getView').visStart.getTime()/1000;
+        var end = $("#calendar").fullCalendar('getView').visEnd.getTime()/1000;
+        var criteria = DataLayer.criteria("schedulable:calendar", {'start':start, 'end':end} );
+        
+        var data = DataLayer.get("schedulable:print", criteria);        
+
+        if($("#calendar").fullCalendar('getView').name == "month"){                             
+                window_print.document.write(DataLayer.render('templates/calendar_month_print.ejs', {
+                        'InfoPage' : $("#calendar").fullCalendar('getView').title,
+                        'days' : data
+                } ));
+        }
+        if($("#calendar").fullCalendar('getView').name == "agendaDay"){                         
+                window_print.document.write(DataLayer.render('templates/calendar_day_print.ejs', {
+                        'InfoPage' : $("#calendar").fullCalendar('getView').title,
+                        'days' : data
+                } ));
+        }
+        if($("#calendar").fullCalendar('getView').name == "agendaWeek"){
+                window_print.document.write(DataLayer.render('templates/calendar_week_print.ejs', {
+                        'InfoPage' : $("#calendar").fullCalendar('getView').title,
+                        'days' : data
+                }));
+                
+                var aux = 0;
+                setTimeout(function(){$(window_print.document).find(".all-day").each(function(){
+                        if($(this).height() > aux)
+                                aux = $(this).height();
+                });
+                $(window_print.document).find(".all-day").each(function(){
+                        $(this).height(aux);
+                });
+                $(window_print.document).find(".all-day-line .write").height(aux);
+                aux = 0;
+                },20);
+        }
+        if($("#calendar").fullCalendar('getView').name == "year"){      
+                window_print.document.write(DataLayer.render('templates/calendar_year_print.ejs', {
+                        'html' : $('#calendar .fc-content').html(),
+                        'header': $('#calendar').find('.fc-header-center h2').text()
+                } ));
+        }               
+        window_print.document.close();
+        setTimeout(window_print.print(), 300);
+}
+
+function printEvents(){
+        //var html = DataLayer.render( path + 'templates/attendee_permissions.ejs', {} );
+        var print = $('.fc-header-right').find('.fc-button.fc-button-agendaDay').clone();
+
         $('.fc-header-right').find('.fc-button-year').toggleClass('fc-corner-right');
-        list.addClass('fc-corner-right');
-        list.addClass('fc-button-listagem');
-        list.removeClass('fc-button-agendaDay');
-        list.removeClass('fc-corner-left');
-        list.find('.fc-button-content').html('Listagem');
-        $('.fc-header-right').append(list);
-}
-*/
+        print.addClass('fc-corner-right');
+        print.addClass('fc-button-print');
+        print.removeClass('fc-button-agendaDay');
+        print.removeClass('fc-corner-left');
+        print.find('.fc-button-content').html('Imprimir');
+        $('.fc-header-right').append(print);
+        $('.fc-button-print').click(function(){
+            alert('A tela de impressão será melhor visualizada com a preferência "Paisagem" do seu browser selecionada.');
+            printNow();
+        });
+}
 
 /*
@@ -122 +177 @@
 function eventDetails( objEvent, decoded, path, isMail, repeat)
 {
+
+    $('.qtip.qtip-blue').remove();
+
     attendees = {};
         
@@ -399 +457 @@
         modal:true, 
         autoOpen: false,
-        width:702, 
+        width:701, 
         position: 'center', 
         close: function(event, ui) {
@@ -936 +994 @@
 // load template of attendees
 var blkAddAtendee = UI.dialogs.addEvent.find('#calendar_addevent_details6').append(attendeeHtml);
-if(objEvent.attendee.length)
-    callbackAttendee();
+if(objEvent.attendee.length) 
+                callbackAttendee(); 
 /**
-                                Opções de delegação do participante/organizer
-                        */              
+Opções de delegação do participante/organizer
+*/              
 blkAddAtendee.find(".button.participant-delegate").button({
     icons: {
@@ -968 +1026 @@
 
 UI.dialogs.addEvent.find(".attendee-list-add .add-attendee-input input").Watermark("digite um email para convidar");
-/* Trata a edição de um novo participante adicionado
-                        * 
-                        */
+/* 
+ * Trata a edição de um novo participante adicionado
+ */
 var hasNewAttendee = false;
                         
@@ -978 +1036 @@
                         
 blkAddAtendee.find('.attendee-list-add .add-attendee-input input').keydown(function(event) {
-                                
     if (event.keyCode == '13' && $(this).val() != '' || (event.keyCode == undefined && $(this).val() != '')) {
         Encoder.EncodeType = "entity";
@@ -990 +1047 @@
 
         /**
-                                         * email válido?
-                                         */
+        * email válido?
+        */
         info.match(/^[\w!#$%&'*+\/=?^`{|}~-]+(\.[\w!#$%&'*+\/=?^`{|}~-]+)*@(([\w-]+\.)+[A-Za-z]{2,6}|\[\d{1,3}(\.\d{1,3}){3}\])$/) ? 
         newAttendeeEmail = info : newAttendeeName = info;
 
         /**
-                                         * 1) busca no banco para saber se o usuário já existe
-                                         *              1.1) se existe, atualiza as info na lista de participantes e nao abre o tooltip
-                                         *              1.2) se não existe
-                                         *                      a) salva como novo usuario externo no banco (apenas com email)
-                                         *                      b) exibe tooltip pedindo o nome
-                                         *                      c) se o usuário preenche tooltip e salva, atualiza com o nome o usuário recém criado
-                                         *                      d) se o usuário cancela o tooltip, fica o usuário salvo apenas com email e sem nome
-                                         */
+        * 1) busca no banco para saber se o usuário já existe
+        *               1.1) se existe, atualiza as info na lista de participantes e nao abre o tooltip
+        *               1.2) se não existe
+        *                       a) salva como novo usuario externo no banco (apenas com email)
+        *                       b) exibe tooltip pedindo o nome
+        *                       c) se o usuário preenche tooltip e salva, atualiza com o nome o usuário recém criado
+        *                       d) se o usuário cancela o tooltip, fica o usuário salvo apenas com email e sem nome
+        */
 
         var user = DataLayer.get('user', ["=", "mail", $(this).val()]);
@@ -1012 +1069 @@
                                         
         /**
-                                         * guarda o último tooltip aberto referente à lista de participantes 
-                                         */
+        * guarda o último tooltip aberto referente à lista de participantes 
+        */
         lastEditAttendeeToolTip = [];
 
         /**
-                                         * Valida email e salva um participante externo 
-                                         */
+        * Valida email e salva um participante externo 
+        */
         var saveContact = function() {
             Encoder.EncodeType = "entity";
@@ -1192 +1249 @@
     $(this).val('');
 
-} else if (!skipAddNewLine) {           
+} else if (!skipAddNewLine) {
     /**
-                                                 * a) salva como novo usuario externo no banco (apenas com email) e...
-                                                 * adiciona novo contato externo à lista de convidados
-                                                 */
+     * a) salva como novo usuario externo no banco (apenas com email) e...
+     * adiciona novo contato externo à lista de convidados
+     */
 
     userId = DataLayer.put('user', {
@@ -1285 +1342 @@
 
 /** 
-                        * Trata a busca de usuários para adição de participantes
-                        */
+* Trata a busca de usuários para adição de participantes
+*/
 blkAddAtendee.find('.add-attendee-search .ui-icon-search').click(function(event) {
     blkAddAtendee.find('.add-attendee-search input').keydown();
@@ -1374 +1431 @@
     }
 });
+
 //$('.block-add-attendee .search-result-list').selectable();
 
@@ -1395 +1453 @@
                         });
                 });
-                $('.attachment-list input').remove();
-                $('.row.fileupload-buttonbar .attachments-list p').remove();
+                $('div.new-event-win .attachment-list input').remove();
+                $('div.new-event-win .row.fileupload-buttonbar .attachments-list p').remove();
+                $('div.new-event-win .btn-danger.delete').addClass('hidden');
             }
         }});
@@ -1415 +1474 @@
     text: false
 });
-var maxSizeFile = 2000000;
-$('#fileupload').fileupload({
-    sequentialUploads: true,
-    add: function (e, data) {
-        if(data.files[0].size < maxSizeFile)
-            data.submit();
-    },
-    change: function (e, data) {
-        $.each(data.files, function (index, file) {
-            var attach = {};
-            attach.fileName = file.name;
-            var ext = file.name.split('.');
-            if(file.name.length > 10)
-                attach.fileName = ext.length == 1 ? file.name.substr(0, 10) :  file.name.substr(0, 6) + '.' + ext[ext.length -1];
-            attach.fileSize = formatBytes(file.size);
-            if(file.size > maxSizeFile)
-                attach.error = 'Tamanho de arquivo nao permitido!!'
-                                
-            $('.attachments-list').append(DataLayer.render(path+'templates/attachment_add_itemlist.ejs', {
-                file : attach
-            }));
-                                
-            if(file.size < maxSizeFile){
-                $('.fileinput-button.new').append(data.fileInput[0]).removeClass('new');
-                $('.attachments-list').find('[type=file]').addClass('hidden');
-                                        
-            }else
-                $('.fileinput-button.new').removeClass('new');
-                                
-                                
-            $('.attachments-list').find('.button.close').button({
-                icons: {
-                    primary: "ui-icon-close"
-                },
-                text: false
-            }).click(function(){
-                var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
-                $('.attachment-list').find('input[value="'+idAttach+'"]')
-                $(this).parent().remove();
-            }); 
-                                
-        })
-        },
-    done: function(e, data){
-        var currentUpload = $('.progress.after-upload:first').removeClass('after-upload').addClass('on-complete').hide();
-
-        if(!!data.result && data.result != "[]"){
-            var newAttach = (attch = jQuery.parseJSON(data.result)) ? attch : jQuery.parseJSON(data.result[0].activeElement.childNodes[0].data);
-            $('.attachment-list').append('<input tyepe="hidden" name="attachment[]" value="'+newAttach['attachment'][0][0].id+'"/>');
-            currentUpload.removeClass('on-complete').parents('p')
-            .append('<input type="hidden" name="fileId[]" value="'+newAttach['attachment'][0][0].id+'"/>')
-            .find('.status-upload').addClass('ui-icon ui-icon-check');
-        }else
-            currentUpload.removeClass('on-complete').parents('p').find('.status-upload').addClass('ui-icon ui-icon-cancel');
-    }
-});
-$('.attachments-list .button').button();
-
-if(!!window.FormData)                   
-$('#fileupload').bind('fileuploadstart', function () {
-    var widget = $(this),
-    progressElement = $('#fileupload-progress').fadeIn(),
-    interval = 500,
-    total = 0,
-    loaded = 0,
-    loadedBefore = 0,
-    progressTimer,
-    progressHandler = function (e, data) {
-        loaded = data.loaded;
-        total = data.total;
-    },
-    stopHandler = function () {
-        widget
-        .unbind('fileuploadprogressall', progressHandler)
-        .unbind('fileuploadstop', stopHandler);
-        window.clearInterval(progressTimer);
-        progressElement.fadeOut(function () {
-            progressElement.html('');
-        });
-    },
-    formatTime = function (seconds) {
-        var date = new Date(seconds * 1000);
-        return ('0' + date.getUTCHours()).slice(-2) + ':' +
-        ('0' + date.getUTCMinutes()).slice(-2) + ':' +
-        ('0' + date.getUTCSeconds()).slice(-2);
-    },
-    /* formatBytes = function (bytes) {
-            if (bytes >= 1000000000) {
-                return (bytes / 1000000000).toFixed(2) + ' GB';
-            }
-            if (bytes >= 1000000) {
-                return (bytes / 1000000).toFixed(2) + ' MB';
-            }
-            if (bytes >= 1000) {
-                return (bytes / 1000).toFixed(2) + ' KB';
-            }
-            return bytes + ' B';
-        },*/
-    formatPercentage = function (floatValue) {
-        return (floatValue * 100).toFixed(2) + ' %';
-    },
-    updateProgressElement = function (loaded, total, bps) {
-        progressElement.html(
-            formatBytes(bps) + 'ps | ' +
-            formatTime((total - loaded) / bps) + ' | ' +
-            formatPercentage(loaded / total) + ' | ' +
-            formatBytes(loaded) + ' / ' + formatBytes(total)
-            );
-    },
-    intervalHandler = function () {
-        var diff = loaded - loadedBefore;
-        if (!diff) {
-            return;
-        }
-        loadedBefore = loaded;
-        updateProgressElement(
-            loaded,
-            total,
-            diff * (1000 / interval)
-            );
-    };
-    widget
-    .bind('fileuploadprogressall', progressHandler)
-    .bind('fileuploadstop', stopHandler);
-    progressTimer = window.setInterval(intervalHandler, interval);
-});
+
+extendsFileupload('event', path);
         
 if(objEvent.isShared){
@@ -1557 +1492 @@
 }
 
-disponibily(objEvent, path, attendees);
+disponibily(objEvent, path, attendees, 'event');
 
 /*Seleciona a agenda padrão para criação de um evento*/
@@ -1573 +1508 @@
 
 UI.dialogs.addEvent.dialog('open');
-//$('[href="#calendar_addevent_details7"]').trigger('click');
-//$('[href="#calendar_addevent_details2"]').trigger('click');
+
 }
 
@@ -1691 +1625 @@
 
 
-function add_tab_configure_calendar(calendar) 
+function add_tab_configure_calendar(calendar, type) 
 {
+    $('.qtip.qtip-blue').remove();
+
     var calendars = [];
     var signatures = [];
@@ -1698 +1634 @@
         var calendarAlarms = [];
         
-    for (var i=0; i<Calendar.signatures.length; i++) {
-        calendars[i]  = Calendar.signatures[i].calendar;
-        signatures[i] = Calendar.signatures[i];
-        signatures[i].numberDefaultAlarm = signatures[i].defaultAlarms != '' ?  signatures[i].defaultAlarms.length: 0;
-        if (calendar && calendars[i].id == calendar)
-            previewActiveCalendarConf = i;
-    }
-                
-    if(!(document.getElementById('configure_tab')))
+        for (var i=0; i<Calendar.signatures.length; i++) {
+                if(parseInt(Calendar.signatures[i].calendar.type) == type){
+                   calendars.push(Calendar.signatures[i].calendar);
+                   signatures.push(Calendar.signatures[i]);
+                   length = signatures.length - 1;
+                   signatures[length].numberDefaultAlarm = signatures[length].defaultAlarms != '' ?  signatures[length].defaultAlarms.length: 0;
+                   if (calendar && calendars[length].id == calendar)
+                           previewActiveCalendarConf = length;
+                }
+   }
+        var tab_selector = ['configure_tab', 'configure_tab_group'];    
+    if(!(document.getElementById(tab_selector[type])))
     {
         $('.positionHelper').css('display', 'none');
         $('.cal-list-options-btn').removeClass('fg-menu-open ui-state-active');
-        var tab_title = "Configurações de agendas";
-        $tabs.tabs( "add", "#configure_tab", tab_title );
+        if(type == 0){
+                var tab_title = "Configurações de agendas";
+        }else{
+                var tab_title = "Configurações de Grupos";
+        }
+        $tabs.tabs( "add", "#"+tab_selector[type], tab_title );
                 
         var dataColorPicker = {
@@ -1734 +1677 @@
             DataLayer.render( 'templates/configure_calendars_itemlist.ejs', {
                 user:User, 
+                type:0,
                 calendar:calendars[nowActive], 
                 signature:signatures[nowActive]
                 }, function( form_template ){
-                var form_content = jQuery('.accordion-user-calendars .ui-accordion-content').eq(nowActive).html( form_template ).find('form');
+                var form_content = jQuery('#'+tab_selector[type]+' .accordion-user-calendars .ui-accordion-content').eq(nowActive).html( form_template ).find('form');
                 form_content.find('.preferences-alarms-list .button').button({
                     text:false, 
@@ -1756 +1700 @@
 
                 form_content.find('.button-add-alarms').click(function(){
-                    DataLayer.render( 'templates/alarms_add_itemlist.ejs', {}, function( template ){                                            
+                    DataLayer.render( 'templates/alarms_add_itemlist.ejs', {type: 0}, function( template ){                                             
                         jQuery('.preferences-alarms-list').append(template)
                         .find('li:last label:eq(0)').remove().end()
@@ -1862 +1806 @@
 DataLayer.render( 'templates/configure_calendars.ejs', {
     user:User, 
+        type: 0,
     calendars:calendars, 
     signatures:signatures
 }, function( template ){
-    var template_content = jQuery('#configure_tab').html( template ).find('.configure-calendars-win');
+    var template_content = jQuery('#'+tab_selector[type]).html( template ).find('.configure-calendars-win');
     template_content.find('.button').button().filter('.save').click(function(evt){
         if(calendarAlarms.length)
                 DataLayer.removeFilter('calendarSignatureAlarm', {filter: ['IN','id', calendarAlarms]});        
         template_content.find('form').submit();
-        $tabs.tabs( "remove", "#configure_tab");
+        $tabs.tabs( "remove", "#"+tab_selector[type]);
         DataLayer.commit( false, false, function( received ){
             delete Calendar.currentViewKey;
@@ -1879 +1824 @@
                 Calendar.load();
     }).end().filter('.cancel').click(function(evt){
-        $tabs.tabs( "remove", "#configure_tab");
+        $tabs.tabs( "remove", "#"+tab_selector[type]);
     });
 
@@ -1905 +1850 @@
         $('.positionHelper').css('display','none');
     $('.cal-list-options-btn').removeClass('fg-menu-open ui-state-active');
-    $tabs.tabs("select", "#configure_tab");
+    $tabs.tabs("select", "#"+tab_selector[type]);
     $('.accordion-user-calendars').accordion( "activate" , previewActiveCalendarConf );
                 
@@ -1913 +1858 @@
 }
 
-function getSelectedCalendars( reverse ){
+function getSelectedCalendars( reverse, type ){
+        var selector = "";
+        if(type == 0)
+                selector = ".my-calendars";
+        if(type == 1)
+                selector = ".my-groups-task";
     var selecteds = {};
     var cont = 0; 
     jQuery(function() {
-        jQuery(".my-calendars .calendar-view").each(function(i, obj) { 
+        jQuery(selector+" .calendar-view").each(function(i, obj) { 
             var check_box = obj;
             if( reverse ? !check_box.checked : check_box.checked ) {
@@ -1975 +1925 @@
 
 function remove_event(eventId, idCalendar){
-    $.Zebra_Dialog('Tem certeza que deseja excluir o evento?', {
+    $.Zebra_Dialog('Tem certeza que deseja excluir?', {
         'type':     'question',
         'overlay_opacity': '0.5',
@@ -2029 +1979 @@
 
 
-function remove_calendar(){
+function remove_calendar(type){
     /* Pode ser assim $('.cal-list-options-btn.ui-state-active').attr('class').replace(/[a-zA-Z-]+/g, ''); */
-    $.Zebra_Dialog('Todos os eventos desta agenda serão removidos. Deseja prosseguir com a operação?', {
+        if(!!parseInt(type))
+                var title = 'Todas as tarefas deste grupo serão removidas. Deseja prosseguir com a operação?';
+        else
+                var title = 'Todos os eventos desta agenda serão removidos. Deseja prosseguir com a operação?';
+    $.Zebra_Dialog(title, {
         'type':     'question',
         'overlay_opacity': '0.5',
@@ -2047 +2001 @@
                     delete Calendar.currentViewKey;
                     Calendar.load();
-                    refresh_calendars();
+                    refresh_calendars(type);
                 });
             }
@@ -2056 +2010 @@
 }
 
-function refresh_calendars(){
+function refresh_calendars(type){
 
     var colorsSuggestions = colors_suggestions();
@@ -2091 +2045 @@
                 });
         }
+        
         doMenu();
+        var currentToolTip = null;
         $('#divAppbox').on('scroll',function(){
                 if ($('.cal-list-options-btn.fg-menu-open.ui-state-active')){                   
                         var offset = $('.cal-list-options-btn.fg-menu-open.ui-state-active').offset();
                         if (offset)
-                                $('.positionHelper').css('top',offset.top);
+                            $('.positionHelper').css('top',offset.top);
                 }
+
                 if ($('.button.config-menu.fg-menu-open')){
                         var offset = $('.button.config-menu.fg-menu-open').offset();
                         if (offset)
-                                $('.positionHelper').css('top',offset.top);
+                            $('.positionHelper').css('top',offset.top);
                 }               
+
+                
+                if ($(".new-group.qtip-active").length || $(".new-calendar.qtip-active").length)                        
+                    $('.qtip-active').css('top',currentToolTip.offset().top - 50);
+                
         });
+        
         $('ul.list-calendars .cal-list-options-btn').on('click',function(){doMenu();});         
         
+
+    /***************************************New Calendar***************************************/
         meu_container.find(".button.new-calendar").button({
             icons: {
@@ -2112 +2077 @@
             text: false
         }).click(function () {
-                
-            if( $('.qtip.qtip-blue.qtip-active').val() !== ''){
-                $(this).qtip({
-                    show: {
-                    ready: true, 
-            solo: true, 
-            when: {
-                    event: 'click'
-                    }
-                },
-                hide: false,
-                content: {
-                text: $('<div></div>').html( DataLayer.render( 'templates/calendar_quick_add.ejs', {} ) ), 
-                title: {
-                text:'Nova Agenda', 
-                button: '<a class="button close" href="#">close</a>'
-                }
-                },
-                style: {
-                name: 'blue', 
-            tip: {
-                corner: 'leftMiddle'
-                }, 
-            border: {
-                width: 4, 
-            radius: 8
-                }, 
-            width: {
-                min: 230, 
-            max:230
-                }
-            },
-            position: {
-            corner: {
-            target: 'rightMiddle',
-            tooltip: 'leftMiddle'
-            },
-            adjust: {
-            x:0, 
-            y:-12
-            }
-            }
-            })
-        .qtip("api").onShow = function(arg0) {
-            $('.qtip-active .button.close').button({
-                icons: {
-                    primary: "ui-icon-close"
-                },
-                text: false
-            })
-            .click(function(){
-                meu_container.find(".button.new-calendar").qtip('destroy');
-            });
-            //TODO emplementar tratamento de duplicação de valores no location
-            $('.qtip-active .button.save').button().click(function(){
-                for(var i = 0; i < Calendar.calendars.length; i++){
-                    if(Calendar.calendars[i].location == ( User.me.uid + '/' + $('.qtip-active input').val())){ 
-                        $.Zebra_Dialog('O nome desta agenda já está sendo utilizada em uma Url de outra agenda. Por favor, informe outro nome para agenda.',{
-                            'overlay_opacity': '0.5',
-                            'type': 'warning'
-                        });
-                        meu_container.find(".button.new").qtip('destroy');
-                        return;
-                    }
-                }
+                currentToolTip = $(this);
+        var typeCalendar = !!parseInt($(this).attr('class').match(/[0-9]+/g)) ? 
+            {type: 'new-group', title: 'Novo Grupo', typeValue: 1, prompt: 'Nome do grupo'} : 
+            {type: 'new-calendar', title: 'Nova Agenda', typeValue: 0, prompt: 'Nome da agenda'}
+                
+            if(!$('.qtip.qtip-blue.qtip-active.'+typeCalendar.type).length){
+
+            $('.qtip.qtip-blue').remove();
+
+                $(this).qtip({
+                                show: {
+                       ready: true, 
+                   solo: true, 
+                   when: {
+                          event: 'click'
+                       }
+                    },
+                  hide: false,
+                  content: {
+                          text: $('<div></div>').html( DataLayer.render( 'templates/calendar_quick_add.ejs', {} ) ), 
+                          title: {
+                              text: typeCalendar.title, 
+                              button: '<a class="button close" href="#">close</a>'
+                          }
+                        },
+                  style: {
+                          name: 'blue', 
+                      tip: {
+                              corner: 'leftMiddle'
+                          }, 
+                   border: {
+                           width: 4, 
+                           radius: 8
+                          }, 
+                      width: {
+                              min: 230, 
+                          max:230
+                          }
+                    },
+               position: {
+                       corner: {
+                           target: 'rightMiddle',
+                           tooltip: 'leftMiddle'
+                       },
+                       adjust: {
+                            x:0, 
+                            y: -12
+                                                
+                       }
+                    }
+            })
+                .qtip("api").onShow = function(arg0) {
                                 
-                var selected;
-                var color = $('.cal-colors-options-btn').each(function(index){
-                    if ($(this).is('.color-selected'))
-                        selected = index;
-                });
-                DataLayer.put( "calendarSignature", {
-                    user: User.me.id,
-                    calendar: {
-                        name: Encoder.htmlEncode($('.qtip-active input').val()),
-                        timezone: User.preferences.timezone                             
-                    },
-                    isOwner: 1,
-                    fontColor: colorsSuggestions[selected]['font'].substring(1) ,
-                    backgroundColor: colorsSuggestions[selected]['background'].substring(1) ,
-                    borderColor: colorsSuggestions[selected]['border'].substring(1)
-                });
-                DataLayer.commit( false, false, function( received ){
-                    delete Calendar.currentViewKey;
-                    Calendar.load();
-                    refresh_calendars();
-                });
-                meu_container.find(".button.new").qtip('destroy');
-            });
-                        
-            $('.qtip-active .button.cancel').button().click(function(){
-                meu_container.find(".button.new").qtip('destroy');
-            });
-                        
-            $(".qtip-active input").Watermark("Nome da agenda");
-                        
-            $('.qtip-active').keydown(function(event) {
-                if (event.keyCode == '27') {
-                    meu_container.find(".button.new").qtip('destroy');
-                }
-            });
-                        
-            $('.colors-options').prepend(buttons_colors);
-            $('.colors-options .signed-cal-colors-options-btn-0').addClass('color-selected');
-                                        
-            var buttons = $('.cal-colors-options-btn').button();
-                        
-            buttons.click(function(){
-                buttons.removeClass('color-selected');
-                $(this).addClass('color-selected');
-            });
-        }                               
-        }
+                    $('.qtip-active .button.close').button({
+                          icons: {
+                              primary: "ui-icon-close"
+                          },
+                          text: false
+                    })
+                    .click(function(){
+                              $('.qtip.qtip-blue').remove();
+                    });
+                    
+                 $('.qtip-active').addClass(typeCalendar.type);
+
+                    $('.qtip-active .button.save').button().click(function(){
+                    if(!typeCalendar.typeValue)
+                                for(var i = 0; i < Calendar.calendars.length; i++){
+                                    if(Calendar.calendars[i].location == ( User.me.uid + '/' + $('.qtip-active input').val())){ 
+                                        $.Zebra_Dialog('O nome desta agenda já está sendo utilizada em uma Url de outra agenda. Por favor, informe outro nome para agenda.',{
+                                            'overlay_opacity': '0.5',
+                                            'type': 'warning'
+                                        });
+                                        $('.qtip.qtip-blue').remove();
+                                        return;
+                                    }
+                                }
+                                        
+                        var selected;
+                        var color = $('.cal-colors-options-btn').each(function(index){
+                            if ($(this).is('.color-selected'))
+                                 selected = index;
+                        });
+                        DataLayer.put( "calendarSignature", {
+                            user: User.me.id,
+                            calendar: {
+                                name: Encoder.htmlEncode($('.qtip-active input').val()),
+                                timezone: User.preferences.timezone,
+                        type: typeCalendar.typeValue                    
+                            },
+                            isOwner: 1,
+                            fontColor: colorsSuggestions[selected]['font'].substring(1) ,
+                            backgroundColor: colorsSuggestions[selected]['background'].substring(1) ,
+                            borderColor: colorsSuggestions[selected]['border'].substring(1)
+                        });
+                        DataLayer.commit( false, false, function( received ){
+                            delete Calendar.currentViewKey;
+                            Calendar.load();
+                            refresh_calendars();
+                        });
+                        $('.qtip.qtip-blue').remove();
+                    });
+                                
+                    $('.qtip-active .button.cancel').button().click(function(){
+                        meu_container.find(".button.new").qtip('destroy');
+                    });
+                                
+                    $(".qtip-active input").Watermark(typeCalendar.prompt);
+                                
+                    $('.qtip-active').keydown(function(event) {
+                            if (event.keyCode == '27') 
+                              meu_container.find(".button.new").qtip('destroy');
+                    });
+                                
+                    $('.colors-options').prepend(buttons_colors);
+                    $('.colors-options .signed-cal-colors-options-btn-0').addClass('color-selected');
+                                                
+                    var buttons = $('.cal-colors-options-btn').button();
+                                
+                    buttons.click(function(){
+                        buttons.removeClass('color-selected');
+                        $(this).addClass('color-selected');
+                    });
+                }                               
+           }
     });
-        
+
     $("img.cal-list-img").click(function(evt) {
-        $(".cal-list-options_1").toggleClass( "hidden" );
+           $(".cal-list-options_1").toggleClass( "hidden" );
     });
 
+    $(".my-groups-task a.title-my-calendars").click(function() {
+        $(".my-groups-task ul.my-list-calendars").toggleClass("hidden")
+        $('.my-groups-task .status-list').toggleClass("ui-icon-triangle-1-s");
+        $('.my-groups-task .status-list').toggleClass("ui-icon-triangle-1-e");
+    });
+
     $(".my-calendars a.title-my-calendars").click(function() {
-        $(".my-calendars ul.my-list-calendars").toggleClass("hidden")
-        $('.my-calendars .status-list').toggleClass("ui-icon-triangle-1-s");
-        $('.my-calendars .status-list').toggleClass("ui-icon-triangle-1-e");
+        $(".my-calendars ul.my-list-calendars").toggleClass("hidden")
+        $('.my-calendars .status-list').toggleClass("ui-icon-triangle-1-s");
+        $('.my-calendars .status-list').toggleClass("ui-icon-triangle-1-e");
     });
                 
     $(".signed-calendars a.title-signed-calendars").click(function() {
-        $(".signed-calendars ul.signed-list-calendars").toggleClass( "hidden");
+           $(".signed-calendars ul.signed-list-calendars").toggleClass( "hidden");
     });
 
@@ -2270 +2253 @@
                 
     $('.calendar-view').click(function(evt){
-        if($tabs.tabs('option' ,'selected') == 1){
-            pageselectCallback('', 0);
+        if($tabs.tabs('option' ,'selected') != 0){
+            pageselectCallback('', 0, false, type);
         }
                         
@@ -2285 +2268 @@
 }
 
-function add_events_list(keyword)
+function add_events_list(keyword, type)
 {
     var tab_title = ""; 
     if (keyword){
-        if(keyword.length < 10)
-            tab_title = keyword; 
-        else
-            tab_title = keyword.substr(0,10) + '..."'; 
+                type = 2;
+                if(keyword.length < 10)
+                        tab_title = keyword; 
+                else
+                        tab_title = keyword.substr(0,10) + '..."'; 
     }else{
-        tab_title = "Lista de eventos";
-    }
+                if(type){
+                        if(!!parseInt(type))
+                                tab_title = "Lista de tarefas";
+                        else
+                                tab_title = "Lista de eventos";
+                }
+    }
+        var tab_selector = ['tab_events_list_', 'tab_tasks_list_', 'tab_all_list_'];
     keyword = ( keyword || '' ).replace( /\s+/g, "_" );
         
-    if(!(document.getElementById('tab_events_list_' + (Base64.encode(keyword)).replace(/[^\w\s]/gi, "") )))     
+    if(!(document.getElementById(tab_selector[type] + (Base64.encode(keyword)).replace(/[^\w\s]/gi, "") )))     
     {
         Encoder.EncodeType = "entity";
-        $tabs.tabs( "add", "#tab_events_list_" + (Base64.encode(keyword)).replace(/[^\w\s]/gi, ""), Encoder.htmlEncode(tab_title) );
+        $tabs.tabs( "add", "#"+tab_selector[type] + (Base64.encode(keyword)).replace(/[^\w\s]/gi, ""), Encoder.htmlEncode(tab_title) );
     }
     else /* Tab already opened */
     {
-        $tabs.tabs("option", "selected", 2);
-    }
-        
-    pageselectCallback(keyword, 0); // load page 1 and insert data on event_list.ejs
+                //$tabs.tabs("option", "selected", 2);
+        }
+        
+    pageselectCallback(keyword, 0, false, type); // load page 1 and insert data on event_list.ejs
         
     $('.preferences-win.active .button.save, .preferences-win.active .button.cancel, .preferences-win.active .button.import, .preferences-win.active .button.export').button();
@@ -2328 +2318 @@
         if(paginator.indexOf('next') > 0){
             if(parseInt($(currentView+' [name = results]').val()) > 25)
-                pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($(currentView+' [name = page_index]').val())) +1));
+                pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($(currentView+' [name = page_index]').val())) +1), false,  2);
         }else{
             if(parseInt($(currentView+' [name = page_index]').val()) > 0)
-                pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($(currentView+' [name = page_index]').val())) -1));
+                pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($(currentView+' [name = page_index]').val())) -1), false, 2);
         }
     });
@@ -2369 +2359 @@
 }
 
-function paginatorList(currentView, view){
-    $(currentView+' .events-list.events-list-win.active .list-events-paginator .fc-header-title').html('<h2>'+mountTitleList( parseInt($('[name = page_index]').val()),view)+'</h2>');
+function paginatorList(currentView, view, type){
+    $(currentView+' .events-list.events-list-win.active .list-events-paginator .fc-header-title').html('<h2>'+mountTitleList( parseInt($(currentView+' [name = page_index]').val()),view)+'</h2>');
     $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right .fc-button').removeClass('fc-state-active')
     if(view == 'basicDay')
@@ -2390 +2380 @@
         var goView = $(this).attr('class');
         if(goView.indexOf('agendaDay') > 0)
-            pageselectCallback($(currentView+' [name = keyword]').val(), 0, '', 'agendaDay');
+            pageselectCallback($(currentView+' [name = keyword]').val(), 0, 'agendaDay', type);
         else if(goView.indexOf('month') > 0)
-            pageselectCallback($(currentView+' [name = keyword]').val(), 0, '', 'month');
+            pageselectCallback($(currentView+' [name = keyword]').val(), 0, 'month', type);
         else if(goView.indexOf('year') > 0)
-            pageselectCallback($(currentView+' [name = keyword]').val(), 0, '', 'year');
+            pageselectCallback($(currentView+' [name = keyword]').val(), 0, 'year', type);
         else if(goView.indexOf('agendaWeek') > 0)
-            pageselectCallback($(currentView+' [name = keyword]').val(), 0, '', 'agendaWeek');
+            pageselectCallback($(currentView+' [name = keyword]').val(), 0, 'agendaWeek', type);
 
     });
@@ -2412 +2402 @@
         var paginator = $(this).attr('class');
         if(paginator.indexOf('next') > 0)
-            pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($('[name = page_index]').val())) +1), '', view);
+            pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($(currentView+' [name = page_index]').val())) +1), view, type);
         else
-            pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($('[name = page_index]').val())) -1), '', view);
+            pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($(currentView+' [name = page_index]').val())) -1), view, type);
     }); 
 }
 
-function paginatorListEvent(currentView, typeView, view){
+function printEventList(view){
+        $('.fc-button-print.print-list-events').click(function(){
+                var window_print = window.open('','ExpressoCalendar','width=800,height=600,scrollbars=yes');
+                var listEvents = $(view).clone();
+                listEvents.find('.fc-button').remove();
+                listEvents.find('.details-event-list').remove();
+                listEvents.find('.list-events-paginator').attr( "align" , "center"  );
+                listEvents = listEvents.html();
+                type = $(this).parents('.ui-tabs-panel').attr("id").split("_")[1];
+                var data = {
+                        type : type == "tasks" ? "task-list" : ( type == "events" ? "event-list" : "search"),
+                        html : listEvents
+                }
+                window_print.document.open();           
+                window_print.document.write(DataLayer.render('templates/calendar_list_print.ejs', data));
+                window_print.document.close();
+                window_print.print();
+        });
+}
+
+function paginatorListEvent(currentView, typeView, view, type){
     if(!!$(currentView).find('.fc-calendar').length)
         return;
@@ -2430 +2440 @@
     $(currentView+' .events-list.events-list-win.active .fc-header .fc-header-center').addClass('list-events-paginator');
     $(currentView+' .events-list.events-list-win.active .fc-header .list-events-paginator').removeClass('fc-header-center');            
-                
+                
     //Adicionar class no header padronizar com a tela principal
-    $(currentView+' .events-list.events-list-win.active .fc-header').addClass('header-paginator');
-    $(currentView+' .events-list.events-list-win.active .header-paginator').removeClass('fc-header');
-                                
+        $(currentView+' .events-list.events-list-win.active .fc-header .fc-button-print').addClass('print-list-events');                
+        $(currentView+' .events-list.events-list-win.active .fc-header').addClass('header-paginator');
+    $(currentView+' .events-list.events-list-win.active .header-paginator').removeClass('fc-header');   
+        
+        printEventList(currentView);
+        
     if(typeView == 'search'){
-        $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right').remove()
+        $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right span.fc-button:not(.fc-button-print)').remove();
         $(currentView+' .events-list.events-list-win.active .list-events-paginator .fc-header-title').html('<h2>Resultados para: '+$(currentView+' [name = keyword]').val()+'</h2>');
         if((parseInt($(currentView+' [name = page_index]').val()) == 0) && (parseInt($(currentView+' [name = results]').val()) <= 25))
@@ -2442 +2455 @@
         paginatorSearch(currentView);
     }else
-        paginatorList(currentView, view);
+        paginatorList(currentView, view, type);
 }
 
@@ -2450 +2463 @@
         case 'basicDay':
         case 'agendaDay':
-            rangeStart = new Date().add({
+            rangeStart = new Date.today().add({
                 days: page_index
             }).getTime();
-            rangeEnd = rangeStart;
+            rangeEnd = rangeStart + 86400000;
             break;
         case 'agendaWeek':
@@ -2519 +2532 @@
 }
 
-function pageselectCallback(keyword, page_index, jq, view){
-        
-    var selecteds = getSelectedCalendars();
-    if(!selecteds && (keyword != '' && keyword != null)){       
-        jQuery('#tab_events_list_' + ((Base64.encode(keyword)).replace(/[^\w\s]/gi, "")|| '')).html(
-            '<div title="Lista de eventos" class="events-list events-list-win active empty">' +
-            '<label>Por favor selecione ao menos uma agenda.</label>' +
+function pageselectCallback(keyword, page_index, view, type){
+    $('.qtip.qtip-blue').remove();
+        var tab_selector = ['tab_events_list_', 'tab_tasks_list_', 'tab_all_list_'];
+        var tab_title = ['Lista de eventos', 'Lista de tarefas'];
+        var label_noselect_calendar = ['Por favor selecione ao menos uma agenda.', 'Por favor selecione ao menos um grupo.', 'Por favor selecione ao menos uma agenda ou grupo.'];
+        var label_nofound_search = ['Não foi encontrado nenhum evento correspondente à sua pesquisa.', 'Não foi encontrado nenhuma tarefa ou atividade correspondente à sua pesquisa.', 'Não foi encontrado nenhum evento ou tarefa ou atividade correspondente à sua pesquisa.'];
+        var label_nofound = ['Não foram encontrados eventos neste intervalo.', 'Não foram encontradas tarefas ou atividades neste intervalo.', 'Não foram encontrados eventos ou tarefas ou atividades neste intervalo.'];
+        var selecteds = getSelectedCalendars(false, type);
+    
+        if(!selecteds && (keyword != '' && keyword != null)){   
+        jQuery('#'+tab_selector[type] + ((Base64.encode(keyword)).replace(/[^\w\s]/gi, "")|| '')).html(
+            '<div title="'+tab_title[type]+'" class="events-list events-list-win active empty">' +
+            '<label>'+label_noselect_calendar[type]+'</label>' +
             '</div>'
             );
@@ -2545 +2564 @@
     var results = DataLayer.get('schedulable:detail', criteria);
     keyword = ( keyword || '' ).replace( /\s+/g, "_" ); 
-}
+        }
 // não há resultados    
 
-var currentView = '#tab_events_list_' + ((Base64.encode(keyword)).replace(/[^\w\s]/gi, "") || '');
+var currentView = '#'+tab_selector[type] + ((Base64.encode(keyword)).replace(/[^\w\s]/gi, "") || '');
 
 if ((((typeof(results) == 'undefined') || (!results.events_list )) && selecteds) &&(keyword != '' && keyword != null)) {
     $(currentView).html(
-                '<div title="Lista de eventos" class="events-list events-list-win active empty">' +
-                '<label>Não foi encontrado nenhum evento correspondente à sua pesquisa.</label>' +
+                '<div title="'+title+'" class="events-list events-list-win active empty">' +
+                '<label>'+label_nofound_search[type]+'</label>' +
                 '</div>'
         );
@@ -2561 +2580 @@
                 results['page_index'] = page_index;
                 results['keyword'] = keyword;
-                                
+                results['tab_title'] = tab_title[type]; 
                 DataLayer.render( 'templates/event_list.ejs', results, function( html ){
                         
@@ -2567 +2586 @@
                         $('.events-list-win .menu-container .button').button();
                                                                                                                         
-                        $(".event-details-item").parent().click(function(){
-
+                        $(".event-details-item").parent().click(function(event){
+                        event.stopImmediatePropagation();
                         $(this).siblings("div.details-event-list").toggleClass("hidden")
-                        .find('.button.delete').click(function(){
+                        .find('.button.delete').click(function(event){
                                 var eventId = $(this).siblings('[name="eventid"]').val();
                                 var calendarId = $(this).siblings('[name="calendarid"]').val();
-
                                 remove_event(eventId, calendarId);
+                                event.stopImmediatePropagation()
                         })
-                        .end().find('.button.edit').click(function(){                           
-                                eventDetails( DataLayer.get( "schedulable", $(this).siblings('[name="eventid"]').val() ), true );                                       
+                        .end().find('.button.edit').click(function(event){      
+                                if($(this).siblings('[name="eventtype"]').val() == 1)
+                                        eventDetails( DataLayer.get( "schedulable", $(this).siblings('[name="eventid"]').val() ), true );               
+                                else
+                                        taskDetails( DataLayer.get( "schedulable", $(this).siblings('[name="eventid"]').val() ), true );
+                                        
+                                event.stopImmediatePropagation()
+                        })
+                        .end().find('.button.print').click(function(event){     
+                                var window_print = window.open('','ExpressoCalendar','width=800,height=600,scrollbars=yes');
+                                var html = $(this).parents("td:first").clone();
+                                html.find(".menu-container.footer-container").remove();
+                                var html = html.html();
+                                var data = {
+                                        type : $(this).parents('.details-event-list').hasClass("details-event") ? "event-detail" : "task-detail",
+                                        html : html
+                                }
+                                window_print.document.open();           
+                                window_print.document.write(DataLayer.render('templates/calendar_list_print.ejs', data));
+                                window_print.document.close();
+                                window_print.print();
+                                
+                                event.stopImmediatePropagation()
                         });
 
                         });
-                        paginatorListEvent(currentView, (keyword == '' || keyword == null) ? 'list' : 'search',  !!view ? view : User.preferences.defaultCalView);
+                        paginatorListEvent(currentView, (keyword == '' || keyword == null) ? 'list' : 'search',  !!view ? view : User.preferences.defaultCalView, type);
                 });
     }else{
                 $(currentView).html(
-                        '<div title="Lista de eventos" class="events-list events-list-win active empty">' +
+                        '<div title="'+title+'" class="events-list events-list-win active empty">' +
                         '<input type="hidden" name="page_index" value="'+page_index+'"></inpunt>'+
                         '<input type="hidden" name="keyword" value="'+keyword+'"></inpunt>'+
-                        '<label class="empty-result">Não foram encontrados eventos neste intervalo.</label>' +
+                        '<label class="empty-result">'+label_nofound[type]+'</label>' +
                         '</div>'
                         );
-                paginatorListEvent(currentView, 'list', !!view ? view : User.preferences.defaultCalView);
-    }
-}
-        if(currentView != '#tab_events_list_')
+                paginatorListEvent(currentView, 'list', !!view ? view : User.preferences.defaultCalView, type);
+    }
+}
+        if(currentView != '#'+tab_selector[type])
             $tabs.tabs("select", currentView);
 }
 
-function show_modal_import_export(tab, calendarId) {
+function show_modal_import_export(tab, calendarId, typeView){
+    $('.qtip.qtip-blue').remove();
     DataLayer.render( 'templates/import_export.ejs', {
-        calendars: Calendar.calendars, 
-        owner: User.me.id
+        calendars: typeView == 0 ? Calendar.calendars : Calendar.groups, 
+        owner: User.me.id,
+        typeView: typeView
         }, function( html ){
 
         if (!UI.dialogs.importCalendar) {
             UI.dialogs.importCalendar = jQuery('#div-import-export-calendar')
-            .append('<div title="Importar e Exportar Eventos" class="import-export import-export-win active"> <div>')
+            .append('<div title="Importar e Exportar "' + (typeView == 0 ? 'Eventos' : 'Tarefas') + '" class="import-export import-export-win active"> <div>')
             .find('.import-export-win.active').html(html).dialog({
                 resizable: false, 
@@ -2831 +2873 @@
     }
 }
+
+function extendsFileupload(view, path){
+    var viewName = 'div.new-'+view+'-win';
+    
+    path = !!path ? path : '';
+    
+    var maxSizeFile = 2000000;
+    $('#fileupload'+view).fileupload({
+        sequentialUploads: true,
+        add: function (e, data) {
+            if(data.files[0].size < maxSizeFile)
+                data.submit();
+        },
+        change: function (e, data) {
+            $.each(data.files, function (index, file) {
+                var attach = {};
+                attach.fileName = file.name;
+                var ext = file.name.split('.');
+                if(file.name.length > 10)
+                    attach.fileName = ext.length == 1 ? file.name.substr(0, 10) :  file.name.substr(0, 6) + '.' + ext[ext.length -1];
+                attach.fileSize = formatBytes(file.size);
+                if(file.size > maxSizeFile)
+                    attach.error = 'Tamanho de arquivo nao permitido!!'
+                                
+                $(viewName+' .attachments-list').append(DataLayer.render(path+'templates/attachment_add_itemlist.ejs', {
+                    file : attach
+                }));
+                                
+                if(file.size < maxSizeFile){
+                    $(viewName+' .fileinput-button.new').append(data.fileInput[0]).removeClass('new');
+                    $(viewName+' .attachments-list').find('[type=file]').addClass('hidden');
+                                        
+                }else
+                    $(viewName+' .fileinput-button.new').removeClass('new');
+                                
+                                
+                $(viewName+' .attachments-list').find('.button.close').button({
+                    icons: {
+                        primary: "ui-icon-close"
+                    },
+                    text: false
+                }).click(function(){
+                    var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
+                    $(viewName+' .attachment-list').find('input[value="'+idAttach+'"]').remove();
+                    $(this).parent().remove();
+                
+                    if(!$(viewName+' .attachment-list input').length)
+                        $(viewName+' .btn-danger.delete').addClass('hidden');
+                
+                });     
+                                
+            })
+        },
+        done: function(e, data){
+            var currentUpload = $(viewName+' .progress.after-upload:first').removeClass('after-upload').addClass('on-complete').hide();
+
+            if(!!data.result && data.result != "[]"){
+                $(viewName+' .btn-danger.delete').removeClass('hidden');
+                var newAttach = (attch = jQuery.parseJSON(data.result)) ? attch : jQuery.parseJSON(data.result[0].activeElement.childNodes[0].data);
+                $(viewName+' .attachment-list').append('<input tyepe="hidden" name="attachment[]" value="'+newAttach['attachment'][0][0].id+'"/>');
+                currentUpload.removeClass('on-complete').parents('p')
+                .append('<input type="hidden" name="fileId[]" value="'+newAttach['attachment'][0][0].id+'"/>')
+                .find('.status-upload').addClass('ui-icon ui-icon-check');
+            }else
+                currentUpload.removeClass('on-complete').parents('p').find('.status-upload').addClass('ui-icon ui-icon-cancel');
+        }
+    });
+    $('.attachments-list .button').button();    
+
+    if(!!window.FormData)                       
+        $('#fileupload'+view).bind('fileuploadstart', function () {
+            var widget = $(this),
+            progressElement = $('#fileupload-progress-'+view).fadeIn(),
+            interval = 500,
+            total = 0,
+            loaded = 0,
+            loadedBefore = 0,
+            progressTimer,
+            progressHandler = function (e, data) {
+                loaded = data.loaded;
+                total = data.total;
+            },
+            stopHandler = function () {
+                widget
+                .unbind('fileuploadprogressall', progressHandler)
+                .unbind('fileuploadstop', stopHandler);
+                window.clearInterval(progressTimer);
+                progressElement.fadeOut(function () {
+                    progressElement.html('');
+                });
+            },
+            formatTime = function (seconds) {
+                var date = new Date(seconds * 1000);
+                return ('0' + date.getUTCHours()).slice(-2) + ':' +
+                ('0' + date.getUTCMinutes()).slice(-2) + ':' +
+                ('0' + date.getUTCSeconds()).slice(-2);
+            },
+            /* formatBytes = function (bytes) {
+            if (bytes >= 1000000000) {
+                return (bytes / 1000000000).toFixed(2) + ' GB';
+            }
+            if (bytes >= 1000000) {
+                return (bytes / 1000000).toFixed(2) + ' MB';
+            }
+            if (bytes >= 1000) {
+                return (bytes / 1000).toFixed(2) + ' KB';
+            }
+            return bytes + ' B';
+        },*/
+            formatPercentage = function (floatValue) {
+                return (floatValue * 100).toFixed(2) + ' %';
+            },
+            updateProgressElement = function (loaded, total, bps) {
+                progressElement.html(
+                    formatBytes(bps) + 'ps | ' +
+                    formatTime((total - loaded) / bps) + ' | ' +
+                    formatPercentage(loaded / total) + ' | ' +
+                    formatBytes(loaded) + ' / ' + formatBytes(total)
+                    );
+            },
+            intervalHandler = function () {
+                var diff = loaded - loadedBefore;
+                if (!diff) {
+                    return;
+                }
+                loadedBefore = loaded;
+                updateProgressElement(
+                    loaded,
+                    total,
+                    diff * (1000 / interval)
+                    );
+            };
+            widget
+            .bind('fileuploadprogressall', progressHandler)
+            .bind('fileuploadstop', stopHandler);
+            progressTimer = window.setInterval(intervalHandler, interval);
+        });
+    
+}

trunk/prototype/modules/calendar/js/init.js

@@ -147 +147 @@
                         }, true );
                 });
+                
+                var currentToolTip = null;
+                $('#divAppbox').on('scroll',function(){
+                        if ($(".new-task").length)                      
+                                currentToolTip.qtip('destroy');
+                });
+                
+                /* Quick add task
+        -----------------------------------------------------------------*/
+                $(".button.add.add-task").click(function(event){
+                        currentToolTip = $(this);
+                        var componente = $(this);
+                        
+            if(!$('div.qtip.qtip-blue.new-task').length){
+
+                $('div.qtip.qtip-blue').remove();
+
+                        $(componente).qtip({
+                            show: {
+                                ready: true, 
+                                solo: true, 
+                                when: {
+                                        event: 'click'
+                                }
+                                },
+                                hide: false,
+                                content: {
+                                        text: $('<div></div>').html( DataLayer.render( 'templates/task_quick_add.ejs', {"componente" : componente} ) ),
+                                        title: {
+                                                text:'Nova tarefa', 
+                                                button: '<a class="button close" href="#">close</a>'
+                                        }
+                                },
+                                style: {
+                                        name: 'blue', 
+                                tip: {
+                                                corner: 'leftMiddle'
+                                        }, 
+                                border: {
+                                            width: 4, 
+                                            radius: 8
+                                        }, 
+                                width: {
+                                                min: 225, 
+                                            max:225
+                                        }
+                                },
+                        position: {
+                                corner: {
+                                            target: 'rightMiddle',
+                                            tooltip: 'leftMiddle'
+                                },
+                                adjust: {
+                                            x:0, 
+                                            y:0
+                                }
+                        }
+                    })
+                .qtip("api").onShow = function(arg0) {
+
+                        /*------------------------------------------------------------------------*/
+                        /*               Seta os valores padrões nos inputs do qtip               */
+                         $('div.qtip div.add-simple-task input.task').Watermark("Tarefa sem título");
+                             $('div.qtip div.add-simple-task textarea').Watermark("Descrição");
+                        /*------------------------------------------------------------------------*/
+
+                            $('.qtip-active .button.close').button({
+                                icons: {
+                                    primary: "ui-icon-close"
+                                },
+                                text: false
+                            })
+                            .click(function(){
+                                        $(componente).qtip('destroy');
+                            });
+                                                        
+                            $('.qtip-active .button.save').button().click(function(){
+                                
+                                var title = $('div.qtip div.add-simple-task input.task').val();
+                                        var description = $('div.qtip div.add-simple-task textarea').val();
+
+                                        var calendar, timezone = '';
+
+                                        for (var i = 0; i < Calendar.signatures.length; i++){
+                                                if(Calendar.signatures[i].type == 1 && Calendar.signatures[i].calendar.type == 1){
+                                                        calendar = Calendar.signatures[i].calendar.id;
+                                                        timezone = Calendar.signatures[i].calendar.timezone;
+                                                        break;
+                                                }
+                                        }
+
+                                DataLayer.put('schedulable', 
+                                {
+                                        summary: title, 
+                                        description: description, 
+                                        type: '2', 
+                                        calendar: calendar, 
+                                        timezone: timezone,
+                                                        status: '1',
+                                        startTime: new Date().toString('yyyy-MM-dd 00:00:00'),
+                                        endTime: new Date().toString('yyyy-MM-dd 00:00:00'),
+                                        allDay: '1',
+                                        participants: 
+                                        [{  
+                                            user: User.me.id, 
+                                            isOrganizer: 1,
+                                            acl: 'row'
+                                        }]
+                                });
+                                
+                        $(componente).qtip('destroy');
+
+                    });
+
+                            $('.qtip-active .button.advanced').button().click(function(){
+
+                                var startEvent = new Date();
+                                        var configData = (startEvent.toString('mm') < 30)  ? {minutes: (30 - parseInt(startEvent.toString('mm')))} : {hours: 1, minutes: '-'+startEvent.toString('mm')};
+                                        startEvent.add(configData);
+                        
+                                                var componente = $(this);
+                        var description = $('div.qtip div.add-simple-task textarea[name="description"]').val();
+
+                                        taskDetails({
+                            summary: $('div.qtip div.add-simple-task input[name="summary"]').val(),
+                            description: description == 'Descrição' ? '' : description,
+                                                startTime: startEvent.getTime(),
+                                                endTime: dateCalendar.decodeRange(startEvent, (!!User.preferences.defaultCalendar ? (   !!Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration ?  
+                                                        (Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration) : (User.preferences.defaultDuration)) : (User.preferences.defaultDuration)))
+                                        }, true );
+
+                        $(componente).qtip('destroy');
+                            });
+                                                                
+                                $('.qtip-active .button.cancel').button().click(function(){
+                                        $(componente).qtip('destroy');
+                            });
+                                                        
+                            $('.qtip-active .button').button();
+                        
+                        $('div.qtip.qtip-blue.qtip-active').addClass('new-task');
+            }
+        }
+                });
+
+        $(".button.add.add-activity").click(function(event){
+                        var startEvent = new Date();
+                        var configData = (startEvent.toString('mm') < 30)  ? {minutes: (30 - parseInt(startEvent.toString('mm')))} : {hours: 1, minutes: '-'+startEvent.toString('mm')};
+                        startEvent.add(configData); 
+                        
+                        activityDetails({ 
+                                startTime: startEvent.getTime(),
+                                endTime: dateCalendar.decodeRange(startEvent, (!!User.preferences.defaultCalendar ? (   !!Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration ?  
+                                                (Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration) : (User.preferences.defaultDuration)) : (User.preferences.defaultDuration)))
+                        }, true );
+
+        });
 
         var calendar = $('#calendar').fullCalendar(DataLayer.merge({ 
@@ -189 +346 @@
                         year: 'ano'
                 },
+                
+                eventRender: function( event, element, view ){
                 /*
-                eventRender: function( event, element, view ){
-                        $(element).attr( 'event-id', event.id );
-                },
-                */
+                         * TODO - Encontrar icones mais filé
+                         */
+                        var img_icon = "";
+                        if(event.type == 1)
+                                img_icon = "mini-event.png";
+                        if(event.type == 2)
+                                img_icon = "mini-task.png";
+                        if(event.type == 3)
+                                img_icon = "activity_icon.jpg";
+
+                        
+            element.find(".fc-event-inner.fc-event-skin").prepend($('<img style="width: 11px; height: 13px;" class="" src="../prototype/modules/calendar/img/' + img_icon + '"></img>'));
+                },
+                
                 select: function( start, end, allDay, event, view ){
                         if (view.name == "month") {
@@ -285 +454 @@
                 eventClick: function( evt, event, view ){
                         evt.id = evt.id.split('-')[0];
-                        if(evt.selectable){
-                            if(evt.isRepeat){
-                                $.Zebra_Dialog(evt.title + ' é um evento com repetição.', {
-                                        'type':     'question',
-                                        'overlay_opacity': '0.5',
-                                        'buttons':  ['Editar todas ocorrências', 'Editar essa ocorrência'],
-                                        'onClose':  function(clicked) {
-                                                if(clicked == 'Editar todas ocorrências') {
-                                                    eventDetails( DataLayer.get( "schedulable", evt.id), true);
-                                                }else{
-                                                    /*
-                                                    * TODO - repeat foi adicionado pois melhorias devem ser feitas no rollback do
-                                                    *DataLayer, repeat somente é usado quando se trata da criação de um evento
-                                                    *pela edição de uma ocorrência.
-                                                    */      
-                                                    var repeat = mount_exception(evt.id, evt.occurrence);
-                                                                                                  
-                                                    $('.calendar-copy-move input[name="typeEvent"]').val("3");
-                                                    
-                                                    eventDetails(copyAndMoveTo(false , evt.id , false, "3", evt), true, '', false, repeat);
-                                                }       
-                                        }
-                                });
-                                
-                            }else{
-                                var schedulable = DataLayer.get( "schedulable", evt.id);
-                                schedulable.calendar = evt.calendar;
-                                eventDetails( schedulable, true);
-                                
-                            }
-                                
+            
+            switch (parseInt(evt.type)){
+                case 1:
+                    if(evt.selectable){
+                        if(evt.isRepeat){
+                            $.Zebra_Dialog(evt.title + ' é um evento com repetição.', {
+                                'type':     'question',
+                                'overlay_opacity': '0.5',
+                                'buttons':  ['Editar todas ocorrências', 'Editar essa ocorrência'],
+                                'onClose':  function(clicked) {
+                                    if(clicked == 'Editar todas ocorrências') {
+                                        eventDetails( DataLayer.get( "schedulable", evt.id), true);
+                                    }else{
+                                        /*
+                                        * TODO - repeat foi adicionado pois melhorias devem ser feitas no rollback do
+                                        *DataLayer, repeat somente é usado quando se trata da criação de um evento
+                                        *pela edição de uma ocorrência.
+                                        */      
+                                        var repeat = mount_exception(evt.id, evt.occurrence);
+                                                                                          
+                                        $('.calendar-copy-move input[name="typeEvent"]').val("3");
+                                        
+                                        eventDetails(copyAndMoveTo(false , evt.id , false, "3", evt), true, '', false, repeat);
+                                    }       
+                                }
+                            });
+                        }else{
+                            var schedulable = DataLayer.get( "schedulable", evt.id);
+                            schedulable.group = evt.calendar;
+                            eventDetails( schedulable, true);
+                            }
                         }
+                        break;
+                    case 2:
+                        var task = DataLayer.get( "schedulable", evt.id);
+                        task.group = evt.calendar;
+                        taskDetails( task, true);
+                        break;
+                    case 3:
+                        var activity = DataLayer.get( "schedulable", evt.id);
+                        activity.group = evt.calendar;
+                        activityDetails( activity, true);
+                        break;
+            }
                 },
                 
@@ -322 +503 @@
                         contentMenu();
                 }
-        }, dateCalendar));
- 
+        }, dateCalendar));      
+                
+                
         contentMenu();
          
@@ -346 +528 @@
         });       
         //Todo chamada do metodo que adiciona ao full calendar o botao de listagem de eventos  
-        //listEvents();
+        printEvents();
 });
+
+
+function useDesktopNotification(){
+        return !!parseInt(User.preferences.useDesktopNotification);
+}

trunk/prototype/modules/calendar/js/load.js

@@ -1 +1 @@
 Refresh = {
-    //Tempo em que após a ultima sincronização será verificado atualizações
+    //Tempo em que após a ultima sincronização será verificado atualizações
     timeRefresh : 180,
     clookRefresh: false,
@@ -8 +8 @@
         delete DataLayer.tasks[this.clookRefresh];
         
-        //Realiza agendamentos de atualização de view somente se o módulo aberto for expressoCalendar
+        //Realiza agendamentos de atualização de view somente se o módulo aberto for expressoCalendar
         if(User.moduleName == "expressoCalendar"){
             this.clookRefresh = (parseInt(($.now()) / 1000) + this.timeRefresh);
@@ -54 +54 @@
     }
 
-    this.calendarIds = [], this.signatureOf = {}, this.calendars = [], this.calendarOf= {};
+    this.calendarIds = [], this.groupIds = [], this.signatureOf = {}, this.calendars = [], this.groups = [], this.calendarOf = {}, this.groupOf= {};
 
     for( var i = 0; i < this.signatures.length; i++ ){
         if(this.signatures[i].isOwner == "0")
             this.signatures[i].permission =  DataLayer.encode('calendarToPermission:detail', this.signatures[i].permission);
-        this.signatureOf[ this.calendarIds[i] = ( this.calendars[ this.calendars.length ] = this.calendarOf[ this.signatures[i].id ] = this.signatures[i].calendar ).id ] = this.signatures[i];
+
+        if(this.signatures[i].calendar.type == '1')
+           this.signatureOf[ this.groupIds[this.groupIds.length] = ( this.groups[ this.groups.length ] = this.groupOf[ this.signatures[i].id ] = this.signatures[i].calendar ).id ] = this.signatures[i];
+        else
+           this.signatureOf[ this.calendarIds[ this.calendarIds.length] = ( this.calendars[ this.calendars.length ] = this.calendarOf[ this.signatures[i].id ] = this.signatures[i].calendar ).id ] = this.signatures[i];
     }
 
@@ -67 +71 @@
 
     rerenderView: function(force){
-        //TODO - Remover if quando centralizar o objeto User que contem as informações do usuário logado em um local acessível a todos módulos
+        //TODO - Remover if quando centralizar o objeto User que contem as informações do usuário logado em um local acessível a todos módulos
         if(User.moduleName == "expressoCalendar"){
             if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') == 0){
@@ -89 +93 @@
                 contentMenu();
             }else if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') != 0)
-                pageselectCallback($('.events-list-win.active [name=keyword]').val(), 0);
+                                
+                pageselectCallback($('.events-list-win.active [name=keyword]').val(), 0, false, ($tabs.tabs('option' ,'selected') > 2) ? 2 : ($tabs.tabs('option' ,'selected') == 1) ? 0 : 1);
         }
     }
 }
 
-Alarms = {
-    load: function(){
-        var eventsDay = DataLayer.get('alarm:schedulable',['=', 'date', Date.today().getTime()]);
-        if(eventsDay)
-        for(var i = 0; i < eventsDay.length; i++){
-            this.addAlarm( eventsDay[i] );
-        }
-    },
-        
-    addAlarm: function( eventDay ){            
-        if(!DataLayer.tasks[parseInt(eventDay.sendTime)]){
-            DataLayer.task( parseInt(eventDay.sendTime) , function( timestamp ){
-                var path = User.moduleName == 'expressoCalendar' ? '' : '../prototype/modules/calendar/';
-                DataLayer.render(path+'templates/alarm.ejs',{
-                    event: eventDay
-                }, function( html ){                                
-                    $.Zebra_Dialog(html , {
-                        'type':     'question',
-                        'overlay_opacity': '0.5',
-                        'buttons':  ['Fechar'],
-                        'onClose':  function(clicked) {}
-                    });
-                });
-            });
-        }
-    }
-}
-
 Calendar.load();
-Alarms.load();

trunk/prototype/modules/calendar/js/map.disponibility.js

@@ -8 +8 @@
 
 
-function updateMap(data){
-        var start_date = $(".new-event-win.active .start-date").val();
-        var end_date   = $(".new-event-win.active .end-date").val();
-        var start_time = $(".new-event-win.active .start-time").val();
-        var end_time   = $(".new-event-win.active .end-time").val();
-        var isAllDay   = $('.new-event-win.active input[name="allDay"]').is(':checked');
+function updateMap(viewName){
+        var start_date = $(".new-"+viewName+"-win.active .start-date").val();
+        var end_date   = $(".new-"+viewName+"-win.active .end-date").val();
+        var start_time = $(".new-"+viewName+"-win.active .start-time").val();
+        var end_time   = $(".new-"+viewName+"-win.active .end-time").val();
+        var isAllDay   = $('.new-'+viewName+'-win.active input[name="allDay"]').is(':checked');
         
         var formatString = User.preferences.dateFormat + " " + User.preferences.hourFormat;
@@ -21 +21 @@
         
         
-        var event = $("#new_event_map").fullCalendar('clientEvents', 'map')[0];
+        var event = $('.new-'+viewName+'-win .map_disponibility').fullCalendar('clientEvents', 'map')[0];
         
         
@@ -28 +28 @@
                         event.end = endDate;
                         event.allDay = isAllDay;
-                        $("#new_event_map").fullCalendar( 'updateEvent', event )
+                        $('.new-'+viewName+'-win .map_disponibility').fullCalendar( 'updateEvent', event )
                 }
                 
@@ -35 +35 @@
 
 
-function disponibily(objEvent, path, attendees){
+function disponibily(objEvent, path, attendees, viewName){
         var formatString = User.preferences.dateFormat + " " + User.preferences.hourFormat;
         var startDate = Date.parseExact( objEvent.startDate + " " + $.trim(objEvent.startHour) , formatString );
         var endDate = Date.parseExact( objEvent.endDate + " " + $.trim(objEvent.endHour) , formatString );
+
+    var dialogName = {event: 'addEvent', task: 'addTask', activity: 'addActivity'}
          
         var mapHtml = DataLayer.render( path+'templates/availability_map.ejs', {});
-        $("#calendar_addevent_details7").html(mapHtml);
-        $("#new_event_map").fullCalendar(DataLayer.merge({
+        $('#calendar_add'+viewName+'_details7').html(mapHtml);
+        $('.new-'+viewName+'-win .map_disponibility').fullCalendar(DataLayer.merge({
                 height : 300,
                 timeFormat: User.preferences.hourFormat,
@@ -77 +79 @@
                         if(!allDay){
                                 $('[name="allDay"]').attr("checked", false); 
-                                UI.dialogs.addEvent.find('.start-time, .end-time').removeClass('hidden');
+                                UI.dialogs[dialogName[viewName]].find('.start-time, .end-time').removeClass('hidden');
                                 
                                 $('[name="startHour"]').val(start.toString(User.preferences.hourFormat));
@@ -85 +87 @@
                         }else{
                                 $('[name="allDay"]').attr("checked", true); 
-                                UI.dialogs.addEvent.find('.start-time, .end-time').addClass('hidden');
+                                UI.dialogs[dialogName[viewName]].find('.start-time, .end-time').addClass('hidden');
                         }
                 },
@@ -98 +100 @@
                                 className : "map-event",
                                 backgroundColor : "transparent !important",
-                                editable : objEvent.acl.write || objEvent.acl.organization
+                                editable : objEvent.acl ? (objEvent.acl.write || objEvent.acl.organization) : true
                         }
                 ],
@@ -104 +106 @@
                         if(event.allDay){
                                 $('[name="allDay"]').attr("checked", true); 
-                                UI.dialogs.addEvent.find('.start-time, .end-time').addClass('hidden');
+                                UI.dialogs[dialogName[viewName]].find('.start-time, .end-time').addClass('hidden');
                                 
                                 $('[name="startDate"]').val(dateCalendar.toString(event.start, User.preferences.dateFormat));                           
@@ -111 +113 @@
                         }else{
                                 $('[name="allDay"]').attr("checked", false); 
-                                UI.dialogs.addEvent.find('.start-time, .end-time').removeClass('hidden');
+                                UI.dialogs[dialogName[viewName]].find('.start-time, .end-time').removeClass('hidden');
                         
                                 $('[name="startHour"]').val(dateCalendar.formatDate(event.start, User.preferences.hourFormat));
@@ -132 +134 @@
         var eventSource = new Array();
         var updateMapView = function(){
-                updateMap();
-                var view = $("#new_event_map").fullCalendar('getView');
+                updateMap(viewName);
+                var view = $('.new-'+viewName+'-win .map_disponibility').fullCalendar('getView');
                 var map = {};
-                $("#new_event_map").fullCalendar( 'removeEventSource', eventSource );
+                $('.new-'+viewName+'-win .map_disponibility').fullCalendar( 'removeEventSource', eventSource );
                 eventSource = new Array();      
                 map = {startTime : view.start.getTime(), endTime : view.end.getTime(), attendees: {}, timezone: (objEvent.timezone || User.preferences.timezone)};
@@ -167 +169 @@
                 }
                 if(eventSource.length)
-                        $("#new_event_map").fullCalendar( 'addEventSource', eventSource );
+                        $('.new-'+viewName+'-win .map_disponibility').fullCalendar( 'addEventSource', eventSource );
         }; 
-        $('[href="#calendar_addevent_details7"]').click(function(eventData, eventObject){
-                $("#new_event_map").fullCalendar( 'gotoDate', Date.parseExact($('[name="startDate"]').val() + " " + $.trim($('[name="startHour"]').val()), formatString) , formatString);
-                //if(eventObject == undefined)
-                        updateMapView();
+        $('[href="#calendar_add'+viewName+'_details7"]').click(function(eventData, eventObject){
+                $('.new-'+viewName+'-win .map_disponibility').fullCalendar( 'gotoDate', Date.parseExact($('[name="startDate"]').val() + " " + $.trim($('[name="startHour"]').val()), formatString) , formatString);
+                  updateMapView();
         });     
-        $("#new_event_map").find(".fc-button-prev, .fc-button-next, .fc-button-today").click(function(){
+        $('.new-'+viewName+'-win .map_disponibility').find(".fc-button-prev, .fc-button-next, .fc-button-today").click(function(){
                 updateMapView();
         });