Changeset 5705

Timestamp:

03/12/12 16:19:02 (11 years ago)

Author:

thiago

Message:

Ticket #2486 - Corrigido o bug das janelas de alarmes.

Location:

trunk/prototype/modules/mail

Files:

• js/followupflag.js (modified) (3 diffs)
• templates/followupflag_alarm_list.ejs (modified) (1 diff)

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

@@ -435 +435 @@
                 }
         ];
-
+var i = 0;
         while (it = toIterate.pop()){
                 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}});
                 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');
-                                alarmInRange[i].alarmDeadline = date.toString('hh:mm');
+                                if(it.attrDeadline == 'doneDeadline'){
+                                        var date = Date.parseExact(alarmInRange[i].doneDeadline, 'yyyy-MM-dd hh:mm:ss');
+                                        alarmInRange[i].doneDeadline = date.toString('hh:mm');
+                                } else {
+                                        var date = Date.parseExact(alarmInRange[i].alarmDeadline, 'yyyy-MM-dd hh:mm:ss');
+                                        alarmInRange[i].alarmDeadline = date.toString('hh:mm');
+                                }
                         }
                         var caption = (alarmInRange.length == 1) ?
@@ -449 +454 @@
                                 get_lang(it.caption.plural, alarmInRange.length);
                                 
-                        var data = {alarmInRange : alarmInRange, caption: caption};
+                        var data = {alarmInRange : alarmInRange, caption: caption, it : it};
                         var dialogText = DataLayer.render("../prototype/modules/mail/templates/followupflag_alarm_list.ejs", data);
                         
@@ -469 +474 @@
                                 'vcenter_short_message': false,
                                 'position': ['right - 20', 'bottom - ' + offsetHeight.toString() ],
-                                'custom_class': 'right-bottom followupflag-alarm '+ it.attrDeadline,
+                                'custom_class': 'right-bottom followupflag-alarm '+it.attrDeadline,
                         }).dialog;
                         

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

@@ -9 +9 @@
         <li class="message-item">
                 <a onclick="<%=openMessageScript%>">
-                        <%= data.alarmInRange[i].alarmDeadline %> - <%= data.alarmInRange[i].followupflag.name %> - <%= data.alarmInRange[i].message.headers.subject %>
+                        <%= (it.attrDeadline == 'alarmDeadline') ? data.alarmInRange[i].alarmDeadline : data.alarmInRange[i].doneDeadline %> - <%= data.alarmInRange[i].followupflag.name %> - <%= data.alarmInRange[i].message.headers.subject %>
                 </a>
         </li>