Changeset 2953

Timestamp:

07/13/10 19:44:19

Author:

johnsa

Message:

user client: numerous scheduling UI updates

Files:

• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/css/bwScheduling.css (modified) (5 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl (modified) (1 diff)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/addrbookLocations.js (added)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/addrbookUsers.js (added)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkAttendees.js (modified) (2 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js (modified) (12 diffs)

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

@@ -83 +83 @@
-#bwScheduleTable #bwAddAttendee {
-  cursor: pointer;
-padding
+margin
-}
-#bwScheduleTable #bwAddAttendee.pending {
@@ -93 +93 @@
-  color: black;
-  background-color: transparent;
-none
+1px solid #ddd
-}
-#bwScheduleTable #bwAddAttendeeAdvanced {
@@ -107 +107 @@
-  cursor: pointer;
-}
+#bwScheduleTable #bwAddAttendeeFields {
+        margin: auto;
+        width: 170px;
+}
+#bwScheduleTable .bwAddAttendeeSubField {
+        float: left;
+        font-size: 0.9em;
+  margin: 0.5em 0.25em;
+}
+#bwScheduleTable .bwAddAttendeeSubFieldHead {
+  text-align: center;
+  background-color: #eee;
+  color: black;
+}
-#bwScheduleTable #attType {
-  display: none;
@@ -117 +131 @@
-}
-#bwScheduleTable td.busy {
-
+ !important
-  color: black;
-}
@@ -125 +139 @@
-} 
-#bwScheduleTable td.tentative {
-
+ !important
-  color: black;
-}

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

@@ -1562 +1562 @@
-      <!-- the following test on the organizerSchedulingObject is not good - will need to fix -->
-      <xsl:when test="scheduleMethod = '2' and organizerSchedulingObject">
-
+ class="bwEventFormSubmit"
-        <!-- dissalow: at the moment there's no way to send invitations after the first save
-        <input name="submit" type="submit" value="{$bwStr-AEEF-SaveDraft}"/> -->
-      </xsl:when>
-      <xsl:otherwise>
-
+ class="bwEventFormSubmit"
-      </xsl:otherwise>
-    </xsl:choose>

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

@@ -27 +27 @@
-    format: 'json',
-    addrbook: '/public/locations'
+    //addrbook: '/user/johnsa/addressbook'
-  },
-
@@ -38 +39 @@
-    data = data.microformats.vcard;
-    for (var i = 0; i < data.length; i++) {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    return parsed;
-  },
-  formatItem: function(item) {
-email
+uri.substring(7)
-  },
-
-  formatMatch: function(item) {
-email
+uri.substring(7)
-  },
-  formatResult: function(item) {
-email
+uri
-  }
-};
-
-// carddavUrl supplied in bedework.js
-jQuery(document).ready(function($) {
-  $('#bwAddAttendee').autocomplete(carddavUrl, bwAutoCompleteOptions)
-});

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

