Changeset 2963

Timestamp:

08/04/10 11:08:21

Author:

johnsa

Message:

user client: more changes to the scheduling grid
- autocomplete now runs against live carddav server
- can switch address books and type of items to search for
- moved "add attendee" to top of grid

Files:

• trunk/deployment/resources/javascript/jquery/autocomplete/bw-jquery.autocomplete.js (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/head.xsl (modified) (1 diff)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkAttendees.js (modified) (3 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js (modified) (9 diffs)

trunk/deployment/resources/javascript/jquery/autocomplete/bw-jquery.autocomplete.js

@@ -314 +314 @@
-
-  function receiveData(q, data) {
-
+&& data[0] != undefined
-      stopLoading();
-      select.display(data, q);

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

@@ -108 +108 @@
-}
-#bwScheduleTable #bwAddAttendeeFields {
-
-
+
-}
-#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 {

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

@@ -186 +186 @@
-        var bwGridAttees = new Array(<xsl:apply-templates select="/bedework/formElements/form/attendees" mode="loadBwGrid"/>);
-        var bwGridOrganizer = "<xsl:value-of select="/bedework/formElements/form/organizer/organizerUri"/>";
-
+
+
-        
-        // set the grid size

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

@@ -26 +26 @@
-  extraParams: {
-    format: 'json',
-
-
+
-  },
-
@@ -37 +36 @@
-  parse: function(data) {
-    var parsed = [];
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }
-    }
@@ -81 +82 @@
-  },
-  formatItem: function(item) {
-\"" + item.fn + "\" [" + item.uri.substring(7) + "]"
+" + item.fn + " - " + item.uri.substring(7)
-  },
-
-  formatMatch: function(item) {
-\"" + item.fn + "\" [" + item.uri.substring(7) + "]"
+" + item.fn + " - " + item.uri.substring(7)
-  },
-  formatResult: function(item) {

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

@@ -18 +18 @@
- */
-
-
-
-
-
+
+
+
+
+
+
-
-// Constants and RFC-5445 values 
@@ -64 +66 @@
-var bwAttendeeExistsDisp = "attendee exists";
-var bwAddAttendeeRoleDisp = "Role:";
-
-
+:
+:
-var bwEventSubmitMeetingDisp = "send";
-
@@ -193 +195 @@
- * organizerUri:    string - e.g. "someone@mysite.edu" 
- */
-
+, curUserId
-  this.displayId = displayId;
-  this.startRange = new Date(startRange);
@@ -207 +209 @@
-  this.attUrlPrefix = attUrlPrefix;
-  this.organizer = organizerUri;
+  this.curUser = curUserId;
-  
-  // increment the endRange
@@ -663 +666 @@
-      }
-      
+   // generate the "add attendee" row
+      fbDisplayAddAttendeeRow = fbDisplay.insertRow(fbDisplay.rows.length);
+      
+      // create the add attendee form 
+      var addAttendeeHtml = '<td class="addAttendee" colspan="4">';
+      addAttendeeHtml += '<input type="text" value="' + bwAddAttendeeDisp +'" name="q" id="bwAddAttendee" class="pending" size="30"/>';
+      addAttendeeHtml += '<span id="bwAddAttendeeAdd" class="invisible">' + bwAddDisp +'</span>';
+      //addAttendeeHtml += '<span id="bwAddAttendeeAdvanced">advanced</span>';
+      addAttendeeHtml += '<div id="bwAddAttendeeFields" class="invisible">';
+      addAttendeeHtml += '  <div class="bwAddAttendeeSubField" id="bwAddAttendeeRoleBlock">';
+      addAttendeeHtml += '    <span class="bwAddAttendeeSubFieldHead">' + bwAddAttendeeRoleDisp + '</span>';
+      addAttendeeHtml += '    <select name="role" id="bwAddAttendeeRole">';
+      addAttendeeHtml += '      <option value="REQ-PARTICIPANT">' + bwReqParticipantDisp + '</option>';
+      addAttendeeHtml += '      <option value="OPT-PARTICIPANT">' + bwOptParticipantDisp + '</option>';
+      addAttendeeHtml += '      <option value="CHAIR">' + bwChairDisp + '</option>';
+      addAttendeeHtml += '      <option value="NON-PARTICIPANT">' + bwNonParticipant + '</option>';
+      addAttendeeHtml += '    </select>';
+      addAttendeeHtml += '  </div>';
+      // DON'T include partstat except for testing.  This value should be determined by actual participants.
+      //addAttendeeHtml += '<select name="partstat" id="bwAddAttendeePartstat">';
+      //addAttendeeHtml += '  <option value="NEEDS-ACTION">' + bwNeedsAction + '</option>';
+      //addAttendeeHtml += '  <option value="ACCEPTED">' + bwAccepted + '</option>';
+      //addAttendeeHtml += '  <option value="DECLINED">' + bwDeclined + '</option>';
+      //addAttendeeHtml += '  <option value="TENTATIVE">' + bwTentative + '</option>';
+      //addAttendeeHtml += '  <option value="DELEGATED">' + bwDelegated + '</option>';
+      //addAttendeeHtml += '</select>';
+      addAttendeeHtml += '  <div class="bwAddAttendeeSubField" id="bwAddAttendeeBookBlock">';
+      addAttendeeHtml += '    <span class="bwAddAttendeeSubFieldHead">' + bwAddAttendeeBookDisp + '</span>';
+      addAttendeeHtml += '    <input type="radio" name="bwAddAttendeeAddrBk" value="/user/' + bwGrid.curUser + '/addressbook" checked="checked" onclick="changeClass(\'bwAddAttendeeTypeBlock\',\'invisible\');bwGrid.updateBookPath(this.value);">personal';
+      addAttendeeHtml += '    <input type="radio" name="bwAddAttendeeAddrBk" value="/public" onclick="changeClass(\'bwAddAttendeeTypeBlock\',\'bwAddAttendeeSubField\');bwGrid.updateBookPath(this.form.bwAddAttendeeType.value);">public';
+      addAttendeeHtml += '  </div>';
+      addAttendeeHtml += '  <div class="invisible" id="bwAddAttendeeTypeBlock">';
+      addAttendeeHtml += '    <span class="bwAddAttendeeSubFieldHead">' + bwAddAttendeeTypeDisp + '</span>';
+      addAttendeeHtml += '    <input type="radio" name="bwAddAttendeeType" value="/public/people" checked="checked" onclick="bwGrid.updateBookPath(this.value);"/>person';
+      addAttendeeHtml += '    <input type="radio" name="bwAddAttendeeType" value="/public/groups" disabled="disabled" onclick="bwGrid.updateBookPath(this.value);"/>group';
+      addAttendeeHtml += '    <input type="radio" name="bwAddAttendeeType" value="/public/locations" onclick="bwGrid.updateBookPath(this.value);"/>location';
+      addAttendeeHtml += '  </div>';
+      addAttendeeHtml += '  <input type="hidden" name="bwCardDavBookPath" id="bwCardDavBookPath" value="/user/' + bwGrid.curUser + '/addressbook"/>';
+      addAttendeeHtml += '</div>';
+      addAttendeeHtml += '</td><td class="fbBoundry"></td>';
+      
+      $(fbDisplayAddAttendeeRow).html(addAttendeeHtml);
+      
+      for (i = 0; i < range; i++) {
+        var curDate = new Date(this.startRange);
+        curDate.setHours(startHour);
+        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++) {
+            var fbCell = document.createElement("td");
+            fbCell.id = curDate.getTime() + "-add";
+            $(fbCell).addClass("fbcell");
+            $(fbCell).addClass(curDate.getTime().toString());
+            if (curDate.getMinutes() == 0 && j != 0) {
+              $(fbCell).addClass("hourBoundry");
+            } 
+            $(fbDisplayAddAttendeeRow).append(fbCell);
+            curDate.addMinutes(60/this.hourDivision);
+          }
+        }
+        $(fbDisplayAddAttendeeRow).append('<td class="dayBoundry"></td>');
+      }
+      
-      // generate the regular attendees rows
-      for (attendee = 0; attendee < this.attendees.length; attendee++) {
@@ -780 +847 @@
-      }
-      
-      // generate the "add attendee" row
-      fbDisplayAddAttendeeRow = fbDisplay.insertRow(fbDisplay.rows.length);
-      
-      // create the add attendee form 
-      var addAttendeeHtml = '<td class="addAttendee" colspan="4">';
-      addAttendeeHtml += '<input type="text" value="' + bwAddAttendeeDisp +'" name="q" id="bwAddAttendee" class="pending" size="30"/>';
-      addAttendeeHtml += '<span id="bwAddAttendeeAdd" class="invisible">' + bwAddDisp +'</span>';
-      //addAttendeeHtml += '<span id="bwAddAttendeeAdvanced">advanced</span>';
-      addAttendeeHtml += '<div id="bwAddAttendeeFields" class="invisible">';
-      addAttendeeHtml += '  ' + bwAddAttendeeRoleDisp + ' ';
-      addAttendeeHtml += '  <select name="role" id="bwAddAttendeeRole">';
-      addAttendeeHtml += '    <option value="REQ-PARTICIPANT">' + bwReqParticipantDisp + '</option>';
-      addAttendeeHtml += '    <option value="OPT-PARTICIPANT">' + bwOptParticipantDisp + '</option>';
-      addAttendeeHtml += '    <option value="CHAIR">' + bwChairDisp + '</option>';
-      addAttendeeHtml += '    <option value="NON-PARTICIPANT">' + bwNonParticipant + '</option>';
-      addAttendeeHtml += '  </select>';
-      // DON'T include partstat except for testing.  This value should be determined by actual participants.
-      //addAttendeeHtml += '<select name="partstat" id="bwAddAttendeePartstat">';
-      //addAttendeeHtml += '  <option value="NEEDS-ACTION">' + bwNeedsAction + '</option>';
-      //addAttendeeHtml += '  <option value="ACCEPTED">' + bwAccepted + '</option>';
-      //addAttendeeHtml += '  <option value="DECLINED">' + bwDeclined + '</option>';
-      //addAttendeeHtml += '  <option value="TENTATIVE">' + bwTentative + '</option>';
-      //addAttendeeHtml += '  <option value="DELEGATED">' + bwDelegated + '</option>';
-      //addAttendeeHtml += '</select>';
-      addAttendeeHtml += '  <div class="bwAddAttendeeSubField">';
-      addAttendeeHtml += '    <div class="bwAddAttendeeSubFieldHead">' + bwAddAttendeeTypeDisp + '</div>';
-      addAttendeeHtml += '    <input type="radio" name="bwAddAttendeeType" value="person" checked="checked">person<br/>';
-      addAttendeeHtml += '    <input type="radio" name="bwAddAttendeeType" value="group" disabled="disabled">group<br/>';
-      addAttendeeHtml += '    <input type="radio" name="bwAddAttendeeType" value="location"/>location';
-      addAttendeeHtml += '  </div>';
-      addAttendeeHtml += '  <div class="bwAddAttendeeSubField">';
-      addAttendeeHtml += '    <div class="bwAddAttendeeSubFieldHead">' + bwAddAttendeeBookDisp + '</div>';
-      addAttendeeHtml += '    <input type="radio" name="bwAddAttendeeAddrBk" value="person" checked="checked">personal<br/>';
-      addAttendeeHtml += '    <input type="radio" name="bwAddAttendeeAddrBk" value="group">public<br/>';
-      addAttendeeHtml += '  </div>';
-      addAttendeeHtml += '</div>';
-      addAttendeeHtml += '</td><td class="fbBoundry"></td>';
-      
-      $(fbDisplayAddAttendeeRow).html(addAttendeeHtml);
-      
-      for (i = 0; i < range; i++) {
-        var curDate = new Date(this.startRange);
-        curDate.setHours(startHour);
-        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++) {
-            var fbCell = document.createElement("td");
-            fbCell.id = curDate.getTime() + "-add";
-            $(fbCell).addClass("fbcell");
-            $(fbCell).addClass(curDate.getTime().toString());
-            if (curDate.getMinutes() == 0 && j != 0) {
-              $(fbCell).addClass("hourBoundry");
-            } 
-            $(fbDisplayAddAttendeeRow).append(fbCell);
-            curDate.addMinutes(60/this.hourDivision);
-          }
-        }
-        $(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);
@@ -938 +944 @@
-        }
-      );
+      
+      this.updateBookPath = function(path) {
+        $("#bwCardDavBookPath").val(path);
+      }
-      
-      this.gotoNextRange = function() {
@@ -1048 +1058 @@
-       var carddavUrlTemp = "/ucalrsrc/themes/bedeworkTheme/javascript/addrbookUsers.js"
-       //var carddavUrlTemp = "/ucalrsrc/themes/bedeworkTheme/javascript/addrbookLocations.js"
-Temp
+
-      
-      // capture the enter key when entering an attendee;
@@ -1054 +1064 @@
-      $("#bwScheduleTable #bwAddAttendee").keypress (
-          function (e) {
-
+ // enter
-              e.preventDefault();
-              bwGrid.addAttendeeFromGrid();