Changeset 328

Timestamp:

Apr 7, 2010, 11:24:56 AM (14 years ago)

Author:

tabma

Message:

• study can be selected, imported data fancier postview, lazy loading bug fixed (hopefully)

Location:

trunk

Files:

• grails-app/controllers/dbnp/importer/ImporterController.groovy (modified) (6 diffs)
• grails-app/services/dbnp/importer/ImporterService.groovy (modified) (4 diffs)
• grails-app/taglib/dbnp/importer/ImporterTagLib.groovy (modified) (1 diff)
• grails-app/views/importer/common/_properties.gsp (modified) (1 diff)
• grails-app/views/importer/step2.gsp (modified) (1 diff)
• grails-app/views/importer/step3.gsp (modified) (1 diff)
• web-app/css/importer.css (modified) (1 diff)

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

@@ -56 +56 @@
         def datamatrix= ImporterService.getDatamatrix(wb, 0, 5)
 
-        session.header = header
-        session.importtemplate_id = params.template_id
-        session.workbook = wb
+        session.importer_header = header
+        session.importer_template_id = params.template_id
+        session.importer_workbook = wb
 
         render (view:"step1", model:[header:header, datamatrix:datamatrix])
@@ -77 +77 @@
         def entities  = request.getParameterValues("entity")
         def templatefieldtypes = request.getParameterValues("templatefieldtype")
-        def identifiercolumnindex = params.identifier.toInteger()
+        def identifiercolumnindex = (params.identifier!=null) ? params.identifier.toInteger() : -1
 
         templatefieldtypes.each { t ->      
@@ -102 +102 @@
                 default: break
             }
-            session.header[columnindex].templatefieldtype = tft
+            session.importer_header[columnindex].templatefieldtype = tft
         }
 
@@ -125 +125 @@
             }
 
-            session.header[columnindex].identifier = (columnindex == identifiercolumnindex) ? true : false
-            session.header[columnindex].index = columnindex
-            session.header[columnindex].entity = clazz
+            session.importer_header[columnindex].identifier = (columnindex == identifiercolumnindex) ? true : false
+            session.importer_header[columnindex].index = columnindex
+            session.importer_header[columnindex].entity = clazz
         }
 
@@ -133 +133 @@
         // TODO: show template fields per entity
         
-        def templates = Template.get(session.importtemplate_id)
+        def templates = Template.get(session.importer_template_id)
 
-        render(view:"step2", model:[entities:entities, header:session.header, templates:templates])
+        render(view:"step2", model:[entities:entities, header:session.importer_header, templates:templates])
     }
 
@@ -143 +143 @@
     */
     def saveproperties = {
-        def columnproperties  = request.getParameterValues("columnproperty")
+        def columnproperties  = request.getParameterValues("columnproperty")    
+        session.importer_study = Study.get(params.study.id.toInteger())
 
         columnproperties.each { cp ->           
                 def columnindex = cp.split(":")[0].toInteger()
                 def property_id = cp.split(":")[1].toInteger()
-                session.header[columnindex].property = TemplateField.get(property_id)           
+                session.importer_header[columnindex].property = TemplateField.get(property_id)
         }
 
         //import workbook
-        session.importeddata = ImporterService.importdata(session.importtemplate_id, session.workbook, 0, 1, session.header)    
+        session.importer_importeddata = ImporterService.importdata(session.importer_template_id, session.importer_workbook, 0, 1, session.importer_header)
 
-        render(view:"step3", model:[datamatrix:session.importeddata])
+        render(view:"step3", model:[datamatrix:session.importer_importeddata])
     }
 
     def savepostview = {
-        ImporterService.savedata(session.importeddata)  
+        ImporterService.savedata(session.importer_study, session.importer_importeddata)
         render(view:"step4")
     }

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

@@ -200 +200 @@
 
     /**
-     * @param datamatrix two dimensional array containing entities with values read from Excel file
+     * Method to store a matrix containing the entities in a record like structure. Every row in the table
+     * contains one or more entity objects (which contain fields with values). So actually a row represents
+     * a record with fields from one or more different entities.
+     *
+     * @param study entity Study
+     * @param datamatrix two dimensional array containing entities with values read from Excel file     *
      */    
-    def savedata(datamatrix) {
+    def savedata(Study study, datamatrix) {
+        study.refresh()
+        
         datamatrix.each { record ->
             record.each { entity ->
@@ -210 +217 @@
                                     break
                     case Subject :  print "Persisting Subject `" + entity.name + "`: "
-                                    persistEntity(entity)
+                                    persistEntity(entity)                                   
+                                    study.addToSubjects(entity)
                                     break
                     case Event   :  print "Persisting Event `" + entity.eventdescription + "`: "
@@ -225 +233 @@
                 }
             }
-        }       
+        }
     }
 
@@ -234 +242 @@
      * 
      */
-    def persistEntity(entity) {
-        println entity.dump()
-        if (entity.save(flush:true)) {  //.merge?
-            println "OK"
+    def persistEntity(entity) { 
+        if (entity.save(flush:true)) {  //.merge?           
         } else entity.errors.allErrors.each {
                 println it

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

@@ -84 +84 @@
         //       and session variables should not be used inside the service, migrate to controller
 
-        def t = Template.get(session.importtemplate_id) 
+        def t = Template.get(session.importer_template_id)
         def mc = attrs['mappingcolumn']
 

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

@@ -14 +14 @@
 %>
 <g:form name="propertiesform" action="saveproperties">
+    <p><g:select name="study.id" from="${dbnp.studycapturing.Study.list()}" optionKey="id" class="selectsmall"/></p>
     <table>
           <g:each var="stdentity" in ="${standardentities}">

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

@@ -24 +24 @@
   </head>
   <body>
-    <h1>Step 2: import wizard entities/properties</h1>
-    <p>Please choose the study you want to add the data to.</p>
-    <p>Below you see the entities and columns, assign properties to the columns.</p>
+    <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
+    selections.</p>
   <importer:properties entities="${entities}" header="${header}" templates="${templates}"/>
   </body>

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

@@ -24 +24 @@
   <body>
     <h1>Step 3: import wizard imported data postview</h1>
-    <p>Below you see how all data was imported.</p>
-  <importer:postview datamatrix="${datamatrix}"/>
+    <p>A total of ${datamatrix.size()} rows were imported, below an overview of the rows is shown.</span>
+    <importer:postview datamatrix="${datamatrix}"/>
   </body>
 </html>

trunk/web-app/css/importer.css

@@ -5 +5 @@
     border-color: red;
     background-color: #DDDDDD;
+}
+
+.selectsmall {
+    font-size: 10px;
 }