Changeset 2964

Show
Ignore:
Timestamp:
08/04/10 15:04:48
Author:
johnsa
Message:

user client: use attendee widget action when modifying attendees - begin to look at attendee list returned from the server

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2903 r2964  
    6464  <xsl:variable name="addEvent" select="/bedework/urlPrefixes/event/addEvent"/> 
    6565  <xsl:variable name="event-attendeesForEvent" select="/bedework/urlPrefixes/event/attendeesForEvent"/> 
     66  <xsl:variable name="widget-attendees" select="/bedework/urlPrefixes/widget/attendees"/> 
    6667  <xsl:variable name="event-showAttendeesForEvent" select="/bedework/urlPrefixes/event/showAttendeesForEvent"/> 
    6768  <xsl:variable name="event-initMeeting" select="/bedework/urlPrefixes/event/initMeeting"/> 

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

    r2934 r2964  
    6464  <xsl:variable name="addEvent" select="/bedework/urlPrefixes/event/addEvent"/> 
    6565  <xsl:variable name="event-attendeesForEvent" select="/bedework/urlPrefixes/event/attendeesForEvent"/> 
     66  <xsl:variable name="widget-attendees" select="/bedework/urlPrefixes/widget/attendees"/> 
    6667  <xsl:variable name="event-showAttendeesForEvent" select="/bedework/urlPrefixes/event/showAttendeesForEvent"/> 
    6768  <xsl:variable name="event-initMeeting" select="/bedework/urlPrefixes/event/initMeeting"/> 

  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/attendees.xsl

    r2944 r2964  
    2222  xmlns="http://www.w3.org/1999/xhtml"> 
    2323   
    24   <!-- transform the attendees into an array of json objects  
    25        for use in the BwGrid --> 
     24  <!-- Transform the attendees into an array of json objects  
     25       for use in the BwGrid.  This is called on edit event and after each update to  
     26       the attendees using xml from the attendee widget.  --> 
    2627  <xsl:template match="attendees" mode="loadBwGrid"> 
    2728    <xsl:for-each select="attendee"> 
    2829      <xsl:sort select="attendeeUri"/> 
    29       {name:"<xsl:value-of select="cn"/>",uid:"<xsl:value-of select="attendeeUri"/>",role:"<xsl:value-of select="role"/>",status:"<xsl:value-of select="partstat"/>",type:"person"}<xsl:if test="position()!=last()">,</xsl:if> 
     30      {name:"<xsl:value-of select="cn"/>",uid:"<xsl:value-of select="attendeeUri"/>",role:"<xsl:value-of select="role"/>",status:"<xsl:value-of select="partstat"/>",type:"<xsl:value-of select="cuType"/>"}<xsl:if test="position()!=last()">,</xsl:if> 
    3031    </xsl:for-each> 
    3132  </xsl:template> 

  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/bedework.xsl

    r2900 r2964  
    105105                    <xsl:call-template name="attendees"/> 
    106106                  </xsl:when> 
     107                  <xsl:when test="/bedework/page='attendeeWidget'"> 
     108                    <!-- generate json list of attendees after modifying the scheduling widget --> 
     109                    {<xsl:apply-templates select="/bedework/attendees" mode="loadBwGrid"/>} 
     110                  </xsl:when> 
    107111                  <xsl:when test="/bedework/page='editEvent'"> 
    108112                    <xsl:apply-templates select="/bedework/formElements" mode="editEvent"/> 

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

    r2963 r2964  
    187187        var bwGridOrganizer = "<xsl:value-of select="/bedework/formElements/form/organizer/organizerUri"/>"; 
    188188        var bwGridCurUser = "<xsl:value-of select="/bedework/userid"/>"; 
    189         var bwGrid = new bwSchedulingGrid("bwFreeBusyDisplay",bwGridSDate,8,17,bwGridAttees,true,100,"<xsl:value-of select="$resourcesRoot"/>","<xsl:value-of select="$requestFreeBusy"/>","<xsl:value-of select="$event-attendeesForEvent"/>",bwGridOrganizer,bwGridCurUser); 
     189        var bwGrid = new bwSchedulingGrid("bwFreeBusyDisplay",bwGridSDate,8,17,bwGridAttees,true,100,"<xsl:value-of select="$resourcesRoot"/>","<xsl:value-of select="$requestFreeBusy"/>","<xsl:value-of select="$widget-attendees"/>",bwGridOrganizer,bwGridCurUser); 
    190190         
    191191        // set the grid size 

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

    r2963 r2964  
    299299        url: bwGrid.attUrlPrefix, 
    300300        data: "uri=" + uid + "&role=" + role + "&partstat=" + status + "&attendee=true&submit=add&list=yes", 
    301         success: function(){ 
    302           // add the attendee to the local array 
    303           // this data must be completed by the ajax call (coming) 
     301        success: function(responseData){ 
     302          // add the attendee to the local array (temporary) 
     303          // the local array should be overwritten with data from the ajax call (coming) 
     304          // alert(responseData); 
    304305         
    305306          // take off "mailto:" for local storage 
    …… 
    323324        error: function(msg) { 
    324325          // there was a problem 
    325           alert(msg.statusText); 
     326          alert("Error: " + msg.statusText); 
    326327        } 
    327328      });