Changeset 2903

Timestamp:

05/11/10 17:56:21

Author:

johnsa

Message:

user client: work on the "meeting" tab - begin using data from the backend for determining freebusy

Files:

• trunk/deployment/webuser/webapp/resources/demoskins/default/default/globals.xsl (modified) (1 diff)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/css/bwScheduling.css (modified) (1 diff)
• 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/bedeworkAttendees.js (modified) (1 diff)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js (modified) (10 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/freebusy.js (added)

trunk/deployment/webuser/webapp/resources/demoskins/default/default/globals.xsl

@@ -75 +75 @@
-  <xsl:variable name="delInboxEvent" select="/bedework/urlPrefixes/event/delInboxEvent"/>
-  <xsl:variable name="addEventRef" select="/bedework/urlPrefixes/event/addEventRef"/>
+  <xsl:variable name="requestFreeBusy" select="/bedework/urlPrefixes/event/requestFreeBusy"/>
-  <!-- locations -->
-  <xsl:variable name="location-initAdd" select="/bedework/urlPrefixes/location/initAdd"/>

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

@@ -112 +112 @@
-} 
-#bwScheduleTable td.tentative {
-
+../images/
-  color: black;
-}

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

@@ -1436 +1436 @@
-    <!-- ======================== -->
-    <div id="bwEventTab-Scheduling" class="invisible">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        </div>
-div
-
+form
+-->
-      
-            <div id="bwSchedule">
@@ -1527 +1513 @@
-                </tr>  
-              </table>
+        <input type="button" id="getJson" onclick="bwGrid.requestFreeBusy('{$resourcesRoot}/javascript/freebusy.js');" value="development: get freebusy"/>
-            </div>
-    </div>

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

@@ -154 +154 @@
-      <link rel="stylesheet" href="{$resourcesRoot}/css/bwScheduling.css"/>
-      
+      <script type="text/javascript" src="/bedework-common/javascript/jquery/autocomplete/bw-jquery.autocomplete.js">&#160;</script>
+      <script type="text/javascript" src="/bedework-common/javascript/jquery/autocomplete/jquery.bgiframe.min.js">&#160;</script>
+      <script type="text/javascript" src="{$resourcesRoot}/javascript/bedeworkAttendees.js">&#160;</script>
+      <link rel="stylesheet" type="text/css" href="/bedework-common/javascript/jquery/autocomplete/jquery.autocomplete.css" />
+      
-      <script type="text/javascript" src="/bedework-common/javascript/bedework/bedeworkAccess.js">&#160;</script>
-      <link rel="stylesheet" href="/bedework-common/default/default/bedeworkAccess.css"/>
@@ -167 +172 @@
-        <xsl:comment>
-        // initialize the free/busy grid - values taken directly from the xml
-
-April 21, 2010","April 27, 2010","April 21, 2010 11:00:00","April 21, 2010 11:30:00",8,17,[{name:"Arlen Johnson",uid:"mailto:johnsa@rpi.edu",freebusy:["20100421T093000Z/PT2H00M","20100423T174500Z/PT8H30M"],role:"CHAIR",status:"ACCEPTED",type:"person"}],true,100,"<xsl:value-of select="$resourcesRoot"/>
-April 21, 2010","April 27, 2010","April 21, 2010 11:00:00","April 21, 2010 11:30:00",8,17,[],true,100,"<xsl:value-of select="$resourcesRoot"/>
+, browserResourcesRoot, fbUrl, organizerUri
+May 5, 2010","May 17, 2010","May 10, 2010 11:00:00","May 10, 2010 11:30:00",8,17,[{name:"Arlen Johnson",uid:"mailto:johnsa@rpi.edu",role:"CHAIR",status:"ACCEPTED",type:"person"}],true,100,"<xsl:value-of select="$resourcesRoot"/>","<xsl:value-of select="$requestFreeBusy"/>","
+May 5, 2010","May 17, 2010","May 10, 2010 11:00:00","May 10, 2010 11:30:00",8,17,[],true,100,"<xsl:value-of select="$resourcesRoot"/>","<xsl:value-of select="$resourcesRoot"/>/javascript/freebusy.js","
-        
-        // send in some attendees - these will come from interaction with the form
-
-
-
+
+
+
+
+
+
-        </xsl:comment>
-      </script>

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

@@ -59 +59 @@
-  },
-  formatResult: function(item) {
+    alert("here!");
-    return item.email;
-  }

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

