Changeset 200 for trunk

Timestamp:

Feb 15, 2010, 9:38:24 PM (10 years ago)

Author:

tabma

Message:

• properties template

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (2 diffs)
• taglib/dbnp/importer/ImporterTagLib.groovy (modified) (4 diffs)
• views/importer/common/_preview.gsp (modified) (3 diffs)
• views/importer/common/_properties.gsp (added)
• views/importer/step2.gsp (added)

trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy

@@ -38 +38 @@
     def upload = {
         def downloadedfile = request.getFile('importfile');
-        def tempfile = new File(System.getProperty('java.io.tmpdir') + File.pathSeparator + System.currentTimeMillis() + ".nmcdsp")
+        def tempfile = new File(System.getProperty('java.io.tmpdir') + File.separatorChar + System.currentTimeMillis() + ".nmcdsp")
         downloadedfile.transferTo(tempfile)
         
@@ -50 +50 @@
     }
 
-    def accept = {
-        
+    def savepreview = { 
+        def entities  = request.getParameterValues("entity")
+
+        render(view:"step2", model:[entities:entities])
     }
 }

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

@@ -37 +37 @@
     }
 
-    def createSelect(int selected, String name, ArrayList options) {
+    def entity = { attrs ->
+        out << entities[attrs['index']].name
+    }
+
+    /**
+     * @param entities array of entity:columnindex values
+     */
+    def properties = { attrs ->
+        def ent = []
+
+        attrs['entities'].each { e ->
+            def temp = e.split(":")         
+            def entity = [type:temp[0],columnindex:temp[1]]
+            ent.add(entity)
+        }
+
+        out << render (template:"common/properties", model:[entities:ent])
+    }
+
+    def createSelect(int selected, String name, ArrayList options, String customvalue) {
         def res = "<select style=\"font-size:10px\" name=\"${name}\">"
 
         options.each { e ->
-            res += "<option value=\"${e.value}\""
+            res += "<option value=\"${e.value}:${customvalue}\""
             res += (e.value == selected) ? " selected" : ""
             res += ">${e.name}</option>"
@@ -50 +69 @@
     }
 
+    
+
     /**
      * @param selected selected entity
@@ -56 +77 @@
     def entitySelect = { attrs ->       
         def selected = (attrs['selected']==null) ? -1 : attrs['selected']
-        out << createSelect(selected, attrs['name'], entities)
+        def customvalue = (attrs['customvalue']==null) ? "" : attrs['customvalue']
+        out << createSelect(selected, attrs['name'], entities, customvalue)
     }
 
@@ -67 +89 @@
     def celltypeSelect = { attrs ->
         def selected = (attrs['selected']==null) ? -1 : attrs['selected']
-        out << createSelect(selected, attrs['name'], celltypes)
+        def customvalue = (attrs['customvalue']==null) ? "" : attrs['customvalue']
+        out << createSelect(selected, attrs['name'], celltypes, customvalue)
     }
 }

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

@@ -13 +13 @@
          */
 %>
-<g:form name="previewform" action="accept">
+<g:form name="previewform" action="savepreview">
     <table>
         <tr>
@@ -28 +28 @@
             <g:each var="column" in="${header}">
                 <td class="header">
-                    <importer:celltypeSelect selected="${column.celltype}" name="celltype[${column.columnindex}]"/>
+                    <importer:celltypeSelect selected="${column.celltype}" name="celltype" customvalue="${column.columnindex.toString()}"/>
                 </td>
             </g:each>
@@ -37 +37 @@
             <g:each var="column" in="${header}">
                 <td class="header">
-                    <importer:entitySelect name="entity[${column.columnindex}]"/>
+                    <importer:entitySelect name="entity" customvalue="${column.columnindex.toString()}"/>
                 </td>
             </g:each>