Ignore:
Timestamp:
Nov 9, 2011, 1:34:09 PM (12 years ago)
Author:
s.h.sikkema@…
Message:
  • Merged assay export and galaxy assay fetch code - now possible to select fetched data in galaxy
  • removed unused assay methods and gsps generated by grails
  • getUser now returns displayName instead of username in case of shibboleth users
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/grails-app/views/assay/assayExport/selectFields.gsp

    r1864 r2095  
    99<html>
    1010<head>
    11   <meta name="layout" content="main" />
    12   <title>Select assay fields</title>
    13   <script type="text/javascript" src="${resource(dir: 'js', file: 'tooltips.js', plugin: 'gdt')}"></script>
    14   <script type="text/javascript" src="${resource(dir: 'js', file: 'jquery.qtip-1.0.0-rc3.min.js', plugin: 'gdt')}"></script>
    15   <link rel="stylesheet" href="${resource(dir: 'css', file: 'templates.css')}"/>
     11        <g:if test="${GALAXY_URL}">
     12                <meta name="layout" content="galaxy"/>
     13        </g:if>
     14        <g:else>
     15                <meta name="layout" content="main"/>
     16        </g:else>
    1617
    17   <style type="text/css">
    18     .category{
    19       margin-left: 5px;
    20     }
     18        <title>Select assay fields</title>
     19        <script type="text/javascript" src="${resource(dir: 'js', file: 'tooltips.js', plugin: 'gdt')}"></script>
     20        <script type="text/javascript"
     21                        src="${resource(dir: 'js', file: 'jquery.qtip-1.0.0-rc3.min.js', plugin: 'gdt')}"></script>
     22        <link rel="stylesheet" href="${resource(dir: 'css', file: 'templates.css')}"/>
    2123
    22     .field{
    23       margin-left: 20px;
    24     }
     24        <style type="text/css">
     25        .category {
     26                margin-left: 5px;
     27        }
    2528
    26     .element .helpIcon{
    27       margin-top: 0;
    28     }
    29   </style>
     29        .field {
     30                margin-left: 20px;
     31        }
    3032
    31   <script type="text/javascript">
    32     $(document).ready(function() {
    33       attachHelpTooltips();
    34     })
    35   </script>
     33        .element .helpIcon {
     34                margin-top: 0;
     35        }
     36        </style>
     37
     38        <script type="text/javascript">
     39                $(document).ready(function() {
     40                        attachHelpTooltips();
     41                })
     42        </script>
    3643</head>
    37   <body>
    38   <div>
    3944
    40     <h1>Select the columns that you want to be included in the resulting file</h1>
     45<body>
     46<div>
    4147
    42     <g:if test="${errorMessage}">
    43     <div class="errormessage">${errorMessage}</div>
    44     </g:if>
     48        <h1>Select the columns that you want to be included in the resulting file</h1>
    4549
    46     In this step you can make a selection from the available fields stored in the database related to the samples, including measurement data from a module (if available).
     50        <g:if test="${errorMessage}">
     51                <div class="errormessage">${errorMessage}</div>
     52        </g:if>
    4753
    48     <g:form name="fieldSelectForm" action="assayExport">
     54        In this step you can make a selection from the available fields stored in the database related to the samples, including measurement data from a module (if available).
    4955
    50       <g:set var="catNum" value="${0}"/>
    51       <g:each in="${fieldMap}" var="entry">
     56        <g:form name="fieldSelectForm" action="assayExport">
    5257
    53           <assayExporter:categorySelector category="${entry.key}" name="cat_${catNum}" value="${true}" />
     58                <g:set var="catNum" value="${0}"/>
     59                <g:each in="${fieldMap}" var="entry">
    5460
    55           <assayExporter:fieldSelectors ref="cat_${catNum}" fields="${entry.value}"/>
     61                        <assayExporter:categorySelector category="${entry.key}" name="cat_${catNum}" value="${true}"/>
    5662
    57           <g:set var="catNum" value="${catNum + 1}"/>
     63                        <assayExporter:fieldSelectors ref="cat_${catNum}" fields="${entry.value}"/>
    5864
    59       </g:each>
     65                        <g:set var="catNum" value="${catNum + 1}"/>
    6066
    61       <assayExporter:categorySelector category="Measurements" name="cat_${catNum}" value="${measurementTokens as Boolean}" />
    62       <g:select name="measurementToken" id="measurementToken" from="${measurementTokens}" value="${measurementTokens}" class="field" multiple="true" />
    63       <br /><br />
     67                </g:each>
    6468
    65       <h1>Select type of resulting file</h1>
    66       <g:radioGroup name="exportFileType" labels="['Tab delimited (.txt)', 'Comma Separated: USA/UK (.csv)', 'Semicolon Separated: European (.csv)']" values="[1,2,3]" value="1" >
    67         <p>${it.radio} ${it.label}</p>
    68       </g:radioGroup>
    69       <g:submitButton name="submit" value="Submit"/>
     69                <assayExporter:categorySelector category="Measurements" name="cat_${catNum}"
     70                                                                                value="${measurementTokens as Boolean}"/>
     71                <g:select name="measurementToken" id="measurementToken" from="${measurementTokens}" value="${measurementTokens}"
     72                                  class="field" multiple="true"/>
     73                <br/><br/>
    7074
    71     </g:form>
     75                <g:if test="${GALAXY_URL}">
     76                        <g:submitButton name="submitToGalaxy" value="Submit to Galaxy"/>
     77                </g:if>
     78                <g:else>
     79                        <h1>Select type of resulting file</h1>
     80                        <g:radioGroup name="exportFileType"
     81                                                  labels="['Tab delimited (.txt)', 'Comma Separated: USA/UK (.csv)', 'Semicolon Separated: European (.csv)']"
     82                                                  values="[1,2,3]" value="1">
     83                                <p>${it.radio} ${it.label}</p>
     84                        </g:radioGroup>
     85                        <g:submitButton name="submit" value="Submit"/>
     86                </g:else>
    7287
    73   </div>
    74   </body>
     88
     89
     90        </g:form>
     91
     92</div>
     93</body>
    7594</html>
Note: See TracChangeset for help on using the changeset viewer.