Changeset 3515

Show
Ignore:
Timestamp:
03/27/12 15:39:46
Author:
johnsa
Message:

admin client: support for date filtering in admin client list events

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webadmin/webapp/resources/default/default/default.css

    r3508 r3515  
    12161216  padding-right: 2em; 
    12171217} 
     1218#daysSetterBox { 
     1219        margin-left: 1em; 
     1220} 
    12181221.bwEventListOtherGroupTags { 
    12191222  font-size: 0.8em; 

  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r3512 r3515  
    376376            $(document).ready(function(){ 
    377377 
    378                   <xsl:if test="/bedework/formElements/recurrenceId = ''"> 
     378                    <xsl:if test="/bedework/formElements/recurrenceId = ''"> 
    379379                initRXDates(); 
    380380              </xsl:if> 
    …… 
    403403                 
    404404              </xsl:if> 
     405               
     406              <xsl:if test="/bedework/page='listEvents'"> 
     407                bwSetupListDatePicker(); 
     408              </xsl:if> 
    405409                             
    406410              // If you wish to collapse specific topical areas, you can specify them here: 
    …… 
    415419              }); 
    416420 
     421            }); 
     422            </xsl:comment> 
     423          </script> 
     424        </xsl:if> 
     425        <xsl:if test="/bedework/page='eventList'"> 
     426          <!-- include the localized jQuery datepicker defaults --> 
     427          <xsl:call-template name="jqueryDatepickerDefaults"/> 
     428           
     429          <!-- get the current date set by the user, if exists, else use now --> 
     430          <xsl:variable name="curListDate"> 
     431            <xsl:choose> 
     432              <xsl:when test="/bedework/appvar[key='curListDate']/value"><xsl:value-of select="/bedework/appvar[key='curListDate']/value"/></xsl:when> 
     433              <xsl:otherwise><xsl:value-of select="substring(/bedework/now/date,1,4)"/>-<xsl:value-of select="number(substring(/bedework/now/date,5,2)) - 1"/>-<xsl:value-of select="substring(/bedework/now/date,7,2)"/></xsl:otherwise> 
     434            </xsl:choose> 
     435          </xsl:variable> 
     436          <!-- now setup date and time pickers -->   
     437          <script type="text/javascript"> 
     438            <xsl:comment> 
     439            $(document).ready(function(){ 
     440              // startdate for list 
     441              $("#bwListWidgetStartDate").datepicker({ 
     442                defaultDate: new Date(<xsl:value-of select="substring(/bedework/now/date,1,4)"/>, <xsl:value-of select="number(substring(/bedework/now/date,5,2)) - 1"/>, <xsl:value-of select="substring(/bedework/now/date,7,2)"/>) 
     443              }); 
     444              $("#bwListWidgetStartDate").val('<xsl:value-of select="$curListDate"/>'); 
    417445            }); 
    418446            </xsl:comment> 
    …… 
    825853      <tr> 
    826854        <td> 
    827           <a href="{$event-initUpdateEvent}"> 
     855          <a href="{$event-initUpdateEvent}&amp;limitdays=true"> 
    828856            <xsl:if test="not(/bedework/currentCalSuite/name)"> 
    829857              <xsl:attribute name="onclick">alert("<xsl:copy-of select="$bwStr-MMnu-YouMustBeOperating"/>");return false;</xsl:attribute> 
    …… 
    10381066    <div id="bwEventListControls"> 
    10391067      <form name="calForm" id="bwManageEventListControls" method="post" action="{$event-initUpdateEvent}"> 
     1068        <label for="bwListWidgetStartDate"><xsl:copy-of select="$bwStr-EvLs-StartDate"/></label> 
     1069        <input id="bwListWidgetStartDate" name="start" size="10" onchange="setListDate(this.form);"/> 
     1070        <input type="hidden" name="setappvar" id="curListDateHolder"/> 
     1071        <input type="hidden" name="limitdays" id="true"/> 
     1072        <span id="daysSetterBox"> 
     1073                <label for="days"><xsl:copy-of select="$bwStr-EvLs-Days"/></label> 
     1074                <xsl:text> </xsl:text> 
     1075                <xsl:value-of select="/bedework/defaultdays"/> 
     1076                <!--  
     1077          <select id="days" name="days"> 
     1078                  <xsl:call-template name="buildListDays"/> 
     1079                </select> 
     1080                <input type="hidden" id="curListDaysHolder" name="setappvar"/> 
     1081                --> 
     1082              </span> 
     1083         
     1084        <!-- This block contains the original Show Active/All toggle.   
     1085             Uncomment this block to use, though it can be slow if working  
     1086             with large very large numbers of events.  
    10401087        <xsl:copy-of select="$bwStr-EvLs-Show"/> 
    10411088        <xsl:copy-of select="/bedework/formElements/form/listAllSwitchFalse/*"/> 
    …… 
    10431090        <xsl:copy-of select="/bedework/formElements/form/listAllSwitchTrue/*"/> 
    10441091        <xsl:copy-of select="$bwStr-EvLs-All"/> 
     1092        --> 
    10451093      </form> 
    10461094 
    …… 
    10611109          </xsl:for-each> 
    10621110        </select> 
     1111        <input type="hidden" name="start"> 
     1112          <xsl:attribute name="value"> 
     1113            <xsl:choose> 
     1114              <xsl:when test="/bedework/appvar[key='curListDate']/value"><xsl:value-of select="/bedework/appvar[key='curListDate']/value"/></xsl:when> 
     1115              <xsl:otherwise><xsl:value-of select="substring(/bedework/now/date,1,4)"/>-<xsl:value-of select="number(substring(/bedework/now/date,5,2)) - 1"/>-<xsl:value-of select="substring(/bedework/now/date,7,2)"/></xsl:otherwise> 
     1116            </xsl:choose> 
     1117          </xsl:attribute> 
     1118        </input> 
     1119        <input type="hidden" name="limitdays" id="true"/> 
    10631120        <xsl:if test="/bedework/appvar[key='catFilter'] and /bedework/appvar[key='catFilter']/value != 'none'"> 
    10641121          <input type="submit" value="{$bwStr-EvLs-ClearFilter}" onclick="this.form.setappvar.selectedIndex = 0"/> 
    …… 
    10671124    </div> 
    10681125    <xsl:call-template name="eventListCommon"/> 
     1126  </xsl:template> 
     1127   
     1128  <xsl:template name="buildListDays"> 
     1129    <xsl:param name="index">1</xsl:param> 
     1130    <xsl:variable name="current"> 
     1131      <xsl:choose> 
     1132        <xsl:when test="/bedework/appvar[key='curListDays']/value"><xsl:value-of select="/bedework/appvar[key='curListDays']/value"/></xsl:when> 
     1133        <xsl:otherwise><xsl:value-of select="/bedework/defaultdays"/></xsl:otherwise> 
     1134      </xsl:choose> 
     1135    </xsl:variable> 
     1136    <xsl:variable name="max" select="/bedework/maxdays"/> 
     1137    <xsl:if test="number($index) &lt; number($max)"> 
     1138      <option name="listDays($index)"> 
     1139        <xsl:if test="$index = $current"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     1140        <xsl:value-of select="$index"/> 
     1141      </option> 
     1142      <xsl:call-template name="buildListDays"> 
     1143        <xsl:with-param name="index"><xsl:value-of select="number($index)+1"/></xsl:with-param> 
     1144      </xsl:call-template> 
     1145    </xsl:if> 
    10691146  </xsl:template> 
    10701147 

  • trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl

    r3508 r3515  
    101101  <xsl:variable name="bwStr-EvLs-SelectEvent">Select the event that you would like to update:</xsl:variable> 
    102102  <xsl:variable name="bwStr-EvLs-PageTitle">Add new event</xsl:variable> 
     103  <xsl:variable name="bwStr-EvLs-StartDate">Start Date:</xsl:variable> 
     104  <xsl:variable name="bwStr-EvLs-Days">Days:</xsl:variable> 
    103105  <xsl:variable name="bwStr-EvLs-Show">Show:</xsl:variable> 
    104106  <xsl:variable name="bwStr-EvLs-Active">Active</xsl:variable> 

  • trunk/deployment/webadmin/webapp/resources/es_ES/default/default.css

    r3508 r3515  
    12161216  padding-right: 2em; 
    12171217} 
     1218#daysSetterBox { 
     1219        margin-left: 1em; 
     1220} 
    12181221.bwEventListOtherGroupTags { 
    12191222  font-size: 0.8em; 

  • trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl

    r3510 r3515  
    404404              </xsl:if> 
    405405 
     406              <xsl:if test="/bedework/page='listEvents'"> 
     407                bwSetupListDatePicker(); 
     408              </xsl:if> 
     409                             
    406410              // If you wish to collapse specific topical areas, you can specify them here: 
    407411              // (note that this will be managed from the admin client in time) 
    …… 
    415419              }); 
    416420 
     421            }); 
     422            </xsl:comment> 
     423          </script> 
     424        </xsl:if> 
     425        <xsl:if test="/bedework/page='eventList'"> 
     426          <!-- include the localized jQuery datepicker defaults --> 
     427          <xsl:call-template name="jqueryDatepickerDefaults"/> 
     428           
     429          <!-- get the current date set by the user, if exists, else use now --> 
     430          <xsl:variable name="curListDate"> 
     431            <xsl:choose> 
     432              <xsl:when test="/bedework/appvar[key='curListDate']/value"><xsl:value-of select="/bedework/appvar[key='curListDate']/value"/></xsl:when> 
     433              <xsl:otherwise><xsl:value-of select="substring(/bedework/now/date,1,4)"/>-<xsl:value-of select="number(substring(/bedework/now/date,5,2)) - 1"/>-<xsl:value-of select="substring(/bedework/now/date,7,2)"/></xsl:otherwise> 
     434            </xsl:choose> 
     435          </xsl:variable> 
     436          <!-- now setup date and time pickers -->   
     437          <script type="text/javascript"> 
     438            <xsl:comment> 
     439            $(document).ready(function(){ 
     440              // startdate for list 
     441              $("#bwListWidgetStartDate").datepicker({ 
     442                defaultDate: new Date(<xsl:value-of select="substring(/bedework/now/date,1,4)"/>, <xsl:value-of select="number(substring(/bedework/now/date,5,2)) - 1"/>, <xsl:value-of select="substring(/bedework/now/date,7,2)"/>) 
     443              }).attr("readonly", "readonly"); 
     444              $("#bwListWidgetStartDate").val('<xsl:value-of select="$curListDate"/>'); 
    417445            }); 
    418446            </xsl:comment> 
    …… 
    826854      <tr> 
    827855        <td> 
    828           <a href="{$event-initUpdateEvent}"> 
     856          <a href="{$event-initUpdateEvent}&amp;limitdays=true"> 
    829857            <xsl:if test="not(/bedework/currentCalSuite/name)"> 
    830858              <xsl:attribute name="onclick">alert("<xsl:copy-of select="$bwStr-MMnu-YouMustBeOperating"/>");return false;</xsl:attribute> 
    …… 
    10391067    <div id="bwEventListControls"> 
    10401068      <form name="calForm" id="bwManageEventListControls" method="post" action="{$event-initUpdateEvent}"> 
     1069        <label for="bwListWidgetStartDate"><xsl:copy-of select="$bwStr-EvLs-StartDate"/></label> 
     1070        <input id="bwListWidgetStartDate" name="start" size="10" onchange="setListDate(this.form);"/> 
     1071        <input type="hidden" name="setappvar" id="curListDateHolder"/> 
     1072        <input type="hidden" name="limitdays" id="true"/> 
     1073        <span id="daysSetterBox"> 
     1074                <label for="days"><xsl:copy-of select="$bwStr-EvLs-Days"/></label> 
     1075                <xsl:text> </xsl:text> 
     1076                <xsl:value-of select="/bedework/defaultdays"/> 
     1077                <!--  
     1078          <select id="days" name="days"> 
     1079                  <xsl:call-template name="buildListDays"/> 
     1080                </select> 
     1081                <input type="hidden" id="curListDaysHolder" name="setappvar"/> 
     1082                --> 
     1083              </span> 
     1084         
     1085        <!-- This block contains the original Show Active/All toggle.   
     1086             Uncomment this block to use, though it can be slow if working  
     1087             with large very large numbers of events.  
    10411088        <xsl:copy-of select="$bwStr-EvLs-Show"/> 
    10421089        <xsl:copy-of select="/bedework/formElements/form/listAllSwitchFalse/*"/> 
    …… 
    10441091        <xsl:copy-of select="/bedework/formElements/form/listAllSwitchTrue/*"/> 
    10451092        <xsl:copy-of select="$bwStr-EvLs-All"/> 
     1093        --> 
    10461094      </form> 
    10471095 
    …… 
    10621110          </xsl:for-each> 
    10631111        </select> 
     1112        <input type="hidden" name="start"> 
     1113          <xsl:attribute name="value"> 
     1114            <xsl:choose> 
     1115              <xsl:when test="/bedework/appvar[key='curListDate']/value"><xsl:value-of select="/bedework/appvar[key='curListDate']/value"/></xsl:when> 
     1116              <xsl:otherwise><xsl:value-of select="substring(/bedework/now/date,1,4)"/>-<xsl:value-of select="number(substring(/bedework/now/date,5,2)) - 1"/>-<xsl:value-of select="substring(/bedework/now/date,7,2)"/></xsl:otherwise> 
     1117            </xsl:choose> 
     1118          </xsl:attribute> 
     1119        </input> 
     1120        <input type="hidden" name="limitdays" id="true"/> 
    10641121        <xsl:if test="/bedework/appvar[key='catFilter'] and /bedework/appvar[key='catFilter']/value != 'none'"> 
    10651122          <input type="submit" value="{$bwStr-EvLs-ClearFilter}" onclick="this.form.setappvar.selectedIndex = 0"/> 
    …… 
    10681125    </div> 
    10691126    <xsl:call-template name="eventListCommon"/> 
     1127  </xsl:template> 
     1128 
     1129  <xsl:template name="buildListDays"> 
     1130    <xsl:param name="index">1</xsl:param> 
     1131    <xsl:variable name="current"> 
     1132      <xsl:choose> 
     1133        <xsl:when test="/bedework/appvar[key='curListDays']/value"><xsl:value-of select="/bedework/appvar[key='curListDays']/value"/></xsl:when> 
     1134        <xsl:otherwise><xsl:value-of select="/bedework/defaultdays"/></xsl:otherwise> 
     1135      </xsl:choose> 
     1136    </xsl:variable> 
     1137    <xsl:variable name="max" select="/bedework/maxdays"/> 
     1138    <xsl:if test="number($index) &lt; number($max)"> 
     1139      <option name="listDays($index)"> 
     1140        <xsl:if test="$index = $current"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     1141        <xsl:value-of select="$index"/> 
     1142      </option> 
     1143      <xsl:call-template name="buildListDays"> 
     1144        <xsl:with-param name="index"><xsl:value-of select="number($index)+1"/></xsl:with-param> 
     1145      </xsl:call-template> 
     1146    </xsl:if> 
    10701147  </xsl:template> 
    10711148 
    …… 
    12611338    </xsl:if> 
    12621339 
    1263     <!-- if a submitted event has comments, display them --> 
    12641340    <xsl:if test="/bedework/page = 'modEventPending'"> 
     1341      <!-- if a submitted event has topical areas that match with  
     1342           those in the calendar suite, convert them --> 
     1343      <script type="text/javascript"> 
     1344      $(document).ready(function() { 
     1345        $("ul.aliasTree input:checked").trigger("onclick"); 
     1346      }); 
     1347      </script> 
     1348     
     1349      <!-- if a submitted event has comments, display them --> 
    12651350      <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-LOCATION' or name()='X-BEDEWORK-CONTACT' or name()='X-BEDEWORK-CATEGORIES' or name()='X-BEDEWORK-SUBMIT-COMMENT']"> 
    12661351        <script type="text/javascript"> 
    …… 
    29503035              <xsl:if test="$virtualPath = /bedework/formElements/form/xproperties//X-BEDEWORK-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if> 
    29513036              <xsl:if test="path = /bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if> 
     3037              <xsl:if test="/bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text = substring-after(aliasUri,'bwcal://')"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if> 
    29523038            </input> 
    29533039            <xsl:choose> 
    …… 
    29563042              </xsl:when> 
    29573043              <xsl:when test="path = /bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text"> 
     3044                <strong><xsl:value-of select="summary"/></strong> 
     3045              </xsl:when> 
     3046              <xsl:when test="/bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text = substring-after(aliasUri,'bwcal://')"> 
    29583047                <strong><xsl:value-of select="summary"/></strong> 
    29593048              </xsl:when> 

  • trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl

    r3508 r3515  
    101101  <xsl:variable name="bwStr-EvLs-SelectEvent">Seleccione el evento que desearía actualizar:</xsl:variable> 
    102102  <xsl:variable name="bwStr-EvLs-PageTitle">Añadir nuevo evento</xsl:variable> 
     103  <xsl:variable name="bwStr-EvLs-StartDate">Start Date:</xsl:variable> 
     104  <xsl:variable name="bwStr-EvLs-Days">Days:</xsl:variable> 
    103105  <xsl:variable name="bwStr-EvLs-Show">Mostrar:</xsl:variable> 
    104106  <xsl:variable name="bwStr-EvLs-Active">Activo</xsl:variable> 

  • trunk/deployment/webadmin/webapp/resources/resources/bedework.js

    r3403 r3515  
    305305  } 
    306306} 
     307// setup the event list dates  
     308function setListDate(formObj) { 
     309  $("#curListDateHolder").val("curListDate(" + formObj.start.value + ")"); 
     310  // restore ability to set days when form accepts it 
     311  //$("#curListDaysHolder").val("curListDays(" + formObj.days.value + ")"); 
     312  formObj.submit(); 
     313}