Changeset 2904

Timestamp:

05/12/10 17:30:02

Author:

johnsa

Message:

user client: more work on the "meeting" tab, refactoring javascript widget

Files:

• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/head.xsl (modified) (1 diff)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js (modified) (19 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/freebusy.js (modified) (2 diffs)

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

@@ -174 +174 @@
-        // send params: displayId, startRange, endRange, startDate, endDate, startHourRange, endHourRange, attendees, workday, zoom, browserResourcesRoot, fbUrl, organizerUri
-        // example: var bwGrid = new bwSchedulingGrid("bwFreeBusyDisplay","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"/>","");
-5, 2010","May 17, 2010","May 10, 2010 11:00:00","May 10, 2010 11:30:00",8,17,[
+11, 2010","May 17, 2010","May 13, 2010 11:00:00","May 13, 2010 11:30:00",8,17,[{name:"Arlen Johnson",uid:"mailto:johnsa@mysite.edu",role:"CHAIR",status:"ACCEPTED",type:"person"},{name:"",uid:"mailto:douglm@mysite.edu",role:"REQ-PARTICIPANT",status:"NEEDS-ACTION",type:"person"}
-        
-        // send in some attendees - these will come from interaction with the form
-
-
-
+
-        
-        // now initialize the grid

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

@@ -86 +86 @@
-    
-  // function to populate the freebusy objects
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-/* A Freebusy object
- * Provides methods to work on freebusy values
-
+
+
- */
-
-
-
-
+
+
+
+
+
-  this.start = "";    // will hold the UTC start value in milliseconds 
-  this.end = "";      // will hold the UTC end value in milliseconds
-  
-
-
-
-
-
-
-
-
-
+
+
-  }
-  
-  // set the freebusy start date
-  var startDate = new Date();
-name.substring(0,4),this.name.substring(4,6)-1,this.nam
-name.substring(9,11),this.name.substring(11,13),this.nam
+value.substring(0,4),this.value.substring(4,6)-1,this.valu
+value.substring(9,11),this.value.substring(11,13),this.valu
-  
-  // set the start in milliseconds
@@ -129 +131 @@
-
-  var endMs; // end in milliseconds
-nam
+valu
-    // freebusy value is of the form: 19971015T223000Z/PT6H30M
-    // extract the hours and minutes from the strings and cast as numbers  
-
-
+
+
+
+
+
-    // calculate the duration
-    var duration = (Number(durationHours) * 3600000) + (Number(durationMins) * 60000);
@@ -142 +147 @@
-    // set the freebusy end date
-    var endDate = new Date();
-name.substring(17,21),this.name.substring(21,23)-1,this.nam
-name.substring(26,28),this.name.substring(28,30),this.nam
+value.substring(17,21),this.value.substring(21,23)-1,this.valu
+value.substring(26,28),this.value.substring(28,30),this.valu
-    endMs = endDate.getTime();
-  }
@@ -225 +230 @@
-    // initialize any incoming attendees on first load
-    // while iterating, build up the array of requests 
-
+var 
-      var newAttendee = new bwAttendee(attendees[i].name,attendees[i].uid, attendees[i].role,attendees[i].status,attendees[i].type);
-      this.attendees.push(newAttendee); 
@@ -231 +236 @@
-    
-    // now go get the freebusy information for the attendees
-
+
+
+
-  }
-  
-  // add/update attendees
-  /* examples:
-["20100421T093000Z/PT2H00M","20100423T174500Z/PT8H30M"], 
-["20100422T090000Z/PT1H00M"], 
-["FBTYPE=BUSY-TENTATIVE:20100421T120000Z/20100421T130000Z","20100422T050000Z/20100422T060000Z"], 
+
+
+
-   */
-  this.updateAttendee = function(name, uid, role, status, type) {
@@ -245 +252 @@
-    
-    // check to see if attendee already exists
-
-
+
-      if (newAttendee.uid == this.attendees[i].uid) {
-        attendeeIsNew = false;
@@ -254 +260 @@
-    
-    if (attendeeIsNew) {
-     
-}
-
-this.display();
+
+  this.requestFreeBusy(this.fbUrl);      
+}
+
-  }
-  
-  this.removeAttendee = function(index) {
-    this.attendees.splice(index, 1);
-display();
+requestFreeBusy(this.fbUrl); 
-  }
-  
-  this.requestFreeBusy = function(fburl) {
-    $.getJSON(fburl, function(fb) {
-
+var 
-        var r = fb.microformats["schedule-response"][i]; // reference the current response
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-          }
-        }
@@ -347 +346 @@
-    // now look over the next group of cells to see if the range
-    // we want to select is busy.  If not, store the value for lookup.
-
+var 
-      var rangeNotBusy = true;
-
+var 
-        if (this.fb[j][1]) { // we hit a busy cell
-          rangeNotBusy = false; 
@@ -388 +387 @@
-      var fbDisplayDateRow = fbDisplay.insertRow(fbDisplay.rows.length);
-      $(fbDisplayDateRow).html('<td rowspan="2" colspan="4" class="corner"></td><td class="fbBoundry"></td>');
-
+var 
-        var curDate = new Date(this.startRange); 
-        curDate.addDays(i);
@@ -397 +396 @@
-      fbDisplayTimesRow = fbDisplay.insertRow(fbDisplay.rows.length);
-      $(fbDisplayTimesRow).html('<td class="fbBoundry"></td>');
-
+var 
-        var curDate = new Date(this.startRange); 
-        curDate.setHours(startHour);
@@ -419 +418 @@
-      $(fbDisplayTimesRow).addClass("allAttendees");
-      $(fbDisplayTimesRow).html('<td class="status"></td><td class="role"></td><td class="name">All Attendees</td><td></td><td class="fbBoundry"></td>');
-
+var 
-        var curDate = new Date(this.startRange); 
-        curDate.setHours(startHour);
-        curDate.addDays(i);
-        // add the time cells by iterating over the hours
-
-
+var 
+var 
-            var fbCell = document.createElement("td");
-            var timeClass = curDate.getTime().toString();
@@ -438 +437 @@
-            // set busy if any freebusy in this timeperiod
-            loop1: // since we only need to know if anyone is busy, provide a simple means of breaking from the inner loop
-
-
+var 
+var 
-                var tzoffset = -curDate.getTimezoneOffset() * 60000; // in milliseconds
-                // adding the hourdivision increment in the calculation below is to correct for a bug
@@ -535 +534 @@
-        
-        // build the time row for an attendee
-
+var 
-          var curDate = new Date(this.startRange);
-          curDate.setHours(startHour);
-          curDate.addDays(i);
-          // add the time cells by iterating over the hours
-
-
+var 
+var 
-              var fbCell = document.createElement("td");
-              fbCell.id = curDate.getTime() + "-" + curAttendee.uid.substr(curAttendee.uid.lastIndexOf(":") + 1);
@@ -549 +548 @@
-                $(fbCell).addClass("hourBoundry");
-              }
-
+var 
-                var tzoffset = -curDate.getTimezoneOffset() * 60000; // in milliseconds
-                // adding the hourdivision increment in the calculation below is to correct for a bug
@@ -555 +554 @@
-                var curDateUTC = curDate.getTime() + tzoffset + (60 / this.hourDivision * 60000);
-                if (curAttendee.freebusy[m].contains(curDateUTC)) {
-
+Display
-                    $(fbCell).addClass("tentative");
-                  } else {
@@ -561 +560 @@
-                  }
-                  $(fbCell).addClass("activeCell");
-
+Display
-                  break;
-                }
@@ -573 +572 @@
-      }
-      
+      /* DEPRECATED - don't put in grid
-      // generate the "add attendee" row
-      fbDisplayAddAttendeeRow = fbDisplay.insertRow(fbDisplay.rows.length);
@@ -607 +607 @@
-        }
-        $(fbDisplayAddAttendeeRow).append('<td class="dayBoundry"></td>');
-
+ */
-      
-      // generate a blank row at the end (this is just for visual padding)
-      fbDisplayBlankRow = fbDisplay.insertRow(fbDisplay.rows.length);
-      $(fbDisplayBlankRow).html('<td class="status"></td><td class="role"></td><td class="name"></td><td></td><td class="fbBoundry"></td>');
-
+var 
-        var curDate = new Date(this.startRange);
-        curDate.setHours(startHour);
-        curDate.addDays(i);
-        // add the time cells by iterating over the hours
-
-
+var 
+var 
-            var fbCell = document.createElement("td");
-            fbCell.id = curDate.getTime() + "-blank";
@@ -683 +683 @@
-          
-          // set the freeTimeIndex to the nearest index for the pickNext/previous buttons
-
+var 
-            if (Number(bwGrid.freeTime[i]) >= Number(startSelectionMils)) {
-              bwGrid.freeTimeIndex = i - 1; // this will make pick previous jump an extra gap after clicking in a busy space, but it makes pick next work correctly in the same circumstance

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

@@ -34 +34 @@
-                            "periods" : [
-                                {
-\
+
-                                },
-                                {
-\
+
-                                } 
-                            ] 
@@ -76 +76 @@
-                            "periods" : [
-                                {
-\
+
-                                },
-                                {
-\
+
-                                } 
-                            ]