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

Timestamp:

07/26/12 11:31:37 (12 years ago)

Author:

thiago

Message:

Ticket #2966 - Implementado a nova tela de atividades.

Location:

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

Files:

• activity.helpers.js (added)
• helpers.js (modified) (4 diffs)
• init.js (modified) (3 diffs)

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

@@ -939 +939 @@
 // load template of attendees
 var blkAddAtendee = UI.dialogs.addEvent.find('#calendar_addevent_details6').append(attendeeHtml);
-if(objEvent.attendee.length)
-    callbackAttendee();
+
 /**
 Opções de delegação do participante/organizer
@@ -981 +980 @@
                         
 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";
@@ -1195 +1193 @@
     $(this).val('');
 
-} else if (!skipAddNewLine) {           
+} else if (!skipAddNewLine) {
     /**
      * a) salva como novo usuario externo no banco (apenas com email) e...
@@ -1377 +1375 @@
     }
 });
+
 //$('.block-add-attendee .search-result-list').selectable();
 

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

@@ -166 +166 @@
                                 hide: false,
                                 content: {
-                                        text: $('<div></div>').html( DataLayer.render( 'templates/task_quick_add.ejs', {} ) ),
+                                        text: $('<div></div>').html( DataLayer.render( 'templates/task_quick_add.ejs', {"componente" : componente} ) ),
                                         title: {
                                                 text:'Nova tarefa', 
@@ -250 +250 @@
                                 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); 
+                                        startEvent.add(configData);
                         
                                                 var componente = $(this);
@@ -276 +276 @@
         }
                 });
+
+        $(".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({