From 38a3b7bb4f29aa676c7af0dccde3d87973b1007e Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Tue, 26 Aug 2014 13:36:42 -0400
Subject: [PATCH] print calendars events&Tasks with colors - either borders or
 backgrounds

---
 UI/Scheduler/UIxCalListingActions.m          |   2 +-
 UI/Scheduler/UIxCalViewPrint.h               |   4 +-
 UI/Scheduler/UIxCalViewPrint.m               |   2 +-
 UI/Templates/SchedulerUI/UIxCalViewPrint.wox |  51 ++--
 UI/WebServerResources/SchedulerUI.js         |  11 +-
 UI/WebServerResources/UIxCalViewPrint.css    |  21 +-
 UI/WebServerResources/UIxCalViewPrint.js     | 245 +++++++++++++++----
 7 files changed, 246 insertions(+), 90 deletions(-)

diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m
index 70964eac7..aa8749fb6 100644
--- a/UI/Scheduler/UIxCalListingActions.m
+++ b/UI/Scheduler/UIxCalListingActions.m
@@ -99,7 +99,7 @@ static NSArray *tasksFields = nil;
                    @"c_status", @"c_title", @"c_enddate",
                    @"c_classification", @"c_location", @"c_category",
                    @"editable", @"erasable",
-                   @"c_priority", nil];
+                   @"c_priority", @"c_owner", nil];
     [tasksFields retain];
   }
 }
diff --git a/UI/Scheduler/UIxCalViewPrint.h b/UI/Scheduler/UIxCalViewPrint.h
index a0977d594..dd3326bec 100644
--- a/UI/Scheduler/UIxCalViewPrint.h
+++ b/UI/Scheduler/UIxCalViewPrint.h
@@ -19,9 +19,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <SOGoUI/UIxComponent.h>
+#include <UIxCalendarSelector.h>
 
