Changeset 2873

Timestamp:

04/22/10 12:06:29

Author:

johnsa

Message:

ongoing update to free/busy mockup

Files:

• trunk/deployment/webuser/webapp/resources/demoskins/fbMockup/bedeworkFb.js (modified) (8 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/fbMockup/index.html (modified) (1 diff)

trunk/deployment/webuser/webapp/resources/demoskins/fbMockup/bedeworkFb.js

@@ -24 +24 @@
-// ========================================================================
-
+// Constant values and display strings
+// Should be internationalized
+var bwAttendeePersonType = "person";
+var bwAttendeeLocationType = "location";
+var bwAttendeeResourceType = "resource";
+
-/* An attendee
- * name:     String - name of attendee, e.g. "Venerable Bede"
@@ -30 +36 @@
- * role:     String - Attendee role, e.g. CHAIR, REQ-PARTICIPANT, etc
- * status:   String - participation status (PARTSTAT)
+ * type:     String - person, location, other resource
- */
-
+, type
-  this.name = name;
-  this.uid = uid;
@@ -37 +44 @@
-  this.role = role;
-  this.status = status;
+  this.type = type;
+  
+  if (this.type == null || this.type == "") {
+    this.type == bwAttendeePersonType;
+  }
-}
-
@@ -66 +78 @@
-  // this is a constant for now, but could be variable.
-  // ALWAYS set as a factor of 60
-12
+4
-  
-  this.addAttendee = function(name, uid, freebusy, role, status) {
@@ -92 +104 @@
-      
-      // generate the date row - includes top left empty corner 
-
+var 
-      $(fbDisplayDateRow).html('<td rowspan="2" colspan="3" class="corner"></td><td class="fbBoundry"></td>');
-      for (i=0; i < range; i++) {
@@ -109 +121 @@
-        // add the time cells by iterating over the hours
-        for (j = 0; j < hourRange; j++) {
+          // this is where we could use zoom to increase or decrease tick marks and time labels on the grid
-          if (this.zoom == 100) {
-
+-TimeRow
-            curDate.addHours(1);
-          }
@@ -117 +130 @@
-      }
-      
+      // generate the "All Attendees" row
+      fbDisplayTimesRow = fbDisplay.insertRow(2);
+      $(fbDisplayTimesRow).addClass("allAttendees");
+      $(fbDisplayTimesRow).html('<td class="status"></td><td class="role"></td><td class="name">All Attendees</td><td class="fbBoundry"></td>');
+      for (i=0; i < range; i++) {
+        var curDate = new Date(this.startRange); 
+        curDate.setHours(this.startHoursRange);
+        curDate.addDays(i);
+        // add the time cells by iterating over the hours
+        for (j = 0; j < hourRange; j++) {
+          for (k = 0; k < this.hourDivision; k++) {
+            if (curDate.getMinutes() == 0) {
+              $(fbDisplayTimesRow).append('<td id="' + curDate.getTime() + '-AllAttendees" class="hourBoundry"></td>');
+            } else {
+              $(fbDisplayTimesRow).append('<td id="' + curDate.getTime() + '-AllAttendees"></td>');
+            }
+            curDate.addMinutes(60/this.hourDivision);
+          }
+        }
+        $(fbDisplayTimesRow).append('<td class="dayBoundry"></td>');
+      }
+      
+      // generate the regular attendees rows
+      for (attendee = 0; attendee < attendees.length; attendee++) {
+        fbDisplayTimesRow = fbDisplay.insertRow(attendee + 3); // offset by three to account for previous special rows
+        var curAttendee = attendees[attendee];
+        $(fbDisplayTimesRow).html('<td class="status">' + curAttendee.status + '</td>');
+        $(fbDisplayTimesRow).append('<td class="role">' + curAttendee.role + '</td>');
+        $(fbDisplayTimesRow).append('<td class="name">' + curAttendee.name + '</td><td class="fbBoundry"></td>');
+        for (i = 0; i < range; i++) {
+          var curDate = new Date(this.startRange);
+          curDate.setHours(this.startHoursRange);
+          curDate.addDays(i);
+          // add the time cells by iterating over the hours
+          for (j = 0; j < hourRange; j++) {
+            for (k = 0; k < this.hourDivision; k++) {
+              if (curDate.getMinutes() == 0) {
+                $(fbDisplayTimesRow).append('<td id="' + curDate.getTime() + '-AllAttendees" class="hourBoundry"></td>');
+              } else {
+                $(fbDisplayTimesRow).append('<td id="' + curDate.getTime() + '-AllAttendees"></td>');
+              }
+              // increment by the number of minutes in the hour division
+              curDate.addMinutes(60 / this.hourDivision);
+            }
+          }
+          $(fbDisplayTimesRow).append('<td class="dayBoundry"></td>');
+        }
+      }
+      
-      // finally, write the table back to the display
-      $("#" + displayId).html(fbDisplay);
@@ -127 +189 @@
-}
-
-
-/* code for calculating the time cells
-          for (k = 0; k < hourDivision; k++) {
-            if (curDate.getMinutes() == 0) {
-              $(fbDisplayTimesRow).append('<td id="' + curDate.getTime() + 'class="hourBoundry"></td>');
-            } else {
-              $(fbDisplayTimesRow).append('<td id="' + curDate.getTime() + '"></td>');
-            }
-            curDate.addMinutes(60/hourDivision);
-          }
-          */
-
-

trunk/deployment/webuser/webapp/resources/demoskins/fbMockup/index.html

@@ -18 +18 @@
-      // initialize the free/busy grid
-      // send params: displayId, startRange, endRange, startDate, endDate, attendees, workday, zoom
-"Arlen Johnson","mailto:johnsa@rpi.edu",[],"CHAIR","ACCEPTED"
+{name:"Arlen Johnson",uid:"mailto:johnsa@rpi.edu",freebusy:[],role:"CHAIR",status:"ACCEPTED",type:"person"}
-
-      // set datepicker defaults