Changeset 632

Timestamp:

Jul 1, 2010, 12:31:49 PM (13 years ago)

Author:

tabma

Message:

• extra step for Simple Import Wizard implemented for easy adding and editing of cells (which were not imported yet)

Location:

trunk

Files:

• grails-app/controllers/dbnp/importer/ImporterController.groovy (modified) (9 diffs)
• grails-app/services/dbnp/importer/ImporterService.groovy (modified) (2 diffs)
• grails-app/taglib/dbnp/importer/ImporterTagLib.groovy (modified) (2 diffs)
• grails-app/views/importer/common/_datapreview.gsp (added)
• grails-app/views/importer/common/_missingproperties.gsp (added)
• grails-app/views/importer/common/_preview.gsp (modified) (1 diff)
• grails-app/views/importer/common/_properties_horizontal.gsp (added)
• grails-app/views/importer/common/_properties_vertical.gsp (moved) (moved from trunk/grails-app/views/importer/common/_properties.gsp) (2 diffs)
• grails-app/views/importer/index.gsp (modified) (1 diff)
• grails-app/views/importer/index_simple.gsp (modified) (2 diffs)
• grails-app/views/importer/step2.gsp (modified) (1 diff)
• grails-app/views/importer/step2_simple.gsp (modified) (1 diff)
• grails-app/views/importer/step3_simple.gsp (added)
• web-app/css/importer.css (modified) (1 diff)
• web-app/js/importer.js (added)

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

@@ -41 +41 @@
     }
 
-    def simplewizard = {
+    def simpleWizard = {
         render(view:"index_simple", model:[studies:Study.list(), entities: grailsApplication.config.gscf.domain.importableEntities])
     }
 
-    def advancedwizard = {
+    def advancedWizard = {
         render(view:"index_advanced", model:[templates:Template.list()])
     }
@@ -62 +62 @@
         session.importer_template_id = params.template_id
         session.importer_workbook = wb
-
-        
 
         render (view:"step1_advanced", model:[header:session.importer_header, datamatrix:ImporterService.getDatamatrix(wb, 0, 5)])
@@ -90 +88 @@
         }
 
-        //import workbook
-        //session.importer_importeddata = ImporterService.importdata(session.importer_template_id, session.importer_workbook, 0, 1, session.importer_header)
-
-        //println "DAS" + session.importer_header
-
-        //render(view:"step2_simple", model:[datamatrix:session.importer_importeddata])
         def templates = Template.get(session.importer_template_id)
         
-        render(view:"step2_simple", model:[entities: selectedentities, header:session.importer_header, templates:templates])
+        render(view:"step2_simple", model:[entities: selectedentities, header:session.importer_header, datamatrix:ImporterService.getDatamatrix(wb, 0, 5), templates:templates])
     }
 
@@ -118 +110 @@
 
     /**
+     * @param entity entity class we are using (dbnp.studycapturing.Subject etc.)
+     */
+
+    def saveMissingProperties = {
+        println params.entity
+        
+        session.importer_importeddata.each { table ->
+            table.each { entity ->
+                entity.giveFields().each { field ->
+                    print ":" + params["entity_" + entity.hashCode() + "_" + field.escapedName()]
+                    entity.setFieldValue (field.toString(), params["entity_" + entity.hashCode() + "_" + field.escapedName()])
+                }               
+            }
+        }
+
+        render(view:"step3", model:[datamatrix:session.importer_importeddata])
+        //render("Succesful")
+    }
+
+    /**
     * User has assigned all entities and templatefieldtypes to the columns and continues to the next step (assigning properties to columns)
     * All information of the columns is stored in a session as MappingColumn object
@@ -127 +139 @@
     * @see celltype: http://poi.apache.org/apidocs/org/apache/poi/ss/usermodel/Cell.html
     */
