Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/js/activity.helpers.js
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/js/activity.helpers.js	(revision 6959)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/js/activity.helpers.js	(revision 6974)
@@ -233,6 +233,6 @@
     canDiscardActivityDialog = true;
     /**
-	 * zebraDiscardActivityDialog Ã© uma flag indicando que uma janela de confirmação (Zebra_Dialog)
-	 * já está aberta na tela, uma vez que não Ã© possivel acessar o evento ESC utilizado para fechá-la
+	 * zebraDiscardActivityDialog é uma flag indicando que uma janela de confirmação (Zebra_Dialog)
+	 * já está aberta na tela, uma vez que não é possivel acessar o evento ESC utilizado para fechá-la
 	 */
     zebraDiscardActivityDialog = false;
@@ -310,6 +310,6 @@
     	},
     	dragStart: function(event, ui) {
-    		if ($('.qtip.qtip-blue.qtip-active').length)
-    			$('.qtip.qtip-blue.qtip-active').qtip('destroy');
+	    if ($('.qtip.qtip-blue.qtip-active').length)
+		$('.qtip.qtip-blue.qtip-active').qtip('destroy');
        }
     });
@@ -419,5 +419,5 @@
 		canDiscardActivityDialog = true;
 		/* Remove por filtro */
-		DataLayer.removeFilter('schedulable', {filter: ['AND', ['=', 'id', objActivity.id], ['=', 'group', objActivity.group], ['=','user',(objActivity.me.user ? objActivity.me.user.id : objActivity.me.id)]]});
+		DataLayer.removeFilter('schedulable', {filter: ['AND', ['=', 'id', objActivity.id], ['=', 'calendar', objActivity.group], ['=','user',(objActivity.me.user ? objActivity.me.user.id : objActivity.me.id)], ['=', 'type', '2']]});
 		Calendar.rerenderView(true);
 		/********************/
@@ -578,5 +578,5 @@
                 });
                 $('.attachment-list input').remove();
-                $('.row.fileupload-buttonbar .attachments-list p').remove();
+                $('.row.fileupload-buttonbar-activity .attachments-list p').remove();
             }
         }});
@@ -598,5 +598,5 @@
 });
 var maxSizeFile = 2000000;
-$('#fileupload').fileupload({
+$('#fileuploadactivity').fileupload({
     sequentialUploads: true,
     add: function (e, data) {
@@ -615,17 +615,17 @@
 		attach.error = 'Tamanho de arquivo nao permitido!!'
 				
-	    $('.attachments-list').append(DataLayer.render(path+'templates/attachment_add_itemlist.ejs', {
+	    $('div.new-activity-win .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');
+		$('div.new-activity-win .fileinput-button.new').append(data.fileInput[0]).removeClass('new');
+		$('div.new-activity-win .attachments-list').find('[type=file]').addClass('hidden');
 					
 	    }else
-		$('.fileinput-button.new').removeClass('new');
+		$('div.new-activity-win .fileinput-button.new').removeClass('new');
 				
 				
-	    $('.attachments-list').find('.button.close').button({
+	    $('div.new-activity-win .attachments-list').find('.button.close').button({
 		icons: {
 		    primary: "ui-icon-close"
@@ -641,9 +641,9 @@
 	},
     done: function(e, data){
-    	var currentUpload = $('.progress.after-upload:first').removeClass('after-upload').addClass('on-complete').hide();
+    	var currentUpload = $('div.new-activity-win .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+'"/>');
+    	    $('div.new-activity-win .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+'"/>')
@@ -656,7 +656,7 @@
 
 if(!!window.FormData)			
-$('#fileupload').bind('fileuploadstart', function () {
+$('#fileuploadactivity').bind('fileuploadstart', function () {
     var widget = $(this),
-    progressElement = $('#fileupload-progress').fadeIn(),
+    progressElement = $('#fileupload-progress-activity').fadeIn(),
     interval = 500,
     total = 0,
