Changeset 2905

Timestamp:

05/19/10 17:17:25

Author:

johnsa

Message:

user client: more work on the "meeting" tab - json pulls for freebusy information now live against the back-end

Files:

• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/css/bwScheduling.css (modified) (2 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl (modified) (2 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/head.xsl (modified) (2 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js (modified) (18 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/freebusy-old.js (added)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/freebusy.js (modified) (2 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/navigation.xsl (modified) (6 diffs)

trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/css/bwScheduling.css

@@ -5 +5 @@
-#bwFreeBusyDisplay {
-  margin: 2em 2em 0 2em;
-  width: 80%;
-  overflow: scroll;  
-}
@@ -172 +171 @@
-  margin-left: 1em;
-}
-
+
+
+
+
+
+
+
+
+
+

trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl

@@ -1502 +1502 @@
-                  </td>
-                  <td>
-
+
+
+
+
-                  </td>
-                  <td class="dateLabel">
@@ -1513 +1516 @@
-                </tr>  
-              </table>
-sourcesRoot}/javascript/freebusy.js
+questFreeBusy}
-            </div>
-    </div>

trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/head.xsl

@@ -172 +172 @@
-        <xsl:comment>
-        // initialize the free/busy grid - values taken directly from the xml
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        </xsl:comment>
-      </script>
@@ -231 +235 @@
-            focusElement('bwEventTitle');
-            bwSetupDatePickers();
-
+
+
-          </xsl:when>
-          <xsl:when test="/bedework/page = 'editEvent'">

trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js

@@ -65 +65 @@
-/* An attendee
- * name:            String - name of attendee, e.g. "Venerable Bede"
- with mailto included, e.g. "mailto:
+, e.g. "
- * role:            String - Attendee role, e.g. CHAIR, REQ-PARTICIPANT, etc
- * status:          String - participation status (PARTSTAT)
@@ -118 +118 @@
-  this.end = "";      // will hold the UTC end value in milliseconds
-  
-
+=
-    this.typeDisplay = bwFreeBusyDispTypeTentative;
-  }
@@ -132 +132 @@
-  var endMs; // end in milliseconds
-  if (this.value.indexOf("P") > -1) {
-
+\
-    // extract the hours and minutes from the strings and cast as numbers  
-    var durationHours = this.value.substring(this.value.lastIndexOf("T")+1,this.value.indexOf("H"));
@@ -144 +144 @@
-    endMs = this.start + duration;
-  } else { 
-
+\
-    // set the freebusy end date
-    var endDate = new Date();
-7,21),this.value.substring(21,23)-1,this.value.substring(23,25
-6,28),this.value.substring(28,30),this.value.substring(30,32
+8,22),this.value.substring(22,24)-1,this.value.substring(24,26
+7,29),this.value.substring(29,31),this.value.substring(31,33
-    endMs = endDate.getTime();
-  }
@@ -169 +169 @@
- * displayId:       ID of html block for display output
- * startRange:      js date string - start of date range for grid
-
-
-
-
-
+
+
- * attendees:       array   - array of attendee objects; MUST include organizer on first instantiation
- * workday:         boolean - true to display workday hours only, false to display all 24 hours
- * zoom:            integer - scalar value for zooming the grid
- * browserResourcesRoot: string - URL of browser resources (for displaying images, etc)
-:           string - URL
- 
+Prefix:     string - URL prefix
+:
- */
-endRange, startDate, endDate, startHoursRange, endHoursRange, attendees, workday, zoom, browserResourcesRoot, fbUrl
+startHoursRange, endHoursRange, attendees, workday, zoom, browserResourcesRoot, fbUrlPrefix
-  this.displayId = displayId;
-  this.startRange = new Date(startRange);
-endRange);
+startRange); 
-  this.startHoursRange = startHoursRange;
-  this.endHoursRange = endHoursRange; 
-  this.startDate = new Date(startDate);
-  this.endDate = new Date(endDate);
-  this.zoom = zoom;
-  this.workday = workday;
-  this.attendees = new Array();  // array of bwAttendee objects
-  this.resourcesRoot = browserResourcesRoot;
- = fbUrl
+Prefix = fbUrlPrefix
-  this.organizer = organizerUri;
-  
+  // format the endRange
+  this.endRange.addDays(5);
+    
-  // 2D array of time and busy state for all attendees
-  // [millisecond value,true/false if busy]
@@ -225 +223 @@
-  var pickNextClicked = false; // false until the first time we click "pick next" - allows us to show the first free time window on first click
-  
-  
-  // initialize the grid
-  this.init = function() {
-    // initialize any incoming attendees on first load
-    // while iterating, build up the array of requests 
-    for (var i = 0; i < attendees.length; i++) {
-attendees[i].uid, attendees[i].role,attendees[i].status,
+ attendees[i].uid, attendees[i].role, attendees[i].status, 
-      this.attendees.push(newAttendee); 
-    }
-    
-    // now go get the freebusy information for the attendees
-
-this.fbUrl
+ > 0
+
-    }
-  }
@@ -261 +257 @@
-    if (attendeeIsNew) {
-      this.attendees.push(newAttendee); 
-this.fbUrl
+
-    }
-    
@@ -268 +264 @@
-  this.removeAttendee = function(index) {
-    this.attendees.splice(index, 1);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      for (var i=0; i < fb.microformats["schedule-response"].length; i++) {
-        var r = fb.microformats["schedule-response"][i]; // reference the current response
-        
-
+ if the attendee has any
-        for (var j=0; j < bwGrid.attendees.length; j++) {
-
-
+
+
+
+
-          }
-        }
-      }
+      bwGrid.display();
-    });
-    this.display();
-  }
-  
@@ -315 +324 @@
-  } 
-  
-gridObj
+
-    // clear highlighting
-    $("#bwScheduleTable .fbcell").removeClass("highlight");
@@ -364 +373 @@
-  }
-  
-
+
+
+
+
+
-    try {
-      // number of days to display
@@ -384 +397 @@
-      fbDisplay.id = "bwScheduleTable";
-      
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-      var fbDisplayDateRow = fbDisplay.insertRow(fbDisplay.rows.length);
-
+' + addAttendeeHtml + '
-      for (var i=0; i < range; i++) {
-        var curDate = new Date(this.startRange); 
@@ -439 +464 @@
-            for (var att = 0; att < this.attendees.length; att++) {
-              for (var m = 0; m < this.attendees[att].freebusy.length; m++) {
-
+// keep for reference: 
-                // adding the hourdivision increment in the calculation below is to correct for a bug
-                // in which the class was always offset by one table cell - should find cause
-tzoffset + 
+
-                if (this.attendees[att].freebusy[m].contains(curDateUTC) && this.attendees[att].selected) {
-                  $(fbCell).addClass("busy");
@@ -513 +538 @@
-        // output the attendee name or address (depending on which we have available)
-        // and add attendee functions
-.substr(curAttendee.uid.lastIndexOf(":") + 1)
+
-        var attendeeNameHtml = '<td class="name"><span class="bwAttendee" id="' + attendeeAddress + '">';
-        if (curAttendee.name && curAttendee.name != "") {
@@ -542 +567 @@
-            for (var k = 0; k < this.hourDivision; k++) {
-              var fbCell = document.createElement("td");
-.substr(curAttendee.uid.lastIndexOf(":") + 1)
+
-              $(fbCell).addClass("fbcell");
-              $(fbCell).addClass(curDate.getTime().toString());
@@ -549 +574 @@
-              }
-              for (var m = 0; m < curAttendee.freebusy.length; m++) {
-
+// keep for reference: 
-                // adding the hourdivision increment in the calculation below is to correct for a bug
-                // in which the class was always offset by one table cell - should find cause
-tzoffset + 
+
-                if (curAttendee.freebusy[m].contains(curDateUTC)) {
-.match("TENTATIVE")
+ == bwFreeBusyDispTypeTentative
-                    $(fbCell).addClass("tentative");
-                  } else {
@@ -572 +597 @@
-      }
-      
-      /* DEPRECATED - don't put in grid
-      // generate the "add attendee" row
-      fbDisplayAddAttendeeRow = fbDisplay.insertRow(fbDisplay.rows.length);
@@ -607 +631 @@
-        }
-        $(fbDisplayAddAttendeeRow).append('<td class="dayBoundry"></td>');
-*/
+
-      
-      // generate a blank row at the end (this is just for visual padding)
@@ -834 +858 @@
-}
-
+/* UTC FORMATTERS */
+
+// return a formatted UTC month, prepended with zero if needed
+Date.prototype.getUTCMonthFull = function() {
+  var monthFull = this.getUTCMonth() + 1;
+  if (monthFull < 10) {
+    return "0" + monthFull;
+  }  
+  return monthFull;
+}
+// return a formatted UTC day date, prepended with zero if needed
+Date.prototype.getUTCDateFull = function() {
+  var dateFull = this.getUTCDate();
+  if (dateFull < 10) {
+    return "0" + dateFull;
+  }  
+  return dateFull;
+}
+// return formatted UTC hours, prepended with zero if needed
+Date.prototype.getUTCHoursFull = function() {
+  var hoursFull = this.getUTCHours();
+  if (hoursFull < 10) {
+    return "0" + hoursFull;
+  }  
+  return hoursFull;
+}
+// return formatted UTC minutes, prepended with zero if needed
+Date.prototype.getUTCMinutesFull = function() {
+  var minutesFull = this.getUTCMinutes();
+  if (minutesFull < 10) {
+    return "0" + minutesFull;
+  }  
+  return minutesFull;
+}
+
-/*
- * From RFC 5545

trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/freebusy.js

@@ -34 +34 @@
-                            "periods" : [
-                                {
-3T180000Z
+9T080000Z\
-                                },
-                                {
-
+
+
+
+
-                                } 
-                            ] 
@@ -76 +79 @@
-                            "periods" : [
-                                {
-2T180000Z
+9T090000Z\
-                                },
-                                {
-14T140000Z
+20T140000Z\
-                                } 
-                            ] 
-
+
+
+
+
+
+
+
+
+
+
+
-                    ] 
-                } 

trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/navigation.xsl

@@ -197 +197 @@
-
-           <!-- show free / busy -->
+           <!-- DEPRECATED as of Bedework 3.7: the feature is left in place for backwards compatibility -->
+           <!-- 
-           <xsl:choose>
-             <xsl:when test="/bedework/periodname!='Year'">
@@ -216 +218 @@
-             </xsl:otherwise>
-           </xsl:choose>
+           -->
-
-           <!-- toggle list / calendar view -->
@@ -328 +331 @@
-          <xsl:copy-of select="$bwStr-Actn-AddEvent"/>
-       </a>
+       <!-- 
-       <a href="{$event-initMeeting}&amp;entityType=event&amp;schedule=request&amp;startdate={$dateTime}" title="schedule a meeting" onclick="javascript:changeClass('{$actionIconsId}','invisible')">
-          <img src="{$resourcesRoot}/images/std-icalMeeting-icon-small.gif" width="12" height="16" border="0" alt="schedule meeting"/>
@@ -333 +337 @@
-          <xsl:copy-of select="$bwStr-Actn-ScheduleMeeting"/>
-       </a>
+       -->
-       <a href="{$initEvent}&amp;entityType=task&amp;startdate={$dateTime}" title="{$bwStr-Actn-AddTask}" onclick="javascript:changeClass('{$actionIconsId}','invisible')">
-          <img src="{$resourcesRoot}/images/std-icalTask-icon-small.gif" width="12" height="16" border="0" alt="add task"/>
@@ -338 +343 @@
-          <xsl:copy-of select="$bwStr-Actn-AddTask"/>
-       </a>
+       <!-- 
-       <a href="{$event-initMeeting}&amp;entityType=task&amp;schedule=request&amp;startdate={$dateTime}" title="{$bwStr-Actn-ScheduleTask}" onclick="javascript:changeClass('{$actionIconsId}','invisible')">
-          <img src="{$resourcesRoot}/images/std-icalSchTask-icon-small.gif" width="12" height="16" border="0" alt="schedule task"/>
@@ -348 +354 @@
-          <xsl:copy-of select="$bwStr-Actn-Upload"/>
-       </a>
+       -->
-     </div>
-  </xsl:template>