Context Navigation

Changeset 492

Timestamp:

May 28, 2010, 11:08:19 AM (13 years ago)

Author:

tabma

Message:

Location:

trunk/grails-app

Files:

-                      r489
+                      r492
     * and the first n rows to the preview
     * @param importfile uploaded file to import
+    * @param study.id study identifier
     */
     def upload_advanced = {
         def wb = handleUpload('importfile')
         session.importer_header = ImporterService.getHeader(wb, 0)
         session.importer_template_id = params.template_id
+        session.importer_study = Study.get(params.study.id.toInteger())
         session.importer_workbook = wb
 …
         def templates = Template.get(session.importer_template_id)
         render(view:"step2", model:[entities: selectedentities, header:session.importer_header, templates:templates])
+        render(view:"step2_simple", model:[entities: selectedentities, header:session.importer_header, templates:templates])
+    }
 …
     */
     def saveproperties = {
-        session.importer_study = Study.get(params.study.id.toInteger())
         params.columnproperty.index.each { columnindex, property_id ->

-                      r489
+                      r492
         def entities = attrs['entities']
         def allfieldtypes = (attrs['allfieldtypes']==null) ? "false" : "true"
         println attrs['allfieldtypes']
         out << render ( template:"common/properties",
 …
         def allfieldtypes = attrs['allfieldtypes']
         def templatefields = (allfieldtypes=="true") ? t.fields.list() : t.fields.findAll { it.type == mc.templatefieldtype }
+        def templatefields = (allfieldtypes=="true") ? t.fields : t.fields.findAll { it.type == mc.templatefieldtype }
         (mc.identifier) ? out << "<select style=\"font-size:10px\" name=\"\" disabled><option>Identifier</option></select>":

r489	r492
14	14	%>
15	15	<g:form name="propertiesform" action="saveproperties">
16		~~<p><g:select name="study.id" from="${dbnp.studycapturing.Study.list()}" optionKey="id" class="selectsmall"/></p>~~
17	16	<table>
18	17	<g:each var="stdentity" in ="${standardentities}">

-                      r485
+                      r492
   <body>
     <h1>Importer wizard (advanced)</h1>
+    <p>You can import your Excel data to the server by choosing a file from your local harddisk in the form below.</p>
+    <p>You can import your Excel data to the server by choosing a file from your local harddisk in the form below.
+    Then choose the template you want to use and finally the study you want to import the data to.</p>
         <g:form controller="importer" method="post" action="upload_advanced" enctype="multipart/form-data">
         <table border="0">
 …
                 <g:select name="template_id" from="${templates}" optionKey="id"/>
             </td>
+        </tr>
+        <tr>
+            <td>
+                Study
+            </td>
+            <td>
+                <g:select name="study.id" from="${dbnp.studycapturing.Study.list()}" optionKey="id" class="selectsmall"/>
+            </td>
         </tr>
         <tr>

-                      r485
+                      r492
   <body>
     <h1>Step 2: import wizard entities/properties</h1>
     <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
+    <p>The next step is to assign properties to the columns. Below you see the entities and columns, please make your
     selections.</p>
   <importer:properties entities="${entities}" header="${header}" templates="${templates}"/>
   </body>

Note: See TracChangeset for help on using the changeset viewer.