Changeset 485 for trunk/grails-app/views


Ignore:
Timestamp:
May 27, 2010, 1:13:50 PM (13 years ago)
Author:
tabma
Message:
  • refactored (now using configuration file where entities to be used are configured)
Location:
trunk/grails-app/views/importer
Files:
2 deleted
4 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/grails-app/views/importer/common/_properties.gsp

    r359 r485  
    1717    <table>
    1818          <g:each var="stdentity" in ="${standardentities}">
    19               <% if (selectedentities.any { it.type.toInteger() ==stdentity.type.toInteger()} && stdentity.type.toInteger()!=-1) { %>
    20               <tr><td colspan="2"><h4>${stdentity.name}</h4></td></tr>
     19              <% if (selectedentities.any { it.name == stdentity.value.name } && stdentity.value.name!="") { %>
     20              <tr><td colspan="2"><h4>${stdentity.value.name}</h4></td></tr>
    2121              <tr>               
    2222                  <td>Columnname:</td>
    … …  
    2424              </tr>           
    2525                <g:each var="selentity" in="${selectedentities}">
    26                     <g:if test="${selentity.type.toLong()==stdentity.type}">
     26                    <g:if test="${selentity.name==stdentity.value.name}">
    2727                        <tr>                       
    2828                            <td class="header" width="200px">

  • trunk/grails-app/views/importer/index_advanced.gsp

    r417 r485  
    1414    <h1>Importer wizard (advanced)</h1>
    1515    <p>You can import your Excel data to the server by choosing a file from your local harddisk in the form below.</p>
    16         <g:form controller="importer" method="post" action="upload" enctype="multipart/form-data">
     16        <g:form controller="importer" method="post" action="upload_advanced" enctype="multipart/form-data">
    1717        <table border="0">
    1818        <tr>

  • trunk/grails-app/views/importer/index_simple.gsp

    r449 r485  
    5757    <h1>Importer wizard (simple)</h1>
    5858    <p>You can import your Excel data to the server by choosing a file from your local harddisk in the form below.</p>
    59         <g:form controller="importer" method="post" action="upload" enctype="multipart/form-data">
     59        <g:form controller="importer" method="post" action="upload_simple" enctype="multipart/form-data">
    6060        <table border="0">
    6161        <tr>

  • trunk/grails-app/views/importer/step2_simple.gsp

    r417 r485  
    2121    <meta name="layout" content="main"/>
    2222    <link rel="stylesheet" href="${resource(dir: 'css', file: 'importer.css')}"/>
    23     <title>Step 2: import wizard entities/properties</title>
     23    <title>Step 2: import wizard properties/columns</title>
    2424  </head>
    2525  <body>
    26     <h1>Step 2: import wizard entities/properties</h1>   
    27     <p>First select the study you want to add the data to. The next step is to assign properties to the columns. Below you see the entities and columns, please make your
    28     selections.</p>
     26    <h1>Step 2: import wizard properties/columns</h1>
     27    <p>The next step is to assign properties to the columns. Below you see the columns, please assign every column to
     28    a property.</p>
    2929  <importer:properties entities="${entities}" header="${header}" templates="${templates}"/>
    3030  </body>
Note: See TracChangeset for help on using the changeset viewer.