Changeset 7022 for trunk/prototype/modules/calendar/js

Timestamp:

08/15/12 12:07:23 (12 years ago)

Author:

marcieli

Message:

Ticket #3028 - Corrigidas telas de impressao na agenda, fontes, posicoes, icones.

Location:

trunk/prototype/modules/calendar/js

Files:

• calendar.codecs.js (modified) (4 diffs)
• helpers.js (modified) (7 diffs)
• init.js (modified) (1 diff)

trunk/prototype/modules/calendar/js/calendar.codecs.js

@@ -132 +132 @@
             return returns;
         };
-
         var res = $.map(evtObj, function( objEvent ){                   
             return {
@@ -1502 +1501 @@
 
     for(var i = 0; i < evtObj.length; i++){
-       res.push(DataLayer.encode('schedulable:' + (evtObj[i].type == '1' ?  'preview' : 'task'), evtObj[i]));
+       res.push(DataLayer.encode('schedulable:' + (evtObj[i].type == '1' ?  'preview' : ( !!evtObj[i].taskToActivity ? 'activity': 'task')) , evtObj[i]));
     }
 
@@ -1517 +1516 @@
 
         for (var i=0; i < res.length; i++) {
+                        res[i].type = (res[i].type == '2' && !!res[i].tasks) ? '3' : res[i].type;
+                
             var startDate = Date.parseExact( res[i]['startDate'], User.preferences.dateFormat );
             var endDate   = Date.parseExact( res[i]['endDate'], User.preferences.dateFormat );
@@ -1559 +1560 @@
         var next = start;
         var response = [];
-
         while (next){
             var index = dateCalendar.dayNames[new Date(next).getDay()] +' '+ new Date(next).toString('dd/MM');

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

@@ -102 +102 @@
 
 function printNow(){
-
+        if($("#calendar").fullCalendar('getView').name == "agendaWeek" || $("#calendar").fullCalendar('getView').name == "basicWeek" || $("#calendar").fullCalendar('getView').name == "year")
+                alert('A tela de impressão será melhor visualizada com a preferência "Paisagem" do seu browser selecionada.');
+                
         var window_print = window.open('','ExpressoCalendar','width=800,height=600,scrollbars=yes');        
         window_print.document.open();
@@ -118 +120 @@
                 } ));
         }
-        if($("#calendar").fullCalendar('getView').name == "agendaDay"){                         
+        if($("#calendar").fullCalendar('getView').name == "agendaDay" || $("#calendar").fullCalendar('getView').name == "basicDay"){                            
                 window_print.document.write(DataLayer.render('templates/calendar_day_print.ejs', {
                         'InfoPage' : $("#calendar").fullCalendar('getView').title,
@@ -124 +126 @@
                 } ));
         }
-        if($("#calendar").fullCalendar('getView').name == "agendaWeek"){
+        if($("#calendar").fullCalendar('getView').name == "agendaWeek" || $("#calendar").fullCalendar('getView').name == "basicWeek"){
                 window_print.document.write(DataLayer.render('templates/calendar_week_print.ejs', {
                         'InfoPage' : $("#calendar").fullCalendar('getView').title,
@@ -149 +151 @@
         }               
         window_print.document.close();
-        setTimeout(window_print.print(), 300);
+        window_print.print();
 }
 
@@ -164 +166 @@
         $('.fc-header-right').append(print);
         $('.fc-button-print').click(function(){
-            alert('A tela de impressão será melhor visualizada com a preferência "Paisagem" do seu browser selecionada.');
             printNow();
         });
@@ -2419 +2420 @@
                 listEvents.find('.fc-button').remove();
                 listEvents.find('.details-event-list').remove();
-                listEvents.find('.list-events-paginator').attr( "align" , "center"  );
+                listEvents.find('.list-events-paginator').remove();
                 listEvents = listEvents.html();
                 type = $(this).parents('.ui-tabs-panel').attr("id").split("_")[1];
+
                 var data = {
                         type : type == "tasks" ? "task-list" : ( type == "events" ? "event-list" : "search"),
-                        html : listEvents
+                        html : listEvents,
+                        InfoPage : $(this).parents('table.header-paginator').find( '.fc-header-title' ).text()
                 }
                 window_print.document.open();           
@@ -2618 +2621 @@
                                 var html = $(this).parents("td:first").clone();
                                 html.find(".menu-container.footer-container").remove();
+                                html.find(".fc-header-title").remove();
                                 var html = html.html();
                                 var data = {
                                         type : $(this).parents('.details-event-list').hasClass("details-event") ? "event-detail" : "task-detail",
-                                        html : html
+                                        html : html,
+                                        InfoPage : 'Detalhes: '+$(this).parents('tr.start-date').find('td span a').text()
                                 }
                                 window_print.document.open();           

trunk/prototype/modules/calendar/js/init.js

@@ -358 +358 @@
                                 img_icon = "mini-task.png";
                         if(event.type == 3)
-                                img_icon = "activity_icon.jpg";
+                                img_icon = "mini-activity.png";