Changeset 12431 in main


Ignore:
Timestamp:
12/01/16 15:40:43 (6 years ago)
Author:
Garth Braithwaite
Message:

nm epht - saved query updates.

Location:
adopters/nm-epht/trunk/src/main/webapps
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • adopters/nm-epht/trunk/src/main/webapps/epht-view-content/xml/html_content/user/Introduction.xml

    r11520 r12431  
    3737                </ibis:ExpandableContent>
    3838
    39                 <ibis:ExpandableContent titleLevel="3">
     39                <ibis:ExpandableContent titleLevel="2">
    4040                        <TITLE>Getting Started General Steps</TITLE>
    4141                        <CONTENT>
  • adopters/nm-epht/trunk/src/main/webapps/epht-view/WEB-INF/config/SiteSpecific.properties

    r12190 r12431  
    3939#    outside requests WILL fail if this value is not overridden.  Note that there
    4040#    is NO trailing slash "/".
    41 commonWebAppRemoteURLPrefix.string =https://nmtracking.org/
     41commonWebAppRemoteURLPrefix.string =https://nmtracking.org
    4242
    4343#Admin App Configuration
  • adopters/nm-epht/trunk/src/main/webapps/epht-view/WEB-INF/config/spring/SiteSpecific.xml

    r12379 r12431  
    6767                                <entry key="/dataportal/query/result/**/*.xml"          value-ref="queryIBISQResultController"/>       
    6868
    69                                 <entry key="/dataportal/query/builder/form/**"          value-ref="queryBuilderFormController"/>
     69<!-- probably needs to go away... -->
     70<entry key="/dataportal/query/builder/form/**"          value-ref="queryBuilderFormController"/>
    7071
    7172                                <!-- Q U E R Y   D E F I N I T I O N -->
    72                                 <entry key="/dataportal/query/definition/list/*"        value-ref="queryDefinitionListController"/>
    73                                 <entry key="/dataportal/query/definition/index/*"       value-ref="queryDefinitionIndexController"/>
    74 
    75                                 <entry key="/dataportal/query/definition/detail/*/*"    value-ref="queryDefinitionDetailController"/>
    76                                 <entry key="/dataportal/query/definition/result/*/*"    value-ref="queryDefinitionResultController"/>
    77                                 <entry key="/dataportal/query/definition/builder/*/*"   value-ref="queryDefinitionBuilderController"/>
    78                                 <entry key="/dataportal/query/definition/apply/*/*"     value-ref="queryDefinitionApplyController"/>
    79                                 <entry key="/dataportal/query/definition/toggle/sticky" value-ref="queryDefinitionToggleStickySessionController"/>
    80 
    81                                 <entry key="/dataportal/query/definition/from/builder"  value-ref="queryDefinitionFromBuilderController"/>
    82                                 <entry key="/dataportal/query/definition/from/result"   value-ref="queryDefinitionFromResultController"/>
    83                                 <entry key="/dataportal/query/definition/save"          value-ref="queryDefinitionSaveController"/>
    84                                 <entry key="/dataportal/query/definition/delete/*"      value-ref="queryDefinitionDeleteController"/>
     73                                <entry key="/query/definition/list/*"        value-ref="queryDefinitionListController"/>
     74                                <entry key="/query/definition/index/*"       value-ref="queryDefinitionIndexController"/>
     75
     76                                <entry key="/query/definition/detail/*/*"    value-ref="queryDefinitionDetailController"/>
     77                                <entry key="/query/definition/result/*/*"    value-ref="queryDefinitionResultController"/>
     78                                <entry key="/query/definition/builder/*/*"   value-ref="queryDefinitionBuilderController"/>
     79                                <entry key="/query/definition/apply/*/*"     value-ref="queryDefinitionApplyController"/>
     80                                <entry key="/query/definition/toggle/sticky" value-ref="queryDefinitionToggleStickySessionController"/>
     81
     82                                <entry key="/query/definition/from/builder"  value-ref="queryDefinitionFromBuilderController"/>
     83                                <entry key="/query/definition/from/result"   value-ref="queryDefinitionFromResultController"/>
     84                                <entry key="/query/definition/save"          value-ref="queryDefinitionSaveController"/>
     85                                <entry key="/query/definition/delete/*"      value-ref="queryDefinitionDeleteController"/>
    8586
    8687                                <!-- S E C U R E  -->
  • adopters/nm-epht/trunk/src/main/webapps/epht-view/css/_SiteSpecific-general.css

    r12209 r12431  
    165165        background-color:       #776F59;
    166166}
     167table.Info thead tr *
     168{
     169    color: #444;
     170}
    167171
    168172
  • adopters/nm-epht/trunk/src/main/webapps/epht-view/xslt/html/query/module/builder/SiteSpecific.xslt

    r12277 r12431  
    2121                <company>Software Technology Group/CDC/Utah Department of Health</company>
    2222        </ibis:doc>
    23        
    24 <xsl:param name="Builder.postURL"
     23
     24        <xsl:param name="Builder.postURL"
    2525                select="concat($ibis.urlPrefix, 'dataportal/query/submit/', /QUERY_MODULE/REQUEST/CONFIGURATION_PATH, '.html')"
    2626                ibis:doc="Mechanism implemented so secure query can have a different result page."
     
    5757        -->
    5858                        <SELECTION>
    59                                 <URL><xsl:value-of select="concat($ibis.urlPrefix, 'dataportal/query/definition/List.html')"/></URL>
     59                                <URL><xsl:value-of select="concat($ibis.urlPrefix, 'query/definition/list/MyDefinitions.html')"/></URL>
    6060                                <DESCRIPTION>Click this button to access all query definitions.</DESCRIPTION>
    6161                                <TITLE>My Saved Query Definitions List</TITLE>
    62                         </SELECTION>
    63                         <SELECTION>
    64                                 <URL><xsl:value-of select="concat($ibis.urlPrefix, 'dataportal/query/criteria/List.html')"/></URL>
    65                                 <DESCRIPTION>Click this button to access all query definitions.</DESCRIPTION>
    66                                 <TITLE>My Saved Query Criteria Definitions</TITLE>
    6762                        </SELECTION>
    6863                        <SELECTION>
  • adopters/nm-epht/trunk/src/main/webapps/epht-view/xslt/html/query/module/result/SiteSpecific.xslt

    r12379 r12431  
    7373        -->
    7474                <SELECTION>
    75                         <URL><xsl:value-of select="concat($ibis.urlPrefix, 'dataportal/query/definition/List.html')"/></URL>
     75                        <URL><xsl:value-of select="concat($ibis.urlPrefix, 'query/definition/list/MyDefinitions.html')"/></URL>
    7676                        <DESCRIPTION>Click this button to access all query definitions.</DESCRIPTION>
    7777                        <TITLE>My Saved Query Definitions List</TITLE>
     
    7979                </SELECTION>
    8080                <SELECTION>
    81                         <URL><xsl:value-of select="concat($ibis.urlPrefix, 'dataportal/query/definition/from/result')"/></URL>
     81                        <URL><xsl:value-of select="concat($ibis.urlPrefix, 'query/definition/from/result')"/></URL>
    8282                        <DESCRIPTION>Click this button to define a saved query result definition.</DESCRIPTION>
    8383                        <TITLE>Save Query Definition</TITLE>
  • adopters/nm-epht/trunk/src/main/webapps/epht-view/xslt/html/secure/query/module/builder/SiteSpecific.xslt

    r12390 r12431  
    6464                        <DESCRIPTION>Click this button to choose different query dataset configuration.</DESCRIPTION>
    6565                        <TITLE>Select Different Measure</TITLE>
    66                 </SELECTION>
    67 
    68                 <SELECTION>
    69                         <URL><xsl:value-of select="concat($ibis.urlPrefix, 'query/definition/List.html')"/></URL>
    70                         <DESCRIPTION>Click this button to access all query definitions.</DESCRIPTION>
    71                         <TITLE>My Saved Query Definitions List</TITLE>
    72                 </SELECTION>
    73                 <SELECTION>
    74                         <URL><xsl:value-of select="concat($ibis.urlPrefix, 'query/criteria/List.html')"/></URL>
    75                         <DESCRIPTION>Click this button to access all query definitions.</DESCRIPTION>
    76                         <TITLE>My Saved Query Criteria Definitions</TITLE>
    7766                </SELECTION>
    7867        </xsl:param>
  • adopters/nm-epht/trunk/src/main/webapps/epht-view/xslt/html/secure/query/module/result/SiteSpecific.xslt

    r12379 r12431  
    135135
    136136                        <SELECTION>
    137                                 <URL><xsl:value-of select="concat($ibis.urlPrefix, 'query/definition/from/result')"/></URL>
    138                                 <DESCRIPTION>Click this button to define a saved query result definition.</DESCRIPTION>
    139                                 <TITLE>Save Query Definition</TITLE>
    140                         </SELECTION>
    141                         <SELECTION>
    142                                 <URL><xsl:value-of select="concat($ibis.urlPrefix, 'query/definition/List.html')"/></URL>
    143                                 <DESCRIPTION>Click this button to access all query definitions.</DESCRIPTION>
    144                                 <TITLE>My Saved Query Definitions</TITLE>
    145                         </SELECTION>
    146 
    147                         <SELECTION>
    148137                                <URL>
    149138                                        <xsl:value-of select="concat(replace($Result.resultURL, '.html', '.xls'), '?PrinterFriendly=x&amp;ShowDimensionValues=', $ShowDimensionValues)"/>
     
    151140                                <DESCRIPTION>Click this button to have this page automatically put into Microsoft Excel.</DESCRIPTION>
    152141                                <TITLE>Output to Excel</TITLE>
    153                         </SELECTION>
    154                         <SELECTION>
    155                                 <URL><xsl:value-of select="concat($ibis.urlPrefix, 'query/configuration/', /QUERY_MODULE/REQUEST/CONFIGURATION_PATH, '.xml')"/></URL>
    156                                 <DESCRIPTION>Click this button to get the raw module data as XML.</DESCRIPTION>
    157                                 <TITLE>View Query Definition XML</TITLE>
    158142                        </SELECTION>
    159143
Note: See TracChangeset for help on using the changeset viewer.