Changeset 489 for trunk/grails-app/views

Timestamp:

May 27, 2010, 4:26:44 PM (13 years ago)

Author:

tabma

Message:

• simple wizard, tag library for properties added with a "allfieldtypes" = true/false to show all fields in the properties page instead of only filtered templatefieldtypes

Location:

trunk/grails-app/views/importer

Files:

• common/_properties.gsp (modified) (2 diffs)
• step2_simple.gsp (modified) (1 diff)

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

@@ -16 +16 @@
     <p><g:select name="study.id" from="${dbnp.studycapturing.Study.list()}" optionKey="id" class="selectsmall"/></p>
     <table>
-          <g:each var="stdentity" in ="${standardentities}">
-              <% if (selectedentities.any { it.name == stdentity.value.name } && stdentity.value.name!="") { %>
+          <g:each var="stdentity" in ="${standardentities}">          
+              
+              <% if (selectedentities.any { it.name.toLowerCase() == stdentity.value.name.toLowerCase() } && stdentity.value.name!="") { %>
               <tr><td colspan="2"><h4>${stdentity.value.name}</h4></td></tr>
               <tr>                
@@ -24 +25 @@
               </tr>           
                 <g:each var="selentity" in="${selectedentities}">
-                    <g:if test="${selentity.name==stdentity.value.name}">
+                    
+                    <g:if test="${selentity.name.toLowerCase()==stdentity.value.name.toLowerCase()}">
                         <tr>                        
                             <td class="header" width="200px">
                                 <b>${header[selentity.columnindex.toInteger()].name}</b>
                             </td>
-                            <td>                                
-                                <importer:propertyChooser name="columnproperty" mappingcolumn="${header[selentity.columnindex.toInteger()]}"/>
+                            <td>    
+                                <importer:propertyChooser name="columnproperty" mappingcolumn="${header[selentity.columnindex.toInteger()]}" allfieldtypes="${allfieldtypes}"/>
                             </td>
                         </tr>

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

@@ -27 +27 @@
     <p>The next step is to assign properties to the columns. Below you see the columns, please assign every column to
     a property.</p>
-  <importer:properties entities="${entities}" header="${header}" templates="${templates}"/>
+  <importer:properties entities="${entities}" header="${header}" templates="${templates}" allfieldtypes="true"/>
   </body>
 </html>