Changeset 5358 for trunk/prototype/modules/calendar/js/helpers.js

Timestamp:

01/11/12 13:28:21 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Mudanca na manipulacao de participantes para melhor desempenho

File:

• trunk/prototype/modules/calendar/js/helpers.js (modified) (5 diffs)

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

@@ -432 +432 @@
                         
                         blkAddAtendee.find('li.attendee .button').addClass('small').button({text:false, icons: {primary:'ui-icon-close'}}).click(function () {
-                                var participant =  DataLayer.get('participant', ['AND',['=', 'user', $(this).parent().find('[type=checkbox]').val().replace(/[a-z:]/g, "")],['=', 'schedulable', $(this).parents().find('.id-event').first().val()]]);
-                                if(participant)
-                                        DataLayer.remove('participant', participant[0].id);
+                                DataLayer.remove('participant', $(this).parent().find('[type=checkbox]').val());
                                 $(this).parent().remove();
                         });
@@ -600 +598 @@
                                                 lastEditAttendeeToolTip.qtip('destroy');
 
+                                        var userId = '';
                                         var newAttendeeId = '';
 
                                         if (user){
-                                                if(user[0].isExternal)
-                                                        newAttendeeId = 'external:'+user[0].id;
-                                                else
-                                                        newAttendeeId = 'internal:'+user[0].id;
-
                                                 if (!skipAddNewLine) {
                                                         blkAddAtendee.find('dd.attendee-list ul.attendee-list').append(
-                                                                DataLayer.render('templates/participants_add_itemlist.ejs', [{id:newAttendeeId, name: user[0].name, mail: user[0].mail}])
+                                                                DataLayer.render('templates/participants_add_itemlist.ejs', {user: user[0]})
                                                         )
                                                         .find('.button.close').addClass('small').button({text:false, icons:{primary:'ui-icon-close'}}).click(function() {
-                                                                var participant =  DataLayer.get('participant', ['AND',['=', 'user', $(this).parent().find('[type=checkbox]').val().replace(/[a-z:]/g, "")],['=', 'schedulable',$(this).parents().find('.id-event').first().val()]]);
-                                                                if(participant)
-                                                                        DataLayer.remove('participant', participant[0].id);
+                                                                DataLayer.remove('participant', $(this).parent().find('[type=checkbox]').val());
                                                                 $(this).parent().remove();
                                                         }).end()
@@ -629 +621 @@
                                                  */
 
-                                                newAttendeeId = DataLayer.put('user', {name: newAttendeeName, mail: newAttendeeEmail, isExternal: isExternal});
+                                                userId = DataLayer.put('user', {name: newAttendeeName, mail: newAttendeeEmail, isExternal: isExternal});
+                                                newAttendeeId = DataLayer.put('participant', {user: userId, isExternal: isExternal});
 
                                                  
                                                 blkAddAtendee.find('dd.attendee-list ul.attendee-list').append(
-                                                        DataLayer.render('templates/participants_add_itemlist.ejs', [{id:newAttendeeId, name: newAttendeeName, mail: newAttendeeEmail}])
+                                                        DataLayer.render('templates/participants_add_itemlist.ejs', [{id:newAttendeeId, name: newAttendeeName, mail: newAttendeeEmail, isExternal: 1}])
                                                 ).find('.button.close').addClass('small').button({text:false, icons:{primary:'ui-icon-close'}}).click(function() {
-                                                        var participant =  DataLayer.get('participant', ['AND',['=', 'user', $(this).parent().find('[type=checkbox]').val().replace(/[a-z:]/g, "")],['=', 'schedulable', $(this).parents().find('.id-event').first().val()]]);
-                                                        if(participant)
-                                                                DataLayer.remove('participant', participant[0].id);
+                                                        DataLayer.remove('participant', $(this).parent().find('[type=checkbox]').val());
                                                         $(this).parent().remove();
                                                 }).end()
@@ -671 +662 @@
                                                 lastEditAttendeeToolTip.qtip("api").onShow = onShowToolTip;
 
+
+
+
+
+
+
+
                                                 $(this).val('');
 
@@ -704 +702 @@
                                                 if ($(event.target).is('input')) {
                                                         old_item = $(event.target).parents('li');
+                                                        newAttendeeId = DataLayer.put('participant', {user: old_item.find('.id').html(), isExternal: 0});
                                                         blkAddAtendee.find('dd.attendee-list ul.attendee-list')
-                                                        .append(DataLayer.render('templates/participants_add_itemlist.ejs', [{id: 'internal:'+old_item.find('.id').text(), name: old_item.find('.name').html()}]))
+                                                        .append(DataLayer.render('templates/participants_add_itemlist.ejs', [{id: newAttendeeId, name: old_item.find('.name').html(), isExternal: 0}]))
                                                         .find('.button').addClass('small').button({text:false, icons: {primary:'ui-icon-close'}}).click(function () {
                                                                 $(this).parent().remove();