-@interface UIxCalViewPrint : UIxComponent
+@interface UIxCalViewPrint : UIxCalendarSelector
 {
   id item;
   SOGoUserSettings *us;
diff --git a/UI/Scheduler/UIxCalViewPrint.m b/UI/Scheduler/UIxCalViewPrint.m
index eb432c02a..813e2e2ad 100644
--- a/UI/Scheduler/UIxCalViewPrint.m
+++ b/UI/Scheduler/UIxCalViewPrint.m
@@ -80,7 +80,7 @@ static NSArray *layoutItems = nil;
   SOGoUser *activeUser;
   NSString *parentView;
   
-  activeUser = [context activeUser];
+  activeUser = [[self context] activeUser];
   us = [activeUser userSettings];
   parentView = [[us objectForKey:@"Calendar"] objectForKey:@"View" ];
   
diff --git a/UI/Templates/SchedulerUI/UIxCalViewPrint.wox b/UI/Templates/SchedulerUI/UIxCalViewPrint.wox
index f8370f0f5..3b344da12 100644
--- a/UI/Templates/SchedulerUI/UIxCalViewPrint.wox
+++ b/UI/Templates/SchedulerUI/UIxCalViewPrint.wox
@@ -8,7 +8,14 @@
   xmlns:label="OGo:label"
   className="UIxPageFrame"
   const:popup="YES">
-
+  <style type="text/css">
+      <var:foreach list="calendars" item="currentCalendar">
+          DIV.borderCalendarFolder<var:string value="currentCalendar.folder" />
+          { border: 1px solid <var:string value="currentCalendar.color" />; }
+          DIV.backgroundCalendarFolder<var:string value="currentCalendar.folder" />
+          { background-color: <var:string value="currentCalendar.color" />; color: <var:string value="contrastingTextColor" />; }
+      </var:foreach>
+  </style>
   <div id="leftSide" class="no-print">
     <!-- Print settings -->
     <span class="caption"><var:string label:value="Print Settings" /></span>
@@ -34,12 +41,10 @@
     <table class="frame">
       <tr>
         <td>
-          <label>
-            <input type="checkbox" id="printEvents" value="eventsSelected" checked="true" onChange="onEventsCheck(this);"/>
-            <var:string label:value="Events"/></label>
-          <label>
-            <input type="checkbox" id ="printTasks" value="tasksSelected" checked="true" onChange="onTasksCheck(this);"/>
-            <var:string label:value="Tasks"/></label></td></tr>
+          <input type="checkbox" id="printEvents" value="eventsSelected" checked="true" onChange="onEventsCheck(this);"/>
+          <var:string label:value="Events"/>
+          <input type="checkbox" id ="printTasks" value="tasksSelected" checked="true" onChange="onTasksCheck(this);"/>
+          <var:string label:value="Tasks"/></td></tr>
 <!-- TODO
       <tr>
         <td>
@@ -83,24 +88,32 @@
     <table class="frame">
       <tr>
         <td>
-          <label>
-            <input type="checkbox" name="printWorkingHours" id="printHours" checked="true" onChange="onPrintWorkingHoursCheck(this);" />
-            <var:string label:value="Display working hours only" /></label></td></tr>
+          <input type="checkbox" name="printWorkingHours" id="printHours" checked="true" onChange="onPrintWorkingHoursCheck(this);" />
+          <var:string label:value="Display working hours only" /></td></tr>
+      <tr>
+          <td>
+              <hr /></td></tr>
       <tr>
         <td>
-          <label>
-            <hr /></label></td></tr>
-      
+          <input type="checkbox" id="printColors" checked="true" onChange="onPrintColorsCheck(this);" />
+          <var:string label:value="Display events and tasks colors" /></td></tr>
       <tr>
         <td>
-          <label>
-            <input type="checkbox" name="printOptions" id="selectNoDueDateTasks" checked="true" onChange="onPrintNoDueDateTasksCheck(this);" />
-            <var:string label:value="Tasks with no due date" /></label></td></tr>
+          <input type="radio" name="printColors" id="printBorderColors" value="borders" onChange="onPrintColors(this);" selection="borders"/>
+          <var:string label:value="Borders" />
+          <input type="radio" name="printColors" id="printBackgroundColors" value="backgrounds" onChange="onPrintColors(this);" />
+          <var:string label:value="Backgrounds" /></td></tr>
       <tr>
         <td>
-          <label>
-            <input type="checkbox" name="printOptions" id="selectCompletedTasks" checked="true" onChange="onPrintCompletedTasksCheck(this);" />
-            <var:string label:value="Completed tasks" /></label></td></tr>
+          <hr /></td></tr>
+      <tr>
+        <td>
+          <input type="checkbox" name="printOptions" id="selectNoDueDateTasks" checked="true" onChange="onPrintNoDueDateTasksCheck(this);" />
+          <var:string label:value="Tasks with no due date" /></td></tr>
+      <tr>
+        <td>
+          <input type="checkbox" name="printOptions" id="selectCompletedTasks" checked="true" onChange="onPrintCompletedTasksCheck(this);" />
+          <var:string label:value="Completed tasks" /></td></tr>
     </table>
   </div>
   <div id="rightSide">
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index be9014c14..69f78c361 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1176,8 +1176,9 @@ function tasksListCallback(http) {
             // [9] Editable?
             // [10] Erasable?
             // [11] Priority (0, 1 = important, 9 = low)
-            // [12] Status CSS class (duelater, completed, etc)
-            // (13) Due date (formatted)
+            // [12] Owner
+            // [13] Status CSS class (duelater, completed, etc)
+            // [14] Due date (formatted)
 
             for (var i = 0; i < data.length; i++) {
                 var row = createElement("tr");
@@ -1189,7 +1190,7 @@ function tasksListCallback(http) {
                 var cname = escape(data[i][0]);
                 row.setAttribute("id", calendar + "-" + cname);
                 //listItem.addClassName(data[i][5]); // Classification
-                row.addClassName(data[i][12]); // status
+                row.addClassName(data[i][14]); // status
                 row.addClassName("taskRow");
                 row.calendar = calendar;
                 row.cname = cname;
@@ -1234,8 +1235,8 @@ function tasksListCallback(http) {
 
                 cell = createElement("td");
                 row.appendChild(cell);
-                if (data[i][13])
-                    cell.update(data[i][13]); // end date
+                if (data[i][14])
+                    cell.update(data[i][14]); // end date
 
                 cell = createElement("td");
                 row.appendChild(cell);
diff --git a/UI/WebServerResources/UIxCalViewPrint.css b/UI/WebServerResources/UIxCalViewPrint.css
index b948e2b0c..6adafa0c5 100644
--- a/UI/WebServerResources/UIxCalViewPrint.css
+++ b/UI/WebServerResources/UIxCalViewPrint.css
@@ -74,11 +74,9 @@ DIV#rightFrameTitle {
 
 .overdueTasks {
   color:red;
-  text-align:center;
 }
 .completedTasks {
   font-style:italic;
-  text-align:center;
 }
 
 DIV#rightSide {
@@ -118,7 +116,7 @@ DIV#rightSide {
         text-align: left;
     }
 
-    DIV#rightFrame TD.label {
+    DIV#rightFrame TD.cellFormat {
         color: #666;
         text-align: right;
         min-width:52px;
@@ -159,6 +157,7 @@ DIV#calendarHeader DIV.days {
   height: 1px;
   left: 0;
   right: 0;
+  cursor:initial;
 }
 
 DIV#daysView {
@@ -174,6 +173,7 @@ DIV#daysView DIV.hours {
 
 DIV#daysView DIV.day DIV.clickableHourCell {
  height: 29px;
+ cursor:initial;
 }
 
 DIV#daysView DIV.hour {
@@ -190,8 +190,9 @@ DIV.event {
   border:1px solid black;
 
 }
-DIV.eventInside {
+DIV.event > DIV.eventInside {
   width:100%;
+  cursor:initial;
 }
 
 DIV#daysView DIV.event.starts0
@@ -610,20 +611,24 @@ LABEL {
   .no-print, SPAN.caption, SPAN.weeksHeader, SPAN.daysHeader {
     display:none;
   }
+  BODY, DIV#calendarHeader DIV.dayLabels DIV.day, DIV#calendarHeader DIV.days DIV.weekEndDay, DIV#daysView DIV.day DIV.clickableHourCell.outOfDay,
+  DIV#daysView DIV.weekEndDay DIV.clickableHourCell, DIV#daysView DIV.weekEndDay DIV.clickableHourCell.outOfDay,DIV#monthDaysView DIV.dayOfToday, 
+  DIV.daysViewFor7Days#calendarHeader DIV.days DIV.dayOfToday, DIV.daysViewFor7Days#daysView DIV.dayOfToday DIV.clickableHourCell {
+    background-color:white;
+  }
 
   DIV#rightSide {
     position:static;
     top:5px;
     left:5px;
-
   }
 
   DIV#rightFrame {
     border:none;
     overflow:visible;
   }
-
-  BODY {
-    background-color:white;
+  
+  DIV#calendarHeader DIV.calendarLabels {
+    font-size:120%;
   }
 }