@@ -66 +66 @@
- * name:            String - name of attendee, e.g. "Venerable Bede"
- * uid:             String - attendee's uid with mailto included, e.g. "mailto:vbede@example.com"
- * freebusyStrings: Array of rfc5545 freebusy reply values for the current attendee in the current date range
- * role:            String - Attendee role, e.g. CHAIR, REQ-PARTICIPANT, etc
- * status:          String - participation status (PARTSTAT)
@@ -72 +71 @@
- * selected:        Boolean - if attendee is included in picknext selections (checkbox next to attendee in grid) 
- */
-freebusyStrings, 
+
-  this.name = name;
-  this.uid = uid;
@@ -81 +80 @@
-  this.selected = true;
-  
-
-
-
-
-
-
+
-  if (this.type == null || this.type == "") {
-    this.type == bwAttendeeTypePerson;
-  }
+    
+  // function to populate the freebusy objects
+  // freebusyStrings: Array of rfc5545 freebusy reply values for the current attendee in the current date range 
+  this.updateFreeBusy = function(fbStrings) {
+    // empty the freebusy array (to refresh on updates)
+    this.freebusy.length = 0;
+    // push the new freebusy strings into the array
+    for (i = 0; i<fbStrings.length; i++) {
+      var fb = new bwFreeBusy(fbStrings[i]);
+      this.freebusy.push(fb);
+    }
+  } 
-}
+
-/* A Freebusy object
- * Provides methods to work on freebusy values
@@ -165 +172 @@
- * 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)
+ * fbUrl:           string - URL for making freebusy requests 
+ * organizerUri     string - e.g. "someone@mysite.edu" 
- */
-
+, fbUrl, organizerUri
-  this.displayId = displayId;
-  this.startRange = new Date(startRange);
@@ -178 +188 @@
-  this.attendees = new Array();  // array of bwAttendee objects
-  this.resourcesRoot = browserResourcesRoot;
+  this.fbUrl = fbUrl;
+  this.organizer = organizerUri;
-  
-  // 2D array of time and busy state for all attendees
@@ -187 +199 @@
-  this.freeTimeIndex = 0;
-  
-  // initialize any incoming attendees on first load
-  for (i = 0; i < attendees.length; i++) {
-    var newAttendee = new bwAttendee(attendees[i].name,attendees[i].uid ,attendees[i].freebusy,attendees[i].role,attendees[i].status,attendees[i].type);
-    this.attendees.push(newAttendee); 
-  }
-    
-  // how much will we divide the hour in the grid?
-  // ALWAYS set as a factor of 60 and never below 1
@@ -214 +220 @@
-  var pickNextClicked = false; // false until the first time we click "pick next" - allows us to show the first free time window on first click
-  
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    // check to see if attendee already exists
-    for (i=0; i < this.attendees.length; i++) {
-alert(newAttendee.uid + " -- " + 
-
+//alert(newAttendee.uid + " -- " + this.
+this.
-        attendeeIsNew = false;
-        break;
@@ -228 +253 @@
-    }
-    
-*/
+
-      this.attendees.push(newAttendee);      
-//
+
-    
-    this.display();
@@ -237 +262 @@
-  this.removeAttendee = function(index) {
-    this.attendees.splice(index, 1);
+    this.display();
+  }
+  
+  this.requestFreeBusy = function(fburl) {
+    $.getJSON(fburl, function(fb) {
+      for (i=0; i < fb.microformats["schedule-response"].length; i++) {
+        var r = fb.microformats["schedule-response"][i]; // reference the current response
+
+        // prepare the freebusy strings for the attendee
+        var fbStrings = new Array();
+        for (j=0; j < r["calendar-data"].freebusy.periods.length; j++) {
+          fbStrings[j] = r["calendar-data"].freebusy.periods[j].value;
+        }
+
+        // find the attendee and update freebusy
+        for (j=0; j < bwGrid.attendees.length; j++) {
+          //alert(r["calendar-data"].attendee[0].value + " : " + bwGrid.attendees[j].uid);
+          if (r["calendar-data"].attendee[0].value == bwGrid.attendees[j].uid) {
+            bwGrid.attendees[j].updateFreeBusy(fbStrings);
+          }
+        }
+      }
+    });
-    this.display();
-  }
@@ -743 +791 @@
-}
-
-
-
+
-var dayRange = function(startDate, endDate) {  
-  // find difference in milliseconds and return number of days.