more view refactoring. get week view's next/previous/goto functions implemented

calendar/lightning/content/calendarView.js

@@ -75,7 +75,6 @@ calendarView.prototype = {
         this.goToDay(today);
     },
 
-    /*
     goToDay: function(date) {
 
     },
@@ -86,11 +85,20 @@ calendarView.prototype = {
 
     goToPrevious: function() {
     },
-    */
 
     
     /* protected stuff */
-
+    removeElementsByAttribute: function(attributeName, attributeValue) {
+        var liveList = document.getElementsByAttribute(attributeName, attributeValue);
+        // Delete in reverse order.  Moz1.8+ getElementsByAttribute list is
+        // 'live', so when an element is deleted the indexes of later elements
+        // change, but in Moz1.7- list is 'dead'.  Reversed order works with both.
+        for (var i = liveList.length - 1; i >= 0; i--) {
+            var element = liveList.item(i);
+            if (element.parentNode != null) 
+                element.parentNode.removeChild(element);
+        }
+    },
 
 
     /* private stuff */

calendar/lightning/content/weekView.js

@@ -35,6 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+
 function insertWeekView()
 {
     // there is no id on the vbox we want to insret stuff in to...
@@ -55,14 +56,162 @@ window.addEventListener("load", "insertWeekView", false);
 weekView.prototype = {
     __proto__: calendarView ? (new calendarView()) : {},
 
+    refresh: function() {
+        // clean up anything that was here before
+        this.removeElementsByAttribute("eventbox", "weekview");
+
+        // XXX we need to do a lot more work to update column headers, etc here as well.
+
+        this.__proto__.refresh();
+    },
 
     goToDay: function(date) {
+        // compute this.startDate and this.endDate from date
+        this.startDate = date.clone();
+        this.endDate = date.clone();
+
+        this.startDate.day -= this.startDate.weekday;
+        this.startDate.hour = this.startDate.minute = this.startDate.second = 0;
+        this.startDate.normalize();
+
+        this.endDate.day += (6 - this.endDate.weekday);
+        this.endDate.hour = 23;
+        this.endDate.minute = 59;
+        this.endDate.second = 59;
+        this.endDate.normalize();
+
+        this.refresh();
     },
 
     goToNext: function() {
+        var currentEndDate = this.endDate.clone();
+        currentEndDate.day += 7;
+        currentEndDate.normalize();
+        goToDay(currentEndDate);
     },
-    
+
     goToPrevious: function() {
+        var currentEndDate = this.endDate.clone();
+        currentEndDate.day -= 7;
+        currentEndDate.normalize();
+        goToDay(currentEndDate);
     },
 
 };
+
+
+WeekView.prototype.createEventBoxInternal = function(itemOccurrence, startDate, endDate)
+{
+    var calEvent = itemOccurrence.item.QueryInterface(Components.interfaces.calIEvent);
+
+    // Check if the event is within the bounds of events to be displayed.
+    if ((endDate.jsDate < this.displayStartDate) ||
+        (startDate.jsDate > this.displayEndDate))
+        return;
+
+    // XXX Should this really be done? better would be to adjust the
+    // lowestStart and highestEnd
+    if ((endDate.hour < this.lowestStartHour) ||
+        (startDate.hour > this.highestEndHour))
+        return;
+
+    if (startDate.hour < this.lowestStartHour) {
+        startDate.hour = this.lowestStartHour;
+        startDate.normalize();
+    }
+    if (endDate.hour > this.highestEndHour) {
+        endDate.hour = this.highestEndHour;
+        endDate.normalize();
+    }
+
+    dump(startDate+" "+endDate+"\n");
+    dump(this.displayEndDate+"\n");
+
+    /*
+      if (calEvent.isAllDay) {
+      endDate = endDate.clone();
+      endDate.hour = 23;
+      endDate.minute = 59;
+      endDate.normalize();
+      }
+    */
+    debug("all day:   " + calEvent.isAllDay + "\n");
+    debug("startdate: " + startDate + "\n");
+    debug("enddate:   " + endDate + "\n");
+
+    var startHour = startDate.hour;
+    var startMinutes = startDate.minute;
+    var eventDuration = (endDate.jsDate - startDate.jsDate) / (60 * 60 * 1000);
+
+    debug("duration:  " + eventDuration + "\n");
+
+    var eventBox = document.createElement("vbox");
+
+    // XXX Consider changing this to only store the ID
+    eventBox.event = calEvent;
+
+    var ElementOfRef = document.getElementById("week-tree-day-" + gRefColumnIndex + "-item-" + startHour) ;
+    var hourHeight = ElementOfRef.boxObject.height;
+    var ElementOfRefEnd = document.getElementById("week-tree-day-" + gRefColumnIndex + "-item-" + endDate.hour) ;
+    var hourHeightEnd = ElementOfRefEnd.boxObject.height;
+   
+    var hourWidth = ElementOfRef.boxObject.width;
+    var eventSlotWidth = Math.round(hourWidth / 1/*calendarEventDisplay.totalSlotCount*/);
+   
+    var Width = ( 1 /*calendarEventDisplay.drawSlotCount*/ * eventSlotWidth ) - 1;
+    eventBox.setAttribute( "width", Width );
+
+    var top = eval( ElementOfRef.boxObject.y + ( ( startMinutes/60 ) * hourHeight ) );
+    top = top - ElementOfRef.parentNode.boxObject.y - 2;
+    eventBox.setAttribute("top", top);
+
+    var bottom = eval( ElementOfRefEnd.boxObject.y + ( ( endDate.minute/60 ) * hourHeightEnd ) );
+    bottom = bottom - ElementOfRefEnd.parentNode.boxObject.y - 2;
+    eventBox.setAttribute("height", bottom - top);
+
+    // figure out what column we need to put this on
+    debug("d: "+gHeaderDateItemArray[1].getAttribute("date")+"\n");
+    var dayIndex = new Date(gHeaderDateItemArray[1].getAttribute("date"));
+    var index = startDate.weekday - dayIndex.getDay();
+    debug("index is:" + index + "(" + startDate.weekday + " - " + dayIndex.getDay() + ")\n");
+
+    var boxLeft = document.getElementById("week-tree-day-"+index+"-item-"+startHour).boxObject.x - 
+                  document.getElementById( "week-view-content-box" ).boxObject.x +
+                  ( /*calendarEventDisplay.startDrawSlot*/0 * eventSlotWidth );
+    //dump(boxLeft + "\n");
+    eventBox.setAttribute("left", boxLeft);
+   
+    // set the event box to be of class week-view-event-class and the appropriate calendar-color class
+    this.setEventboxClass(eventBox, calEvent, "week-view");
+  
+    eventBox.setAttribute("eventbox", "weekview");
+    eventBox.setAttribute("dayindex", index + 1);
+    eventBox.setAttribute("onclick", "weekEventItemClick(this, event)" );
+    eventBox.setAttribute("ondblclick", "weekEventItemDoubleClick(this, event)");
+    eventBox.setAttribute("ondraggesture", "nsDragAndDrop.startDrag(event,calendarViewDNDObserver);");
+    eventBox.setAttribute("ondragover", "nsDragAndDrop.dragOver(event,calendarViewDNDObserver)");
+    eventBox.setAttribute("ondragdrop", "nsDragAndDrop.drop(event,calendarViewDNDObserver)");
+    eventBox.setAttribute("id", "week-view-event-box-" + calEvent.id);
+    eventBox.setAttribute("name", "week-view-event-box-" + calEvent.id);
+    eventBox.setAttribute("onmouseover", "getEventToolTip(this, event)" );
+    eventBox.setAttribute("tooltip", "eventTooltip");
+
+    // Event box text (title, location and description)
+    if (calEvent.title || calEvent.getProperty("location")) {
+        var titleText = ( (calEvent.title || "") + 
+                          (calEvent.getProperty("location") ? " ("+calEvent.getProperty("location")+")" : "") );
+        var titleElement = document.createElement( "label" );
+        titleElement.setAttribute( "class", "week-view-event-title-label-class" );
+        titleElement.appendChild( document.createTextNode( titleText ));
+        eventBox.appendChild( titleElement );
+    }
+    if (calEvent.getProperty("description")) {
+        var descriptionElement = document.createElement( "description" );
+        descriptionElement.setAttribute( "class", "week-view-event-description-class" );
+        descriptionElement.appendChild( document.createTextNode( calEvent.getProperty("description") ));
+        eventBox.appendChild( descriptionElement );
+    }
+
+    debug("Adding eventBox " + eventBox + "\n");
+    document.getElementById("week-view-content-board").appendChild(eventBox);
+}