Changeset 8232 for branches/2.5/prototype/modules/calendar/js/init.js

Timestamp:

10/08/13 16:20:46 (11 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

File:

• branches/2.5/prototype/modules/calendar/js/init.js (modified) (6 diffs)

branches/2.5/prototype/modules/calendar/js/init.js

@@ -317 +317 @@
                 axisFormat: User.preferences.hourFormat,
                 eventSources: Calendar.sources,
-
+                
                 header: {
                         left: 'prev,next today,agendaWeek,' + ((User.preferences.defaultCalView == "basicDay") ? "basicDay" : "agendaDay"),
@@ -353 +353 @@
                 },
 
-
         eventRender: function( event, element, view ){
                     $('#calendar td.fc-year-have-event').removeClass('fc-year-have-event');
 
                         var img_icon = "";
- 
-            if( !!parseInt(event.unanswered)  ){ 
- 
-                img_icon = "mini-attention.png"; 
- 
-            }else{ 
- 
-                        if(event.type == 1)
-                                img_icon = "mini-event.png";
-                        if(event.type == 2)
-                                img_icon = "mini-task.png";
-                        if(event.type == 3)
-                                img_icon = "mini-activity.png";
-
-        }
-                
-            element.find(".fc-event-inner.fc-event-skin").prepend($('<img style="width: 11px; height: 13px;" class="" src="../prototype/modules/calendar/img/' + img_icon + '"></img>'));
+                        var status_ball = ""; //nome da imagem a ser inserida
+                        var status_img = "";
+
+            if( !!parseInt(event.unanswered) && event.type == 1 ){
+
+                img_icon = "mini-attention.png";
+
+            }else{
+
+                if(event.type == 1)
+                    img_icon = "mini-event.png";
+                if(event.type == 2)
+                    img_icon = "mini-task.png";
+                if(event.type == 3)
+                    img_icon = "mini-activity.png";
+
+                //se for diferente de evento(type 1).
+                if(event.type != 1){
+                    if(event.status == "1"){
+                        status_ball = "gray.png";
+                    }else if(event.status == "2"){
+                        status_ball = "yellow.png";
+                    }else if(event.status == "3"){
+                        status_ball = "green.png";
+                    }else if(event.status == "4"){
+                        status_ball = "red.png";
+                    }
+
+                    status_img = '<img style="width: 8px; height: 8px; margin-bottom: 2px;" src="../prototype/modules/calendar/img/' + status_ball + '"></img>';
+                }
+
+            }
+
+
+                        //html que exibe a imagem do type e do status
+            element.find(".fc-event-inner.fc-event-skin").prepend($('<img style="width: 11px; height: 13px;" class="" src="../prototype/modules/calendar/img/' + img_icon + '"></img>' + status_img));
                 },
 
@@ -477 +495 @@
                                 'type':     'question',
                                 'overlay_opacity': '0.5',
-                                'custom_class':  'occurrence-zebra', 
+                                'custom_class':  'occurrence-zebra',
                                 'width': 427,
                                 'buttons':  ['Editar todas ocorrências', 'Editar essa ocorrência', 'Cancelar'],
                                 'onClose':  function(clicked) {
                                     if(clicked == 'Editar todas ocorrências') {
-                                        var schedule = getSchedulable(evt.id, ''); 
-                                        schedule.calendar = evt.calendar; 
-                                        eventDetails( schedule , true); 
+                                        var schedule = getSchedulable(evt.id, '');
+                                        schedule.calendar = evt.calendar;
+                                        eventDetails( schedule , true);
 
                                     }else if (clicked == 'Editar essa ocorrência'){
@@ -493 +511 @@
                                         */      
                                         var repeat = mount_exception(evt.id, evt.occurrence);
-                                                                                          
+
                                         $('.calendar-copy-move input[name="typeEvent"]').val("3");
                                         
@@ -513 +531 @@
                     break;
                 case 3:
+                                        DataLayer.remove('taskToActivity', false);//Limpa o cache
                     var activity = getSchedulable(evt.id, '');
                     activity.group = evt.calendar;
@@ -565 +584 @@
 
     if( $.browser.msie ){
-
-        $('#divAppbox').css('width', $(window).width());
+        //$('#divAppbox').css('width', $(window).width());
+        $('#divAppbox').css({'height':'600px','max-width':'100%'});
     }