Changeset 3678 in main


Ignore:
Timestamp:
03/31/12 16:18:46 (10 years ago)
Author:
Garth Braithwaite
Message:

view java and webapp - temp commit - in middle of saved def cleanup

Location:
branches/2.1/src/main
Files:
1 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • branches/2.1/src/main/java/org/ibisph/querydefinition/modelmap/DeleteQueryDefinitionFromHTTPRequest.java

    r3652 r3678  
    66
    77import org.ibisph.modelmap.GetModelMapFromHTTPRequest;
     8import org.ibisph.util.IOPath;
    89import org.ibisph.util.StrLib;
    910import org.ibisph.util.XMLLib;
    1011
    1112/**
    12  * This service is responsible to get the requested query definition element
    13  * based on the HTTP Request query definition parameter name value.
     13 * Deletes the named query definition element from the user's query definitions
     14 * and returns the new query definitions sans the deleted element.  This includes
     15 * saving the newly modified query definitions XML.
    1416 *
    1517 * @author Garth Braithwaite, STG
     
    2224  //------------------------ M A I N   R E Q U E S T   M O D E L   M E T H O D
    2325  /**
    24    * Gets the Query Definition from the supplied QueryDefinitions XML document
    25    * object passed in.  The actual Query Definition name to use is supplied as
    26    * the filename portion of the HTTP request path.
    27    * @param request HttpServletRequest that the configuration path is retrieved from.
    28    * @return the fully loaded query module xml document object.
     26   * Deletes the Query Definition from the QueryDefinitions XML document object
     27   * which is loaded based on the user name that is retrieved from the request/
     28   * security context.  The actual Query Definition name to use is supplied as
     29   * the filename portion of the HTTP request path or as an HTTP request param.
     30   * @param request HttpServletRequest that the user and query def name to be
     31   *   deleted is retrieved from.
     32   * @return the fully loaded query definitions xml document object.
    2933   */
    3034  protected Object getModel(HttpServletRequest request) throws Exception {
    3135    String queryDefinitionsName = this.getUserDetails(request).getUsername();
    3236    String queryDefinitionName = request.getParameter(this.queryDefinitionNameHTTPRequestParameterName);
    33     if(!StrLib.isSomething(queryDefinitionName)) queryDefinitionName = "Test";
    34 
     37    if(!StrLib.isSomething(queryDefinitionName)) {
     38      queryDefinitionName = IOPath.getFilenameWithoutExtension(request.getPathInfo());
     39    }
    3540    Document queryDefinitions = this.queryDefinitionsService.getQueryDefinitions(queryDefinitionsName);
    3641    XMLLib.deleteNodes(queryDefinitions, "/QUERY_DEFINITIONS/QUERY_DEFINITION[NAME='" +queryDefinitionName+ "']");
  • branches/2.1/src/main/java/org/ibisph/querydefinition/modelmap/QueryModuleToQueryDefinition.java

    r3654 r3678  
    11package org.ibisph.querydefinition.modelmap;
     2
     3import java.util.Map;
    24
    35import javax.servlet.http.HttpServletRequest;
     
    68import org.dom4j.Element;
    79
     10import org.ibisph.modelmap.ProcessModelMapFromHTTPRequest;
    811
    912
    1013/**
    11  * direct save - saves query with QM info
     14 * Loads the Query Module selections to the injected model map's Query Definition.
     15 * The query module is retrieved from the HTTP session.
    1216 *
    1317 * @author Garth Braithwaite, STG
    1418 */
    15 public class QueryModuleToQueryDefinition {
     19  public class QueryModuleToQueryDefinition implements ProcessModelMapFromHTTPRequest {
    1620
    1721  protected static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(QueryModuleToQueryDefinition.class);
    1822
    19   protected String queryModuleSessionName = "QueryModule";
     23  protected String queryModuleSessionName     = "QueryModule";
     24  protected String queryDefinitionModelMapKey = "QueryDefinition";
    2025
    2126  protected org.ibisph.querydefinition.service.QueryModuleXMLToQueryDefinitionXML queryModuleToQueryDefinitionService = null;
     
    2429  //------------------------------------------- P R O P E R T Y   S E T T E R S
    2530
     31  /**
     32   * Service that loads the query module selections into a query definition
     33   * element.
     34   * @param queryModuleToSavedQueryDefinitionService
     35   */
    2636  public void setQueryModuleToQueryDefinitionService(org.ibisph.querydefinition.service.QueryModuleXMLToQueryDefinitionXML queryModuleToSavedQueryDefinitionService) {
    2737    this.queryModuleToQueryDefinitionService = queryModuleToSavedQueryDefinitionService;
    2838  }
     39
    2940  /**
    3041   * Sets the Query XML document session name.  This method is simply the
    3142   * standardized way of setting/accessing the query module session document.
     43
    3244   * @param key User HTTP session object container key/name.  This value is
    3345   *   the key which is used to put and get the query module XML
    34    *   document from the user's session container. 
     46   *   document from the user's session container.  Defaults to "QueryModule".
    3547   */
    3648  public void setQueryModuleSessionName(String key) {this.queryModuleSessionName = key;}
    3749
     50  /**
     51   * Sets the query definition element's model map key used to retrieve the QD
     52   * element from the model map with.
     53   * @param queryDefinitionModelMapKey defaults to "QueryDefinition".
     54   */
     55  public void setQueryDefinitionModelMapKey(String queryDefinitionModelMapKey) {
     56    this.queryDefinitionModelMapKey = queryDefinitionModelMapKey;
     57  }
    3858 
    3959  //------------------------ M A I N   R E Q U E S T   M O D E L   M E T H O D
     
    4262   * Loads the supplied query definition element with the criteria from the
    4363   * query module that exists in the user's session.
    44 
     64   *
    4565   * @param request HttpServletRequest that the query module (user session) is
    4666   *   retrieved from.
    4767   * @return the fully loaded query definition xml element object.
    4868   */
    49   public Object getModel(HttpServletRequest request, Object object) throws Exception {
    50     Element  queryDefinition = (Element)object;
     69  public void processModelMap(Map<String, Object> modelMap, HttpServletRequest request) throws Exception {
     70    Element  queryDefinition = (Element)modelMap.get(this.queryDefinitionModelMapKey);
    5171    Document queryModule     = (Document)request.getSession().getAttribute(this.queryModuleSessionName);
    5272    this.queryModuleToQueryDefinitionService.loadQueryModuleToQueryDefinition(queryModule, queryDefinition);
    53     return(queryDefinition);
     73    modelMap.put(this.queryDefinitionModelMapKey, queryDefinition);
    5474  } //-------------------------- End of Method ------------------------------
    5575
  • branches/2.1/src/main/java/org/ibisph/querymodule/modelmap/QueryModuleFromHTTPRequestAndQueryDefinition.java

    r3663 r3678  
    1515
    1616/**
    17  * Query module from session WITH QD being passed in. 
     17 * Query module from session loaded with a query definition which is contained
     18 * in the supplied model map. 
    1819 *
    1920 * @author Garth Braithwaite, STG
  • branches/2.1/src/main/webapps/ibisph-view/WEB-INF/config/spring/query_definition.xml

    r3677 r3678  
    2222                <constructor-arg type="java.lang.String" value="QueryDefinition"/>
    2323        </bean>
     24        <bean id="QueryDefinition.QueryDefinition.HTTPRequestParameterName" class="java.lang.String">
     25                <constructor-arg type="java.lang.String" value="queryDefinitionName"/>
     26        </bean>
    2427
    2528
     
    7073        >
    7174                <description>
    72                         Used to get the selected qd by the CriteriaBuilder, DefinitionBuilder,
    73                         and DefinitionResult.  All use this model to merge into the QM.
    74                 </description>
    75                 <property name="queryDefinitionNameHTTPRequestParameterName" value="queryDefinitionName"/>
     75                        Used to get the qd name from the request (param or end of path) and
     76                        loads it from the XML based on the user details.  This is used  by
     77                        the CriteriaBuilder, DefinitionBuilder, and DefinitionResult type
     78                        requests.  A following modelmap call to load this definition to the
     79                        query module.
     80                </description>
     81                <property name="queryDefinitionNameHTTPRequestParameterName" ref="QueryDefinition.QueryDefinition.HTTPRequestParameterName"/>
    7682                <property name="queryDefinitionsService" ref="QueryDefinition.XML.Service"/>
    7783                <property name="modelMapKey" ref="QueryDefinition.QueryDefinition.ModelMapKey"/>
    7884        </bean>
    7985
    80         <bean id="QueryDefinition.QueryModuleFromHTTPRequestAndQueryDefinition.ModelMap"
    81                 class="org.ibisph.querymodule.modelmap.QueryModuleFromHTTPRequestAndQueryDefinition"
    82                 parent="Common.XMLModelMap.CommonProperties"
    83         >
    84                 <description>
    85                         QD is passed in via the model map, QM is from the session if not
    86                         found then the QD's config path is used to load up the module.  The
    87                         QD is then loaded into the QM and returned.
    88                 </description>
    89                 <property name="queryDefinitionModelMapKey" ref="QueryDefinition.QueryDefinition.ModelMapKey"/>
    90                 <property name="queryModuleSessionName" ref="Query.Module.SessionName"/>
    91                 <property name="queryModuleService"     ref="Query.Module.XML.Service"/>
    92                 <property name="queryDefinitionToQueryModuleService" ref="QueryDefinition.DefinitionToModule.Service"/>
    93         </bean>
    94 
    95 
    96 <bean id="QueryDefinition.DeleteQueryDefinitionParamaeters.ModelMap" class="org.ibisph.xml.modelmap.DeleteElementsFromDocument">
     86        <bean id="QueryDefinition.DeleteQueryDefinitionParamaeters.ModelMap" class="org.ibisph.xml.modelmap.DeleteElementsFromDocument">
    9787                <description>
    9888                        used inline to remove the parameters from the query definition that is
     
    110100        </bean>
    111101
     102        <bean id="QueryDefinition.QueryModuleFromHTTPRequestAndQueryDefinition.ModelMap"
     103                class="org.ibisph.querymodule.modelmap.QueryModuleFromHTTPRequestAndQueryDefinition"
     104                parent="Common.XMLModelMap.CommonProperties"
     105        >
     106                <description>
     107                        QD is passed in via the model map, QM is from the session if not
     108                        found then the QD's config path is used to load up the module.  The
     109                        QD is then loaded into the QM and returned.  The QM is the main XML
     110                        model that is used for the apply criteria, query builder and result
     111                        pages.
     112                </description>
     113                <property name="queryDefinitionModelMapKey" ref="QueryDefinition.QueryDefinition.ModelMapKey"/>
     114                <property name="queryModuleSessionName" ref="Query.Module.SessionName"/>
     115                <property name="queryModuleService"     ref="Query.Module.XML.Service"/>
     116                <property name="queryDefinitionToQueryModuleService" ref="QueryDefinition.DefinitionToModule.Service"/>
     117        </bean>
     118
     119        <bean id="QueryDefinition.BaseQueryDefinitionFromHTTPRequest.ModelMap" class="org.ibisph.web.modelmap.HTTPRequestParametersToXML">
     120                <description>
     121                        Loads the HTTP Request Parameters into a base QUERY_DEFINITION XML
     122                        container element which is placed into the model map.  This code
     123                        is used to save and init the query definition which will then be
     124                        updated via subsequent model map calls with the actual query module
     125                        selections.
     126                </description>
     127                <property name="HTTPRequestParametersToContainerElementService" ref="QueryDefinition.HTTPRequestParametersToQueryDefinition.Service"/>
     128                <property name="modelMapKey" ref="QueryDefinition.QueryDefinition.ModelMapKey"/>
     129        </bean>
     130
     131        <bean id="QueryDefinition.QueryModuleToQueryDefinition.ModelMap" class="org.ibisph.querydefinition.modelmap.QueryModuleToQueryDefinition">
     132                <description>
     133                        Loads the query module selections into the query definition.
     134                </description>
     135                <property name="queryModuleSessionName" ref="Query.Module.SessionName"/>
     136                <property name="queryDefinitionModelMapKey" ref="QueryDefinition.QueryDefinition.ModelMapKey"/>
     137                <property name="queryModuleToQueryDefinitionService" ref="QueryDefinition.ModuleToDefinition.Service"/>
     138        </bean>
     139
     140        <bean id="QueryDefinition.QueryDefinitionToQueryDefinitions.ModelMap" class="org.ibisph.querydefinition.modelmap.QueryDefinitionToQueryDefinitions">
     141                <description>
     142                        Saves the QUERY_DEFINITION XML that is found in the supplied model
     143                        map to the user's query definitions.  This code should be called
     144                        after creating the query definition and loading with the query
     145                        module.  So typically used in the save query def controller.
     146                </description>
     147                <property name="queryDefinitionsService" ref="QueryDefinition.XML.Service"/>
     148                <property name="modelMapKey" ref="QueryDefinition.QueryDefinition.ModelMapKey"/>
     149        </bean>
     150
    112151<bean id="QueryDefinition.DeleteQueryDefinitionFromHTTPRequest.ModelMap" class="org.ibisph.querydefinition.modelmap.DeleteQueryDefinitionFromHTTPRequest">
    113                 <description>QD from HTTP REQUEST PARAM - POSTED OR GET.</description>
    114                 <property name="queryDefinitionNameHTTPRequestParameterName" value="queryDefinitionName"/>
     152                <description>
     153                        Deletes the named/specified QD from the user's saved query definitions. 
     154                        The QD name is retrieved from specified HTTP request parameter or
     155                        from the end of the request path. 
     156                </description>
     157                <property name="queryDefinitionNameHTTPRequestParameterName" ref="QueryDefinition.QueryDefinition.HTTPRequestParameterName"/>
    115158                <property name="queryDefinitionsService" ref="QueryDefinition.XML.Service"/>
    116159<property name="modelMapKey" value="SavedQueryDefinition"/>
    117160        </bean>
    118161
    119 
    120 <bean id="QueryDefinition.HTTPRequestToQueryDefinition.ModelMap" class="org.ibisph.web.modelmap.HTTPRequestParametersToXML">
    121                 <description>
    122                 </description>
    123                 <property name="HTTPRequestParametersToContainerElementService" ref="QueryDefinition.HTTPRequestParametersToQueryDefinition.Service"/>
    124                 <property name="modelMapKey" ref="QueryDefinition.QueryDefinition.ModelMapKey"/>
    125         </bean>
    126 
    127 <bean id="QueryDefinition.SavedQueryDefinitionFromHTTPRequestAndLoadedQueryDefinition.ModelMap" class="org.ibisph.querydefinition.modelmap.QueryDefinitionToQueryDefinitions">
    128                 <property name="queryDefinitionsService" ref="QueryDefinition.XML.Service"/>
    129 <property name="modelMapKey" value="SavedQueryDefinition"/>
    130         </bean>
    131162
    132163
     
    212243        </bean>
    213244
    214 
    215 <bean id="QueryDefinition.EditBuilderDefinition.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController">
     245        <bean id="QueryDefinition.EditBuilderDefinition.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController">
    216246                <description>
    217247                        /edit/query/builder/definition/**
     
    233263        </bean>
    234264
    235 <bean id="QueryDefinition.EditResultDefinition.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController">
     265        <bean id="QueryDefinition.EditResultDefinition.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController">
    236266                <description>
    237267                        /edit/query/result/definition/**"
     
    246276                <property name="view" ref="QueryDefinition.EditDetail.View"/>
    247277        </bean>
    248 
    249 
    250278
    251279<bean id="QueryDefinition.SaveDefinition.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController">
     
    259287                <property name="modelMapList">
    260288                        <list>
    261                                 <ref bean="QueryDefinition.HTTPRequestToQueryDefinition.ModelMap"/>
    262 <ref bean="QueryDefinition.SavedQueryDefinitionFromHTTPRequestAndLoadedQueryDefinition.ModelMap"/>
     289                                <ref bean="QueryDefinition.BaseQueryDefinitionFromHTTPRequest.ModelMap"/>
     290                                <ref bean="QueryDefinition.QueryModuleToQueryDefinition.ModelMap"/>
     291                                <ref bean="QueryDefinition.QueryDefinitionToQueryDefinitions.ModelMap"/>
    263292                                <ref bean="QueryDefinition.QueryDefinitionsFromHTTPRequest.ModelMap"/>
    264293                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     
    269298        </bean>
    270299
    271 <bean id="QueryDefinition.DeleteDefinition.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController">
    272                 <description>
     300        <bean id="QueryDefinition.DeleteDefinition.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController">
     301                <description>
     302                        Deletes the specified query definition and returns to the definition list page.
    273303                </description>
    274304                <property name="modelMapList">
  • branches/2.1/src/main/webapps/ibisph-view/css/Edit.css

    r3529 r3678  
    107107        padding:                        8px 5px 8px 3px;
    108108        border:                         1px solid #cccccc; /*thin groove;*/
    109         background:                     #eeeeee;       
     109        background:                     #eeeeee;
    110110/* IE has a problem with this.  one way is to: cellspacing="10" in the table tag.
    111111  another way is to embed another table...  Oddly, NN handles as it should.
    112112  added to the specific TD detailxxxx class.
    113113        padding:                2px 7px 7px 7px;
     114        width:                          580px;
    114115*/
    115116}
     
    117118table.EditDetail th
    118119{
    119         width:                          125px;
     120        width:                          100px;
    120121        font-weight:            bold;
    121122        padding:                        4px 5px 3px 5px;
     
    141142table.EditDetail td input               { padding:  0px 10px 3px 5px; }
    142143*/
    143 table.EditDetail textarea                       { width:        450px; }
    144 table.EditDetail .Title input           { width:        450px; }
    145 table.EditDetail select                         { width:        457px; }
     144table.EditDetail textarea                       { width:        420px; }
     145table.EditDetail .Title input           { width:        420px; }
     146table.EditDetail select                         { width:        427px; }
    146147table.EditDetail .ActiveFlag input      { margin-left:3px; }
    147148
  • branches/2.1/src/main/webapps/ibisph-view/xslt/html/query/definition/detail/DetailPage.xslt

    r3529 r3678  
    77        exclude-result-prefixes="ibis"
    88>
    9         <xsl:import href="../../module/result/Selections.xslt"/>
    109        <xsl:import href="Page.xslt"/>
    1110        <xsl:import href="SiteSpecific.xslt"/>
  • branches/2.1/src/main/webapps/ibisph-view/xslt/html/query/definition/detail/Page.xslt

    r3677 r3678  
    88>
    99        <xsl:import href="../../../Page.xslt"/>
     10        <xsl:import href="../../module/result/Selections.xslt"/>
    1011
    1112
     
    5556                <xsl:param name="configuration" select="/QUERY_MODULE/CONFIGURATIONS/CONFIGURATION[NAME=/QUERY_MODULE/REQUEST/CONFIGURATION_NAME]"/>
    5657
    57                 <xsl:param name="rowDimensionName"    select="/QUERY_MODULE/REQUEST/RESULT_GROUP_BY/ROW_DIMENSION_NAME"/>
    58                 <xsl:param name="colDimensionName"    select="/QUERY_MODULE/REQUEST/RESULT_GROUP_BY/COLUMN_DIMENSION_NAME"/>
    59                 <xsl:param name="otherDimensionName"  select="/QUERY_MODULE/REQUEST/RESULT_GROUP_BY/OTHER_DIMENSION_NAME"/>
     58                <xsl:param name="rowDimensionName"    select="/QUERY_MODULE/REQUEST/SELECTED_GROUP_BY/ROW_DIMENSION_NAME"/>
     59                <xsl:param name="colDimensionName"    select="/QUERY_MODULE/REQUEST/SELECTED_GROUP_BY/COLUMN_DIMENSION_NAME"/>
     60                <xsl:param name="otherDimensionName"  select="/QUERY_MODULE/REQUEST/SELECTED_GROUP_BY/OTHER_DIMENSION_NAME"/>
    6061                <xsl:param name="rowDimensionTitle"   select="/QUERY_MODULE/DIMENSIONS/DIMENSION[NAME=$rowDimensionName]/TITLE"/>
    6162                <xsl:param name="colDimensionTitle"   select="/QUERY_MODULE/DIMENSIONS/DIMENSION[NAME=$colDimensionName]/TITLE"/>
     
    6364                <xsl:param name="graphicName"         select="/QUERY_MODULE/REQUEST/GRAPHIC_NAME"/>
    6465
     66                <xsl:call-template name="Selections.userCriteria">
     67                        <xsl:with-param name="queryModule"         select="/QUERY_MODULE"/>
     68                        <xsl:with-param name="criteriaTitle"       select="'Selected Criteria To Be Saved'"/>
     69                        <xsl:with-param name="rowDimensionTitle"   select="$rowDimensionTitle"/>
     70                        <xsl:with-param name="colDimensionTitle"   select="$colDimensionTitle"/>
     71                        <xsl:with-param name="otherDimensionTitle" select="$otherDimensionTitle"/>
     72                        <xsl:with-param name="graphTitle"          select="if($graphicName = 'Map') then 'Map' else $graphicName"/>
     73                </xsl:call-template>
     74                <br/>
     75
    6576                <form name="form" method="post" action="{$ibis.urlPrefix}save/query/definition" autocomplete="on">
    66                         <xsl:call-template name="Selections.userCriteria">
    67                                 <xsl:with-param name="queryModule"         select="/QUERY_MODULE"/>
    68                                 <xsl:with-param name="criteriaTitle"       select="'Selected Criteria To Be Saved'"/>
    69                                 <xsl:with-param name="rowDimensionTitle"   select="$rowDimensionTitle"/>
    70                                 <xsl:with-param name="colDimensionTitle"   select="$colDimensionTitle"/>
    71                                 <xsl:with-param name="otherDimensionTitle" select="$otherDimensionTitle"/>
    72                                 <xsl:with-param name="graphTitle"          select="if($graphicName = 'Map') then 'Map' else $graphicName"/>
    73                         </xsl:call-template>
    74                         <br/>
    75 
    76                         <h2>User's Saved Query Definiton</h2>
     77                        <h2>Saved Query Definiton</h2>
    7778                        <table class="EditDetail" summary="Layout - left column is the label/title, right column contains associated input elements.">
    7879
    7980                                <tr>
    80                                         <th scope="row" title="Configuration path for the current query module">
    81                                                 Configuration Path
    82                                         </th>
    83                                         <td class="Input" title="Enter in the .">
    84                                                 <xsl:value-of select="/QUERY_MODULE/REQUEST/CONFIGURATION_PATH"/>
    85                                                 <input type="hidden" id="configurationPath" name="configurationPath" value="{/QUERY_MODULE/REQUEST/CONFIGURATION_PATH}"/>
     81                                        <td colspan="2" title="Configuration path for the current query module">
     82                                                <h3>
     83                                                        Query Module's Configuration Path:
     84                                                        <xsl:value-of select="/QUERY_MODULE/REQUEST/CONFIGURATION_PATH"/>
     85                                                        <input type="hidden" id="configurationPath" name="configurationPath" value="{/QUERY_MODULE/REQUEST/CONFIGURATION_PATH}"/>
     86                                                </h3>
    8687                                        </td>
    8788                                </tr>
    88 
    8989
    9090                                <tr><td colspan="2"><hr align="center"/></td></tr>
    9191
    9292                                <tr>
    93                                         <th scope="row" title="Unique identifier for this definition">
     93                                        <th scope="row" title="Unique identifier for this saved definition">
    9494                                                <label for="name">Name *</label>
    9595                                        </th>
    9696                                        <td class="Title" title="unique name that identifies this saved definition">
     97                                                <xsl:call-template name="Page.helpButton">
     98                                                        <xsl:with-param name="title" select="'Notes'"/>
     99                                                        <xsl:with-param name="text">
     100The above name needs to be a unique value for across all of your saved query definitions.  In the future this will be an
     101auto generated value so that it will always be unique.  Since this is a test page it is left open so that
     102you can replace/overwrite an existing defintion.
     103                                                        </xsl:with-param>
     104                                                </xsl:call-template>
    97105                                                <input id="name" name="name"  maxlength="180" type="text" value="{/QUERY_MODULE/REQUEST/CONFIGURATION_PATH}-{/QUERY_MODULE/REQUEST/CONFIGURATION_NAME}"/> <br/>
    98                                                 The above name needs to be a unique value for across all of your saved query definitions.  In the future this will be an
    99                                                 auto generated value so that it will always be unique.  Since this is a test page it is left open so that
    100                                                 you can replace/overwrite an existing defintion.
    101106                                        </td>
    102107                                </tr>
     108
     109NAME: NEEDS TO BE A SYSTEM GENERATED SERIAL NUMBER
     110NEED CHECKBOX.
     111NEED VALIDATION on TITLE???  Maybe NOT
     112IF NO QUERY RESULT THEN CHECK THE CRITERIA LIST CHECKBOX.
     113
    103114
    104115                                <tr>
  • branches/2.1/src/main/webapps/ibisph-view/xslt/html/query/module/builder/SiteSpecific.xslt

    r3677 r3678  
    260260        <URL>javascript:saveCriteria()</URL>
    261261        <DESCRIPTION>Click this button to save the selections as a saved criteria definition.</DESCRIPTION>
    262         <TITLE>Create/Save Query Criteria Definition</TITLE>
     262        <TITLE>Save Query Definition</TITLE>
    263263        <ADDITIONAL_CLASSES>MenuItem2Lines</ADDITIONAL_CLASSES>
    264264</SELECTION>
  • branches/2.1/src/main/webapps/ibisph-view/xslt/html/query/module/result/SiteSpecific.xslt

    r3677 r3678  
    116116
    117117                                <SELECTION>
     118                                        <URL><xsl:value-of select="concat($ibis.urlPrefix, 'query/definition/List.html')"/></URL>
     119                                        <DESCRIPTION>Click this button to access all query definitions.</DESCRIPTION>
     120                                        <TITLE>My Saved Query Definitions List</TITLE>
     121                                        <ADDITIONAL_CLASSES>MenuItem2Lines</ADDITIONAL_CLASSES>
     122                                </SELECTION>
     123                                <SELECTION>
    118124                                        <URL><xsl:value-of select="concat($ibis.urlPrefix, 'edit/query/result/definition', /QUERY_MODULE/REQUEST/CONFIGURATION_PATH)"/></URL>
    119125                                        <DESCRIPTION>Click this button to define a saved query result definition.</DESCRIPTION>
  • branches/2.1/src/main/webapps/ibisph-view/xslt/html/user/queryselections/Page.xslt

    r3677 r3678  
    111111                </xsl:if>
    112112
     113                <input name="queryDefinitionList" type="button" value=" Query Definitions Maintenance Page "
     114                        onclick="location.href='{$ibis.urlPrefix}query/definition/List.html'"
     115                        title="Click this button to access a list of my query definitions."
     116                />
     117
    113118        </xsl:template>
    114119
Note: See TracChangeset for help on using the changeset viewer.