diff --git a/UI/WebServerResources/UIxCalViewPrint.js b/UI/WebServerResources/UIxCalViewPrint.js
index 9a0eb59a5..0fe3a6385 100644
--- a/UI/WebServerResources/UIxCalViewPrint.js
+++ b/UI/WebServerResources/UIxCalViewPrint.js
@@ -24,7 +24,8 @@
 /******************************** Global variables *******************************************/
 var firstDayOfWeek = window.opener.firstDayOfWeek;
 var printCompletedTasks=1;
-var printNoDueDateTasks=1;
+var printNoDueDateTasks=true;
+var printColors= { checked:true, style:"borders" };
 var eventsBlocks;
 var currentPreview;
 var currentDay = window.parentvar("currentDay");
@@ -42,12 +43,10 @@ function updateDisplayView(data, newView) {
     var url = ApplicationBaseURL + "/" + newView;
     var day = null;
 
-    if (data) {
+    if (data)
         day = data['day'];
-    }
     if (!day)
         day = currentDay;
-
     if (day) {
         if (data) {
             var dayDiv = $("day"+day);
@@ -64,22 +63,21 @@ function updateDisplayView(data, newView) {
                     selectedCell = selectedLink[0].getParentWithTagName("td");
                     $(selectedCell).selectElement();
                     document.selectedDate = selectedCell;
-                } else
+                }
+                else
                     document.selectedDate = null;
 
                 setSelectedDayDate(day);
 
                 return false;
             }
-            else if (day.length == 6) {
+            else if (day.length == 6)
                 day += "01";
-            }
         }
         url += "?day=" + day;
     }