-    def savepreview = {
+    def savePreview = {
         def tft = null  
         def identifiercolumnindex = (params.identifier!=null) ? params.identifier.toInteger() : -1
@@ -198 +210 @@
     *
     */
-    def saveproperties = {      
+    def saveProperties = {
 
         params.columnproperty.index.each { columnindex, property ->
@@ -204 +216 @@
 
                 def entityClass = Class.forName(session.importer_header[columnindex.toInteger()].entity.getName(), true, this.getClass().getClassLoader())
-                def entityObj = entityClass.newInstance(template:template)              
-
+                def entityObj = entityClass.newInstance(template:template)
                 
                 session.importer_header[columnindex.toInteger()].property = property
@@ -218 +229 @@
         session.importer_importeddata = ImporterService.importdata(session.importer_template_id, session.importer_workbook, 0, 1, session.importer_header)
 
-        render(view:"step3", model:[datamatrix:session.importer_importeddata])
-    }
-
-    def savepostview = {
+        if (params.layout=="horizontal")
+            render(view:"step3_simple", model:[datamatrix:session.importer_importeddata])
+        else if (params.layout=="vertical")
+            render(view:"step3", model:[datamatrix:session.importer_importeddata])
+    }
+
+    def savePostview = {
         ImporterService.saveDatamatrix(session.importer_study, session.importer_importeddata)
         render(view:"step4")
@@ -234 +248 @@
     def ajaxGetTemplatesByEntity = {
         def entityClass = grailsApplication.config.gscf.domain.importableEntities.get(params.entity).entity
+        
 
         // fetch all templates for a specific entity
-        def templates = Template.findAllByEntity(Class.forName(entityClass, true, this.getClass().getClassLoader()))
+        //def templates = Template.findAllByEntity(Class.forName(entityClass, true, this.getClass().getClassLoader()))
+        def templates = Template.list()
+
+        println templates.dump()
 
         // render as JSON

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

@@ -63 +63 @@
             def headercell = sheet.getRow(sheet.getFirstRowNum()).getCell(index)
             def tft = TemplateFieldType.STRING //default templatefield type
-
             
             // Check for every celltype, currently redundant code, but possibly this will be 
@@ -295 +294 @@
         def record = [] 
         
-        def study = new Study(title:"New study", template:template)
-        def subject = new Subject(name:"New subject", species:Term.findByName("Homo sapiens"), template:template)
-        def event = new Event(eventdescription:"New event", template:template)
-        def sample = new Sample(name:"New sample", template:template)
+        def study = new Study(template:template)
+        def subject = new Subject(template:template)
+        def event = new Event(template:template)
+        def sample = new Sample(template:template)
 
         for (HSSFCell cell: excelrow) {     

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

@@ -50 +50 @@
     }
 
+    def datapreview = { attrs ->
+        def datamatrix = attrs['datamatrix']
+        out << render (template:"common/datapreview", model:[datamatrix:datamatrix])
+    }
+
+    /**
+     * Show missing properties
+     */
+    def missingProperties = { attrs ->
+        def datamatrix = attrs['datamatrix']    
+        out << render (template:"common/missingproperties", model:[datamatrix:datamatrix])
+    }
+
     /**
      * @param entities array containing selected entities
+     * @param header array containing mappingcolumn objects
+     * @param allfieldtypes if set, show all fields
+     * @param layout constant value: "horizontal" or "vertical"
      */
     def properties = { attrs ->
@@ -57 +73 @@
         def entities = attrs['entities']
         def allfieldtypes = (attrs['allfieldtypes']==null) ? "false" : "true"
+        def layout = (attrs['layout']==null) ? "vertical" : attrs['layout']
+
+        //choose template for vertical layout (default) or horizontal layout
+        def template = (layout == "vertical") ? "common/properties_vertical" : "common/properties_horizontal"
         
-
-        out << render ( template:"common/properties",
+        out << render ( template:template,
                         model:[selectedentities:entities,
                         standardentities:grailsApplication.config.gscf.domain.importableEntities,
                         header:header,
-                        allfieldtypes:allfieldtypes]
+                        allfieldtypes:allfieldtypes,
+                        layout:layout]
                         )
     }

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

@@ -62 +62 @@
             </tr>
         </g:each>
+        
         <tr>
             <td align="right" colspan="${datamatrix.length}"><input type="submit" value="Next"></td>

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

@@ -13 +13 @@
          */
 %>
-<g:form name="propertiesform" action="saveproperties">
+<g:form name="propertiesform" action="saveProperties">
     <table>
           <g:each var="stdentity" in ="${standardentities}">          
@@ -45 +45 @@
         <tr>
             <td>
+                <input type="hidden" name="layout" value="${params.layout}">
                 <input type="submit" name="savebutton" value="Next"/>
             </td>

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

@@ -17 +17 @@
     <ol>
         <li>
-            <g:link controller="importer" action="simplewizard">Simple wizard</g:link>
+            <g:link controller="importer" action="simpleWizard">Simple wizard</g:link>
         </li>
         <li>
-            <g:link controller="importer" action="advancedwizard">Advanced wizard</g:link>
+            <g:link controller="importer" action="advancedWizard">Advanced wizard</g:link>
         </li>
     </ol>

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

@@ -5 +5 @@
 
 <%@ page contentType="text/html;charset=UTF-8" %>
-<g:setProvider library="jquery"/>
 
 <html>
@@ -11 +10 @@
     <meta name="layout" content="main"/>
     <title>Importer wizard (simple)</title>
+
+<g:javascript library="jquery"/>
 
 <g:javascript>

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

@@ -28 +28 @@
     selections.</p>
     
-  <importer:properties entities="${entities}" header="${header}" templates="${templates}"/>
+  <importer:properties entities="${entities}" header="${header}" templates="${templates}" layout="vertical"/>
   </body>
 </html>

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}" allfieldtypes="true"/>
+  <importer:properties entities="${entities}" header="${header}" datamatrix="${datamatrix}" templates="${templates}" allfieldtypes="true" layout="horizontal"/>
   </body>
 </html>

trunk/web-app/css/importer.css

@@ -25 +25 @@
 }
 
+.importer .table {
+    color:green;
+}
+
+.importer .tr {
+    color:red;
+}
+
+.importer .td {
+    color:blue;
+}