@@ -63 +63 @@
-var bwAddDisp = "add";
-var bwAttendeeExistsDisp = "attendee exists";
+var bwAddAttendeeRoleDisp = "Role:";
+var bwAddAttendeeTypeDisp = "Type";
+var bwAddAttendeeBookDisp = "Book";
+var bwEventSubmitMeetingDisp = "send";
-
-var bwReqParticipantDisp = "required";
@@ -220 +224 @@
-  // times to be displayed, e.g. hourDivision = 4 quantizes the 
-  // display to 15 minute increments; hourDivision = 1 locks the events to the
-not a good outcome
+which is likely not best
-  // 4, 6, or 12 is preferred (and higher begins to slow down the display)
-  // If in doubt, leave this at 4
@@ -228 +232 @@
-  var hourMils = 3600000;
-  var startMils = Number(this.startRange.getTime()) + Number(this.startHoursRange * hourMils); // the start of the grid
-
+
+
-  var incrementMils = hourMils / this.hourDivision; // increment for the pick next/previous buttons
-  var startSelectionMils = startMils;  // where a mouse selection begins, milliseconds parsed from the first half of a fbcell's ID, default to beginning of grid
+                                       // - SHOULD DEFAULT TO DATE/TIME SETTINGS
-  var endSelectionMils;       // where a mouse selection ends, milliseconds parsed from the first half of a fbcell's ID
-  var selecting = false;      // are we currently selecting?  If true, we'll highlight as we hover
@@ -270 +276 @@
-    $("#bwSchedProcessingMsg").show();
-    
-    //var showAtts = "";
-    // check to see if attendee already exists
-    for (var i=0; i < bwGrid.attendees.length; i++) {
-
+
+
+
-      if (uid == bwGrid.attendees[i].uid) {
-        attendeeIsNew = false;
@@ -282 +289 @@
-      } 
-    }
-    //alert(showAtts);
-    
-    if (attendeeIsNew) {
@@ -289 +295 @@
-        type: "POST",
-        url: bwGrid.attUrlPrefix,
-
+&list=yes
-        success: function(){
-          // add the attendee to the local array
-          // this data must be completed by the ajax call (coming)
+        
+          // take off "mailto:" for local storage
+          if (uid.indexOf("mailto:") != -1) {
+             uid = uid.substring(7); 
+          }
-          var newAttendee = new bwAttendee(name, uid, role, status, type);
-          bwGrid.attendees.push(newAttendee); 
-          bwGrid.requestFreeBusy();
+          
+          // got attendees??  send the param that will trigger a
+          // scheduling request. For now, just set this every time
+          // (we'll trim back later)
+          if (bwGrid.attendees.length) {
+            $("input.bwEventFormSubmit").each(function(i) {
+               $(this).attr("name","submitAndSend");
+               $(this).val(bwEventSubmitMeetingDisp);
+            });
+          }
-        },
-        error: function(msg) {
@@ -387 +408 @@
-    
-    // now do the highlighting
+    bwGrid.highlight(curSelectionTime, endSelectionMils);
+    
+    // we've clicked pickedNext - so set the pickNextClicked flag to true
+    // this flag lets us highlight the very first free time window on first click
+    pickNextClicked = true;
+    
+    bwGrid.setDateTimeWidgets(curSelectionTime);
+  };
+  
+  this.pickPrevious = function() {
+    // clear highlighting
+    $("#bwScheduleTable .fbcell").removeClass("highlight");
+    
+    // go to the previous freeTime if available and highlight it
+    if (this.freeTimeIndex > 0) {
+      this.freeTimeIndex -= 1;
+    }
+    // set the start of the selection range using the freeTimeIndex
+    var curSelectionTime = Number(this.freeTime[this.freeTimeIndex]);
+    // set the end time by adding the duration
+    endSelectionMils = Number(curSelectionTime) + Number(durationMils);
+
+    // now do the highlighting
+    bwGrid.highlight(curSelectionTime, endSelectionMils);
+        
+    bwGrid.setDateTimeWidgets(curSelectionTime);
+  };
+  
+  this.highlight = function (curSelectionTime, endSelectionMils) {
-    $("#bwScheduleTable .fbcell").each(function(index) {
-      var splId = $(this).attr("id").split("-");
@@ -392 +442 @@
-        $(this).addClass("highlight");
-      }
-      
-    });
-    
-    // we've clicked pickedNext - so set the pickNextClicked flag to true
-    // this flag lets us highlight the very first free time window on first click
-    pickNextClicked = true;
-    
-    bwGrid.setDateTimeWidgets(curSelectionTime);
-  };
-  
-  this.pickPrevious = function() {
-    // clear highlighting
-    $("#bwScheduleTable .fbcell").removeClass("highlight");
-    
-    // go to the previous freeTime if available and highlight it
-    if (this.freeTimeIndex > 0) {
-      this.freeTimeIndex -= 1;
-    }
-    // set the start of the selection range using the freeTimeIndex
-    var curSelectionTime = Number(this.freeTime[this.freeTimeIndex]);
-    // set the end time by adding the duration
-    endSelectionMils = Number(curSelectionTime) + Number(durationMils);
-    
-    // now do the highlighting
-    $("#bwScheduleTable .fbcell").each(function(index) {
-      var splId = $(this).attr("id").split("-");
-      if (splId[0] >= curSelectionTime && splId[0] < endSelectionMils) {
-        $(this).addClass("highlight");
-      }
-    });
-    
-    bwGrid.setDateTimeWidgets(curSelectionTime);
-  };
-  
@@ -589 +608 @@
-          // this is where we could use zoom to increase or decrease tick marks and time labels on the grid
-          if (this.zoom == 100) {
-
+ timeCell
-            curDate.addHours(1);
-          }
@@ -766 +785 @@
-      // create the add attendee form 
-      var addAttendeeHtml = '<td class="addAttendee" colspan="4">';
-attendee
+q
-      addAttendeeHtml += '<span id="bwAddAttendeeAdd" class="invisible">' + bwAddDisp +'</span>';
-      //addAttendeeHtml += '<span id="bwAddAttendeeAdvanced">advanced</span>';
-      addAttendeeHtml += '<div id="bwAddAttendeeFields" class="invisible">';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      addAttendeeHtml += '</div>';
-      addAttendeeHtml += '</td><td class="fbBoundry"></td>';
@@ -841 +871 @@
-      // write the table back to the display
-      $("#" + displayId).html(fbDisplay);
+      
+      
+      // highlight the time based on the current date/time settings
+      //var curSelectionTime = Number(startSelectionMils);
+      // set the end time by adding the duration
+      //endSelectionMils = Number(curSelectionTime) + Number(durationMils);
+      //bwGrid.highlight(curSelectionTime, endSelectionMils);
-      
-      
@@ -1007 +1044 @@
-      );
-      
+      // auto-completion for add attendee input field 
+      // carddavUrl supplied in bedework.js
+       var carddavUrlTemp = "/ucalrsrc/themes/bedeworkTheme/javascript/addrbookUsers.js"
+       //var carddavUrlTemp = "/ucalrsrc/themes/bedeworkTheme/javascript/addrbookLocations.js"
+      $("#bwScheduleTable #bwAddAttendee").autocomplete(carddavUrlTemp, bwAutoCompleteOptions);
+      
-      // capture the enter key when entering an attendee;
-      // do not submit the form; add the attendee.