-
     selectedCalendarCell = null;
-    
+
     if (document.dayDisplayAjaxRequest) {
         document.dayDisplayAjaxRequest.aborted = true;
         document.dayDisplayAjaxRequest.abort();
@@ -95,24 +93,22 @@ function previewDisplayCallback(http) {
         $("currentViewMenu").remove();
         $("listCollapse").remove();
 
-        if (currentPreview == "multicolumndayview") {
+        if (currentPreview == "multicolumndayview")
             _drawCalendarAllDayEvents(null, null, eventsBlocks);
-        }
         else {
             allDayEventsList = eventsBlocks[1];
             if (currentPreview == "monthview") {
                 //_drawMonthCalendarEvents(eventsList, eventsBlocks[0], null);
             }
-            else {
+            else
                 _drawCalendarAllDayEvents(allDayEventsList, eventsBlocks[0], null);
-            }
         }
-        // This ensure the diplay working hours checkbox when switching views
+        // This ensure to diplay working hours checkbox when switching views
         var printHoursCheckBox = $("printHours");
         onPrintWorkingHoursCheck(printHoursCheckBox);
         
         // Add events color for each calendars
-        addCalendarsColor();
+        //addCalendarsColor();
     }
     else
         log ("calendarDisplayCallback Ajax error ("+ http.readyState + "/" + http.status + ")");
@@ -147,11 +143,11 @@ function refreshEvents() {
     if (!currentDay)
         currentDay = todayDate.getDayString();
 
-    if (currentPreview == "dayview" || currentPreview == "multicolumndayview") { // dayView and MultiColumns View
+    if (currentPreview == "dayview" || currentPreview == "multicolumndayview") {
         sd = currentDay;
         ed = sd;
     }
-    else if (currentPreview == "weekview") { // WeekView
+    else if (currentPreview == "weekview") {
         var startDate;
         startDate = currentDay.asDate();
         startDate = startDate.beginOfWeek();
@@ -266,14 +262,25 @@ function _drawTasksCells(tasksBlocks) {
     var task = _("Tasks");
     $("rightFrameTasks").insert("<h3>"+task+"</h3>");
     for(var i=0; i < tasksBlocks.length; i++) {
-        if (!(printNoDueDateTasks == 0 && tasksBlocks[i][5] == null)) {
+        if (!(printNoDueDateTasks == false && tasksBlocks[i][5] == null)) {
             var task = _parseTask(tasksBlocks[i]);
             $("rightFrameTasks").insert(task);
         }
     }
 }
 
-// TODO : Maybe use the drawfunction from the schedulerUI.js
+function addColorsOnEvents(eventInside, eventCell) {
+    if (printColors.checked == true) {
+        if (printColors.style == "borders") {
+            var string = "borderC" + eventInside.getAttribute("class").split(" ")[1].substr(1);
+            Element.addClassName(eventCell, string);
+        }
+        else if(printColors.style == "backgrounds") {
+            var string = "backgroundC" + eventInside.getAttribute("class").split(" ")[1].substr(1);
+            Element.addClassName(eventInside, string);
+        }
+    }
+}
 
 function _drawCalendarEvents(events, eventsData, columnsData) {
     var daysView = $("daysView");
@@ -303,11 +310,15 @@ function _drawCalendarEvents(events, eventsData, columnsData) {
                             var offset = _computeOffset(parentDiv);
                             if ((eventRep.start - offset[0]) > 0 && (eventRep.start - offset[0]) < offset[1]) {
                                 var eventCell = newEventDIV(eventRep, calendarEventsData[nbr], offset[0]);
+                                var eventInside = eventCell.down(".eventInside");
+                                addColorsOnEvents(eventInside, eventCell);
                                 parentDiv.appendChild(eventCell);
                             }
                         }
                         else {
                             var eventCell = newEventDIV(eventRep, calendarEventsData[nbr], null);
+                            var eventInside = eventCell.down(".eventInside");
+                            addColorsOnEvents(eventInside, eventCell);
                             parentDiv.appendChild(eventCell);
                         }
                     }
@@ -329,11 +340,15 @@ function _drawCalendarEvents(events, eventsData, columnsData) {
                             var offset = _computeOffset(parentDiv);
                             if ((eventRep.start - offset[0]) > 0 && (eventRep.start - offset[0]) < offset[1]) {
                                 var eventCell = newEventDIV(eventRep, eventsData[nbr], offset[0]);
+                                var eventInside = eventCell.down(".eventInside");
+                                addColorsOnEvents(eventInside, eventCell);
                                 parentDiv.appendChild(eventCell);
                             }
                         }
                         else {
                             var eventCell = newEventDIV(eventRep, eventsData[nbr], null);
+                            var eventInside = eventCell.down(".eventInside");
+                            addColorsOnEvents(eventInside, eventCell);
                             parentDiv.appendChild(eventCell);
                         }
                     }
@@ -502,10 +517,18 @@ function appendStyleElement(folderPath, color) {
     if (document.styleSheets) {
         var fgColor = getContrastingTextColor(color);
         var styleElement = document.styleSheets[3];
-
-        styleElement.insertRule(".calendarFolder" + folderPath +
-                                "{background-color: " + color + " !important;" +
-                                " color: " + fgColor + " !important;}", styleElement.cssRules.length);
+        
+        if (printColors.style == "backgrounds") {
+            styleElement.insertRule(".calendarFolder" + folderPath +
+                                    "{background-color: " + color + " !important;" +
+                                    " color: " + fgColor + " !important;" +
+                                    " border: none;}", styleElement.cssRules.length);
+        }
+        else if (printColors.style == "borders")
+            styleElement.insertRule(".calendarFolder" + folderPath +
+                                    "{background-color: none" +
+                                    " color: none" +
+                                    " border:1px solid " + color + " !important;}", styleElement.cssRules.length);
     }
 }
 
@@ -513,49 +536,144 @@ function _parseEvent(event) {
     // Localized strings :
     var start = _("Start:");
     var end = _("End:");
-    var Location = _("Location:");
-    var Calendar = _("Calendar:");
+    var location = _("Location:");
+    var calendar = _("Calendar:");
 
-    var parsedEvent;
+    var newEvent = document.createElement("div");
+    var table = document.createElement("table");
+    Element.addClassName(newEvent, "divEventsPreview");
+
+    var row = table.insertRow(0);
+    row.insertCell(0);
+    var title = row.insertCell(1);
+    row = table.insertRow(1);
+    var startCell = row.insertCell(0);
+    Element.addClassName(startCell, "cellFormat");
+    var startCellValue = row.insertCell(1);
+    row = table.insertRow(2);
+    var endCell = row.insertCell(0);
+    Element.addClassName(endCell, "cellFormat");
+    var endCellValue = row.insertCell(1);
+    row = table.insertRow(3);
+    var locationCell = row.insertCell(0);
+    Element.addClassName(locationCell, "cellFormat");
+    var locationCellValue = row.insertCell(1);
+    row = table.insertRow(4);
+    var calendarCell = row.insertCell(0);
+    Element.addClassName(calendarCell, "cellFormat");
+    var calendarCellValue = row.insertCell(1);
+    
+    title.innerHTML = event[4];
+    startCell.innerHTML = start;
     var startDate = new Date(event[5] *1000);
+    startCellValue.innerHTML = startDate.toLocaleString();
+    endCell.innerHTML = end;
     var endDate = new Date(event[6] *1000);
-	parsedEvent = "<div class=\"divEventsPreview\"><table>";
-    parsedEvent += "<tr><th></th><th>"+ event[4] +"</th></tr>";
-    parsedEvent += "<tr><td class=\"label\">" + start + "</td><td>" + startDate.toLocaleString() + "</td></tr>";
-    parsedEvent += "<tr><td class=\"label\">" + end + "</td><td>" + endDate.toLocaleString() + "</td></tr>";
-    if (event[7] != "")
-        parsedEvent += "<tr><td class=\"label\">"+ Location +"</td><td>" + event[7] + "</td></tr>";
-    parsedEvent += "<tr><td class=\"label\">"+ Calendar +"</td><td>" + event[2] + "</td></tr>";
-    parsedEvent += "</table></div>";
-	return parsedEvent;
+    endCellValue.innerHTML = endDate.toLocaleString();
+    locationCell.innerHTML = location;
+    locationCellValue.innerHTML = event[7];
+    calendarCell.innerHTML = calendar;
+    calendarCellValue.innerHTML = event[2];
+
+    if (printColors.checked) {
+        var allColors = window.parentvar("UserSettings")['Calendar']['FolderColors'];
+        var owner = event[13];
+        var folderName = event[1];
+        var color = allColors[owner + ":Calendar/" + folderName];
+        var fgColor = getContrastingTextColor(color);
+        
+        if (printColors.style == "backgrounds") {
+            newEvent.writeAttribute("style", "background-color:" + color + "; color:" + fgColor + ";");
+            startCell.writeAttribute("style", "color:" + fgColor + ";");
+            endCell.writeAttribute("style", "color:" + fgColor + ";");
+            locationCell.writeAttribute("style", "color:" + fgColor + ";");
+            calendarCell.writeAttribute("style", "color:" + fgColor + ";");
+            
+        }
+        else if (printColors.style == "borders")
+            newEvent.writeAttribute("style", "border:2px solid " + color + ";");
+    }
+    if (event[7] == "") {
+        locationCell.hide();
+        locationCellValue.hide();
+    }
+    newEvent.appendChild(table);
+
+    return newEvent;
 }
 
 function _parseTask(task) {
-    var parsedTask;
+    // new code
     var end = _("Due Date:");
-    var Calendar = _("Calendar:");
-    var Location = _("Location:");
-    
-    parsedTask = "<div class=\"divTasksPreview\"><table>";
-    if (task[12] == "overdue")
-        parsedTask += "<tr><th></th><th class=\"overdueTasks\">"+ task[4] +"</th></tr>";
-    else if (task[12] == "completed") {
-        parsedTask += "<tr><th></th><th class=\"completedTasks\">"+ task[4] +"</th></tr>";
-    }
-    else
-        parsedTask += "<tr class=\"tasksTitle\"><th></th><th>"+ task[4] +"</th></tr>";
+    var calendar = _("Calendar:");
+    var location = _("Location:");
 
+    var newTask = document.createElement("div");
+    var table = document.createElement("table");
+    Element.addClassName(newTask, "divTasksPreview");
+
+    var row = table.insertRow(0);
+    row.insertCell(0);
+    var title = row.insertCell(1);
+    row = table.insertRow(1);
+    var endCell = row.insertCell(0);
+    var endCellValue = row.insertCell(1);
+    row = table.insertRow(2);
+    var locationCell = row.insertCell(0);
+    var locationCellValue = row.insertCell(1);
+    row = table.insertRow(3);
+    var calendarCell = row.insertCell(0);
+    var calendarCellValue = row.insertCell(1);
+
+    title.innerHTML = task[4];
     if (task[5] != null) {
+        endCell.innerHTML = end;
         var endDate = new Date(task[5] *1000);
-        parsedTask += "<tr><td class=\"label\">"+ end +"</td><td>"+ endDate.toLocaleString() + "</td></tr>";
+        endCellValue.innerHTML = endDate.toLocaleString();
+    }
+    else {
+        endCell.hide();
+        endCellValue.hide();
     }
     if (task[7] != "") {
-        parsedTask += "<tr><td class=\"label\">"+ Location +"</td><td>" + task[7] + "</td></tr>";
+        locationCell.innerHTML = location;
+        locationCellValue.innerHTML = task[7];
+    }
+    else {
+        locationCell.hide();
+        locationCellValue.hide();
+    }
+    calendarCell.innerHTML = calendar;
+    calendarCellValue.innerHTML = task[2];
+    
+    if (task[13] == "overdue")
+        Element.addClassName(title, "overdueTasks");
+    else if (task[13] == "completed")
+        Element.addClassName(title, "completedTasks");
+    else
+        Element.addClassName(title, "tasksTitle");
+    
+    if (printColors.checked) {
+        var allColors = window.parentvar("UserSettings")['Calendar']['FolderColors'];
+        var owner = task[12];
+        var folderName = task[1];
+        var color = allColors[owner + ":Calendar/" + folderName];
+        var fgColor = getContrastingTextColor(color);
+        
+        if (printColors.style == "backgrounds") {
+            newTask.writeAttribute("style", "background-color:" + color + "; color:" + fgColor + ";");
+            endCell.writeAttribute("style", "color:" + fgColor + ";");
+            locationCell.writeAttribute("style", "color:" + fgColor + ";");
+            calendarCell.writeAttribute("style", "color:" + fgColor + ";");
+            
+        }
+        else if (printColors.style == "borders")
+            newTask.writeAttribute("style", "border:2px solid " + color + ";");
     }
-    parsedTask += "<tr><td class=\"label\">" + Calendar + "</td><td>" + task[2] + "</td></tr>";
-    parsedTask += "</table></div>";
 
-    return parsedTask;
+    newTask.appendChild(table);
+
+    return newTask;
 }
 
 function _computeOffset(hoursCells) {
@@ -834,14 +952,33 @@ function onPrintWorkingHoursCheck(checkBox) {
         _drawCalendarEvents(null, null, eventsBlocks);
     else {
         eventsList = eventsBlocks[2];
-        if (currentPreview == "monthview")
+        if (currentPreview == "monthview") {
             //_drawMonthCalendarEvents(eventsList, eventsBlocks[0], null);
+        }
         else
             _drawCalendarEvents(eventsList, eventsBlocks[0], null);
     }
     return false;
 }
 
+function onPrintColorsCheck(checkBox) {
+    printColors.checked = (checkBox.checked ? true : false);
+    
+    if (printColors.checked) {
+        $("printBackgroundColors").disabled = false;
+        $("printBorderColors").disabled = false;
+    }
+    else {
+        $("printBackgroundColors").disabled = true;
+        $("printBorderColors").disabled = true;
+    }
+    refreshContent();
+}
+
+function onPrintColors(selectedRadioButton) {
+    printColors.style = selectedRadioButton.value;
+    refreshContent();
+}
 /*function onPrintDateCheck() {
  var dateRange = document.getElementsByName("dateRange");
  var customDate = document.getElementById("customDate");
@@ -856,7 +993,7 @@ function onPrintCompletedTasksCheck(checkBox) {
 }
 
 function onPrintNoDueDateTasksCheck(checkBox) {
-    printNoDueDateTasks = (checkBox.checked ? 1 : 0);
+    printNoDueDateTasks = (checkBox.checked ? true : false);
     refreshContent();
 }