Changeset 5664

Timestamp:

03/07/12 16:01:39 (11 years ago)

Author:

thiago

Message:

Ticket #2486 - Correção na atualização das tuplas na tabela de flags. Melhoria

Location:

trunk/prototype/modules/mail

Files:

• js/followupflag.js (modified) (6 diffs)
• templates/followupflag_configure.ejs (modified) (3 diffs)

trunk/prototype/modules/mail/js/followupflag.js

@@ -165 +165 @@
         var saveFollowupflagged = function(){
                 var idFollowupflagged = winElement.find('[name="followupflagId"]').val();
-                        if(idFollowupflagged.length > 0){
-                                idFollowupflagged = idFollowupflagged.split(',');
-                        } else {
-                                idFollowupflagged = false;
+                        idFollowupflagged = idFollowupflagged.split(',');
+                        for(x=0; x<idFollowupflagged.length; x++){
+                                (idFollowupflagged[x] == "false") ? idFollowupflagged[x] = false : idFollowupflagged;
                         }
                 for(i=0; i<selectedMessageIds.length; i++){
@@ -197 +196 @@
                                                         isDone: isDone,
                                                         backgroundColor : backgroundColor
-                                                }, !!idFollowupflagged ? {id: idFollowupflagged[i]} : {});
+                                                }, !!idFollowupflagged[i] ? {id: idFollowupflagged[i]} : {});
                                         
                                         if (alarmDate = winElement.find('[name="alarmDate"]').datepicker("getDate")) {
@@ -243 +242 @@
                                         followupflags = DataLayer.get('followupflagged',{criteria:{order: 'id'}}, true);                
                                         var id = followupflags[followupflags.length - 1].id;
-                                        winElement.find('[name="followupflagId"]').val(id);
+                                        winElement.find('[name="followupflagId"]').val(idFollowupflagged[i]);
                                         winElement.find('.menu-configure-followupflag .delete').button("option", "disabled", false);
                                         updateCacheFollowupflag(selectedMessageIds, folders, true);
@@ -291 +290 @@
                                         if(current_folder == folder_name){
                                                 $('#td_message_followup_' + messageNumber + ', ' + 
-                                                  'tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", '#CCC').attr('title', '');;
+                                                  'tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", '#CCC');
                                                 $('#td_message_followup_' + messageNumber + ', ' + 
                                                         'tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited")
                                                         .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0");
                                         }else{
-                                                $('tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", '#CCC').attr('title', '');;
+                                                $('tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", '#CCC');
                                                 $('tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited")
                                                         .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0");
@@ -429 +428 @@
                 if (!it.enable) continue;
                 
-                var alarmInRange = DataLayer.get('followupflagged', {filter: ['AND', ['>', it.attrDeadline, (new Date()).set({hour:0, minute:0, second:0}).toString('yyyy-MM-dd 00:00:00')], ['<', it.attrDeadline, (new Date()).set({hour:0, minute:0, second:0}).addHours(24).toString('yyyy-MM-dd 00:00:00')]], criteria: {deepness: 1}});
+                var alarmInRange = DataLayer.get('followupflagged', {filter: ['AND', ['>', it.attrDeadline, (new Date()).set({hour:0, minute:0, second:0}).toString('yyyy-MM-dd 00:00:00')], ['<', toIterate.attrDeadline, (new Date()).set({hour:0, minute:0, second:0}).addHours(24).toString('yyyy-MM-dd 00:00:00')]], criteria: {deepness: 1}});
                 if(alarmInRange.length > 0){
                         for(var i=0; i<alarmInRange.length; i++){
                                 var date = Date.parseExact(alarmInRange[i].alarmDeadline, 'yyyy-MM-dd hh:mm:ss');
-                                if(date)
-                                        alarmInRange[i].alarmDeadline = date.toString('hh:mm');
+                                alarmInRange[i].alarmDeadline = date.toString('hh:mm');
                         }
                         var caption = (alarmInRange.length == 1) ?
@@ -459 +457 @@
                                 'vcenter_short_message': false,
                                 'position': ['right - 20', 'bottom - ' + offsetHeight.toString() ],
-                                'custom_class': 'right-bottom followupflag-alarm'
+                                'custom_class': 'right-bottom followupflag-alarm',
                         }).dialog;
 

trunk/prototype/modules/mail/templates/followupflag_configure.ejs

@@ -40 +40 @@
                 }
         }
-        flagsId = "";
-        
+        var flagsId = new Array();
         for(x=0; x<data.messages.length; x++){
-                if(data.messages[x].followupflagged){
-                                var flagId = data.messages[x].followupflagged.id;
-                                (x+1 == data.messages.length) ? flagsId+= flagId : flagsId+= flagId+",";
-                } else {
-                        flagsId = false;
-                }
-        } 
+                if(data.messages[x].followupflagged)
+                        flagsId[x] = data.messages[x].followupflagged.id;
+                 else 
+                        flagsId[x] = 1; 
+        }
 %>
 <div class="followupflag-container">
@@ -65 +62 @@
                         <div class="alarm-fields">
                                 <input type="checkbox" name="alarm" <%=(followupflagged.alarmDeadline) ? 'checked="checked"' : '' %> /><label><%= get_lang("Alarm")%>: </label>
-                                <input type="text" name="alarmDate" class="date" size="10" value="<%=(followupflagged.alarmDeadline) ? followupflagged.alarmDeadline.toString('dd/MM/yyyy') : '' %>" /> ás 
+                                <input type="text" name="alarmDate" class="date" size="9" value="<%=(followupflagged.alarmDeadline) ? followupflagged.alarmDeadline.toString('dd/MM/yyyy') : '' %>" /> ás 
                                 <input type="text" name="alarmTime" class="time" size="8" value="<%=(followupflagged.alarmDeadline) ? followupflagged.alarmDeadline.toString('hh:mm') : '' %>" />
                         </div>          
@@ -74 +71 @@
                 <div class="right-data input-done">
                         <label><%= get_lang("Conclusion")%>:</label>
-                        <input <%=(followupflagged.isDone && followupflagged.isDone != '0') ? 'disabled="disabled"' : '' %> type="text" name="doneDate" class="date" size="10" value="<%=(followupflagged.doneDeadline) ? followupflagged.doneDeadline.toString('dd/MM/yyyy') : '' %>" /> ás 
+                        <input <%=(followupflagged.isDone && followupflagged.isDone != '0') ? 'disabled="disabled"' : '' %> type="text" name="doneDate" class="date" size="8" value="<%=(followupflagged.doneDeadline) ? followupflagged.doneDeadline.toString('dd/MM/yyyy') : '' %>" /> ás 
                         <input <%=(followupflagged.isDone && followupflagged.isDone != '0') ? 'disabled="disabled"' : '' %> type="text" name="doneTime" class="time" size="8" value="<%=(followupflagged.doneDeadline) ? followupflagged.doneDeadline.toString('hh:mm') : '' %>" />
                 </div>