Changeset 6797 for sandbox/2.4.2-expresso1/prototype/modules/calendar/js

Timestamp:

07/17/12 16:07:52 (12 years ago)

Author:

acoutinho

Message:

Ticket #2966 - primeiras implementacoes de tarefas aninhamento de equipo

Location:

sandbox/2.4.2-expresso1/prototype/modules/calendar/js

Files:

• calendar.codecs.js (modified) (5 diffs)
• helpers.js (modified) (3 diffs)
• init.js (modified) (5 diffs)

sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.codecs.js

@@ -728 +728 @@
                 id: form.idEvent,
                 location: form.location,
+                type: 1,
                 category: form.category,
                 summary: form.summary,
@@ -953 +954 @@
                         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 : '')
@@ -979 +981 @@
                         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
+                        });     
                 }
-                        
             }
                 
@@ -1008 +1011 @@
                   
             for( var i = 0; i < occurrences.length; i++ )
-                grouped[ evt.calendar ].push( DataLayer.merge({
+                grouped[ evt.calendar ].push( DataLayer.merge(
+                {
                     id: evt.URI || evt.id+ '-' + i,
                     title: Encoder.htmlDecode(evt.summary),
@@ -1016 +1020 @@
                     isRepeat: isRepeat,
                     occurrence: i,
+                    type: evt.type,
                     calendar: evt.calendar
                     }, eventEditable(evt.id, isRepeat, i ) ) );

sandbox/2.4.2-expresso1/prototype/modules/calendar/js/helpers.js

@@ -2091 +2091 @@
                 });
         }
+        
         doMenu();
+        
         $('#divAppbox').on('scroll',function(){
                 if ($('.cal-list-options-btn.fg-menu-open.ui-state-active')){                   
@@ -2099 +2101 @@
                 }
         });
+        
         $('ul.list-calendars .cal-list-options-btn').on('click',function(){doMenu();});         
         
@@ -2204 +2207 @@
                         
             $('.qtip-active').keydown(function(event) {
-                if (event.keyCode == '27') {
+                                        if (event.keyCode == '27') 
                     meu_container.find(".button.new").qtip('destroy');
-                }
             });
                         

sandbox/2.4.2-expresso1/prototype/modules/calendar/js/init.js

@@ -1 +1 @@
 $(document).ready(function() {
-
         //Remove o icone de configuraçõe padrão antigo do expresso
         $('#sideboxdragarea').addClass('hidden');
@@ -148 +147 @@
                         }, true );
                 });
+                /* Quick add task
+        -----------------------------------------------------------------*/
+                $(".button.add.add-task").click(function(event){
+                        var componente = $(this);
+
+                        $(componente).qtip({
+                            show: {
+                                ready: true, 
+                                solo: true, 
+                                when: {
+                                        event: 'click'
+                                }
+                                },
+                                hide: false,
+                                content: {
+                                        text: $('<div></div>').html( DataLayer.render( 'templates/task_quick_add.ejs', {} ) ),
+                                        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,
+                                        startTime: new Date().toString('yyyy-MM-dd 00:00:00'),
+                                        endTime: new Date().toString('yyyy-MM-dd 00:00:00'),
+                                        allDay: '1'
+                                });
+                                //DataLayer.commit();
+
+                                $(componente).qtip('destroy');
+                            });
+
+                            $('.qtip-active .button.advanced').button().click(function(){
+                                $(componente).qtip('destroy');
+                                alert('Nova Tela de criação tarefas');
+                            });
+                                                                
+                                $('.qtip-active .button.cancel').button().click(function(){
+                                        $(componente).qtip('destroy');
+                            });                                 
+                                                        
+                            $('.button').button();
+                                                        
+                        };
+                });
 
         var calendar = $('#calendar').fullCalendar(DataLayer.merge({ 
@@ -190 +298 @@
                         year: 'ano'
                 },
+                
+                eventRender: function( event, element, view ){
                 /*
-                eventRender: function( event, element, view ){
-                        $(element).attr( 'event-id', event.id );
-                },
-                */
+                         * TODO - Encontrar icones mais filé
+                         */
+            element.find(".fc-event-inner.fc-event-skin").prepend($('<img class="" src="../prototype/modules/calendar/img/' + ( (event.type == 1) ? "event" : "task" ) + '.png"></img>'));
+                },
+                
                 select: function( start, end, allDay, event, view ){
                         if (view.name == "month") {
@@ -286 +397 @@
                 eventClick: function( evt, event, view ){
                         evt.id = evt.id.split('-')[0];
+            
+                        if(evt.type == 1){
+
                         if(evt.selectable){
                             if(evt.isRepeat){
@@ -309 +423 @@
                                         }
                                 });
-                                
                             }else{
                                 var schedulable = DataLayer.get( "schedulable", evt.id);
                                 schedulable.calendar = evt.calendar;
                                 eventDetails( schedulable, true);
-                                
                             }
-                                
                         }
+            }else
+                                alert('Editar Tarefa');
                 },