Changeset 231 for trunk

Timestamp:

Mar 3, 2010, 3:50:32 PM (13 years ago)

Author:

tabma

Message:

• property page contains columns and field identifiers combined in the select dropdown

Location:

trunk/grails-app

Files:

• services/dbnp/importer/ImporterService.groovy (modified) (1 diff)
• taglib/dbnp/importer/ImporterTagLib.groovy (modified) (3 diffs)
• views/importer/common/_properties.gsp (modified) (2 diffs)

trunk/grails-app/services/dbnp/importer/ImporterService.groovy

@@ -125 +125 @@
             return System.currentTimeMillis() + Runtime.runtime.freeMemory()
         }
+
+    def importdata = {
+        
+    }
 }

trunk/grails-app/taglib/dbnp/importer/ImporterTagLib.groovy

@@ -15 +15 @@
 
 package dbnp.importer
+import dbnp.studycapturing.Template
 
 class ImporterTagLib {
@@ -70 +71 @@
     }
 
-    
+    /**
+     * Possibly this will later on return an AJAX-like autocompletion chooser for the fields?
+     * 
+     * @param importtemplate_id template identifier where fields are retrieved from
+     * @param columnindex column in the header we're talking about
+     * @return chooser object
+     * */
+    def propertyChooser = { attrs ->
+        // TODO: this should be changed to retrieving fields per entity
+        def t = Template.get(session.importtemplate_id)
+        def columnindex = attrs['columnindex']
+
+        switch (attrs['entitytype']) {
+            case 0  : createSelect(-1, "property", t.fields, "1")
+                     break
+            case 1  : break
+            case 2  : break
+            case 3  : break
+            default : out << createPropertySelect("property", t.fields, columnindex)
+                     break
+        }
+    }
+
+    /**
+     * @param name name of the HTML select object
+     * @param options list of options to be used
+     * @param columnIndex column identifier (corresponding to position in header of the Excel sheet)
+     * @return HTML select object
+     */
+    def createPropertySelect(String name, options, String columnIndex)
+    {
+        def res = "<select style=\"font-size:10px\" name=\"${name}\">"
+
+        options.each { f ->
+            res += "<option value=\"${columnIndex}:${f.id}\""
+            //res += (e.type.toInteger() == selected) ? " selected" : ""
+            res += ">${f}</option>"
+        }
+
+        res += "</select>"
+        return res
+    }    
 
     /**
@@ -93 +135 @@
         out << createSelect(selected, attrs['name'], standardcelltypes, customvalue)
     }
-    
-
 }

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

@@ -26 +26 @@
                                 <b>${header[selentity.columnindex.toInteger()].value}</b>
                             </td>
-                            <td>
-                                
-                                <g:each var="template" in="${templates}">
-                                    ${template.studyFields()}
-                                </g:each>
+                            <td>                                
+                                <!-- <g:select name="template" from="${templates.fields}"/> -->
+                                <importer:propertyChooser entity="${selentity.type.toLong()}" columnindex="${selentity.columnindex}"/>
                             </td>
+                        </tr>
                     </g:if>
                 </g:each>
@@ -40 +39 @@
               </tr>
           </g:each>
+        <tr>
+            <td>
+                <input type="submit" name="savebutton" value="Next"/>
+            </td>
+        </tr>
+
     </table>
 </g:form>