Changeset 1611

Timestamp:

Mar 9, 2011, 10:24:41 PM (11 years ago)

Author:

robert@…

Message:

Improved simple study wizard

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/SimpleWizardController.groovy (modified) (4 diffs)
• services/dbnp/importer/ImporterService.groovy (modified) (4 diffs)
• views/simpleWizard/simpleWizard/finish.gsp (modified) (1 diff)

trunk/grails-app/controllers/dbnp/studycapturing/SimpleWizardController.groovy

@@ -69 +69 @@
                                                         'SamplingEvent': Template.findAllByEntity( SamplingEvent.class )
                                 ];
+                        
                                 flow.encodedEntity = [
                                                         'Sample': gdtService.encryptEntity( Sample.class.name ),
@@ -74 +75 @@
                                                         'Event': gdtService.encryptEntity( Event.class.name ),
                                                         'SamplingEvent': gdtService.encryptEntity( SamplingEvent.class.name )
-                                                ]
+                                ]
 
                                 if (flow.study.samples)
@@ -272 +273 @@
                                         flow.study.addToAssays( flow.assay );
                                 }
-                                
-                                println "Events: " + flow.study.events
-                                println "Samples: " + flow.study.samples
-                                println "Eventgroups" + flow.study.eventGroups
                                 
                                 if( flow.study.save( flush: true ) ) {
@@ -746 +743 @@
                                                         break;
                                                 case Subject:
-                                                        if( !preferredIdentifier || !study.subjects?.find( equalClosure ) ) {
-                                                                study.addToSubjects( entity );
+                                                        // Subjects should have unique names; if the user has entered the same name multiple times,
+                                                        // the subject will be renamed
+                                                        def subjectFound = study.subjects?.find( equalClosure ) ;
+                                                        if( preferredIdentifier && subjectFound ) {
+                                                                def baseName = entity.getFieldValue( preferredIdentifier.name )
+                                                                def counter = 1;
+                                                                
+                                                                while( study.subjects?.find { it.getFieldValue( preferredIdentifier.name ) == entity.getFieldValue( preferredIdentifier.name ) } ) {
+                                                                        entity.setFieldValue( preferredIdentifier.name, baseName + " (" + counter++ + ")" )
+                                                                }
                                                         }
+                                                        study.addToSubjects( entity );
+                                                        
                                                         break;
                                                 case Event:

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

@@ -282 +282 @@
                 // walk through all rows and fill the table with records
                 for( int i = rowindex; i <= sheet.getLastRowNum(); i++ ) {
-                        // Create an entity record based on a row read from Excel and store the cells which failed to be mapped
-                        def (record, failed) = importOrUpdateRecord( templates, entities, sheet.getRow(i), mcmap, parent, table, existingEntities[i] );
-
-                        // Setup the relationships between the imported entities
-                        relateEntities( record );
-
-                        // Add record with entities and its values to the table
-                        table.add(record)
-
-                        // If failed cells have been found, add them to the failed cells list
-                        if (failed?.importcells?.size() > 0) failedcells.add(failed)
+                        def row = sheet.getRow(i);
+                        
+                        if( row && !rowIsEmpty( row ) ) {
+                                // Create an entity record based on a row read from Excel and store the cells which failed to be mapped
+                                def (record, failed) = importOrUpdateRecord( templates, entities, row, mcmap, parent, table, existingEntities[i] );
+        
+                                // Setup the relationships between the imported entities
+                                relateEntities( record );
+        
+                                // Add record with entities and its values to the table
+                                table.add(record)
+        
+                                // If failed cells have been found, add them to the failed cells list
+                                if (failed?.importcells?.size() > 0) failedcells.add(failed)
+                        }
                 }
 
                 return [ "table": table, "failedCells": failedcells ]
+        }
+        
+        /**
+         * Checks whether an excel row is empty
+         * @param row   Row from the excel sheet
+         * @return              True if all cells in this row are empty or the given row is null. False otherwise
+         */
+        def rowIsEmpty( Row excelRow ) {
+                if( !excelRow )
+                        return true;
+                
+                def df = new DataFormatter();
+                for( int i = excelRow.getFirstCellNum(); i < excelRow.getLastCellNum(); i++ ) {
+                        Cell cell = excelRow.getCell( i );
+                        
+                        try {
+                                def value = df.formatCellValue(cell)
+                                if( value )
+                                        return false
+                        } catch (NumberFormatException nfe) {
+                                // If the number can't be formatted, the row isn't empty
+                                return false;
+                        }
+                }
+                
+                return true;
         }
 
@@ -344 +374 @@
                         importedEntities = importedRows.flatten().findAll { it.class == dbnp.studycapturing.Sample }.unique();
 
-                def importedSample = null // findEntityInImportedEntities( dbnp.studycapturing.Sample, excelRow, mcmap, importedEntities, df )
-                def imported = [] // retrieveEntitiesBySample( importedSample );
+                def importedSample = findEntityInImportedEntities( dbnp.studycapturing.Sample, excelRow, mcmap, importedEntities, df )
+                def imported = retrieveEntitiesBySample( importedSample );
+                
                 for( entity in entities ) {
                         // Check whether this entity should be added or updated
@@ -372 +403 @@
 
                         // Go through the Excel row cell by cell
-                        for (Cell cell: excelRow) {
+                        for( int i = excelRow.getFirstCellNum(); i < excelRow.getLastCellNum(); i++ ) {
+                                Cell cell = excelRow.getCell( i );
+                                
                                 // get the MappingColumn information of the current cell
                                 def mc = mcmap[cell.getColumnIndex()]
@@ -426 +459 @@
          */
         def findEntityByRow( Class entity, Row excelRow, def mcmap, Study parent = null, List importedEntities = [], DataFormatter df = null ) {
+                if( !excelRow )
+                        return
+                
                 if( df == null )
                         df = new DataFormatter();

trunk/grails-app/views/simpleWizard/simpleWizard/finish.gsp

@@ -25 +25 @@
                         <g:link class="view" controller="study" action="show" id="${study.id}">View study</g:link>
                         <g:link class="edit" controller="simpleWizard" action="index" id="${study.id}">Edit study</g:link>
-                        <g:link class="restart" controller="simpleWizard" action="study">Add another study</g:link>
+                        <g:link class="restart" controller="simpleWizard" action="index">Add another study</g:link>
                 </p>
         </div>