Changeset 1553

Timestamp:

Feb 23, 2011, 4:32:09 PM (12 years ago)

Author:

robert@…

Message:

First version of a simple wizard

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/SimpleWizardController.groovy (added)
• grails-app/services/dbnp/importer/ImporterService.groovy (modified) (16 diffs)
• grails-app/taglib/dbnp/studycapturing/SimpleWizardTagLib.groovy (added)
• grails-app/views/simpleWizard (added)
• grails-app/views/simpleWizard/_javascripts.gsp (added)
• grails-app/views/simpleWizard/assays.gsp (added)
• grails-app/views/simpleWizard/columns.gsp (added)
• grails-app/views/simpleWizard/missingFields.gsp (added)
• grails-app/views/simpleWizard/overview.gsp (added)
• grails-app/views/simpleWizard/samples.gsp (added)
• grails-app/views/simpleWizard/save.gsp (added)
• grails-app/views/simpleWizard/study.gsp (added)
• test/unit/dbnp/studycapturing/SimpleWizardControllerTests.groovy (added)
• test/unit/dbnp/studycapturing/SimpleWizardTagLibTests.groovy (added)
• web-app/css/buttons.css (modified) (1 diff)
• web-app/css/simplewizard.css (added)
• web-app/js/simpleWizard.js (added)
• web-app/js/studywizard.js (modified) (1 diff)

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

@@ -61 +61 @@
                         switch (datamatrix_celltype) {
                                 case Cell.CELL_TYPE_STRING:
-                                        //parse cell value as double
+                                //parse cell value as double
                                         def doubleBoolean = true
                                         def fieldtype = TemplateFieldType.STRING
 
-                                        // is this string perhaps a double?
+                                // is this string perhaps a double?
                                         try {
                                                 formatValue(datamatrix_celldata, TemplateFieldType.DOUBLE)
@@ -74 +74 @@
 
                                         header[columnindex] = new dbnp.importer.MappingColumn(name: df.formatCellValue(headercell),
-                                                templatefieldtype: fieldtype,
-                                                index: columnindex,
-                                                entityclass: theEntity,
-                                                property: property);
+                                                        templatefieldtype: fieldtype,
+                                                        index: columnindex,
+                                                        entityclass: theEntity,
+                                                        property: property);
 
                                         break
@@ -85 +85 @@
                                         def longBoolean = true
 
-                                        // is this cell really an integer?
+                                // is this cell really an integer?
                                         try {
                                                 Long.valueOf(datamatrix_celldata)
@@ -93 +93 @@
                                         }
 
-                                        // it's not an long, perhaps a double?
+                                // it's not an long, perhaps a double?
                                         if (!longBoolean)
                                                 try {
@@ -105 +105 @@
 
                                         header[columnindex] = new dbnp.importer.MappingColumn(name: df.formatCellValue(headercell),
-                                                templatefieldtype: fieldtype,
-                                                index: columnindex,
-                                                entityclass: theEntity,
-                                                property: property);
+                                                        templatefieldtype: fieldtype,
+                                                        index: columnindex,
+                                                        entityclass: theEntity,
+                                                        property: property);
                                         break
                                 case Cell.CELL_TYPE_BLANK:
                                         header[columnindex] = new dbnp.importer.MappingColumn(name: df.formatCellValue(headercell),
-                                                templatefieldtype: TemplateFieldType.STRING,
-                                                index: columnindex,
-                                                entityclass: theEntity,
-                                                property: property);
+                                        templatefieldtype: TemplateFieldType.STRING,
+                                        index: columnindex,
+                                        entityclass: theEntity,
+                                        property: property);
                                         break
                                 default:
                                         header[columnindex] = new dbnp.importer.MappingColumn(name: df.formatCellValue(headercell),
-                                                templatefieldtype: TemplateFieldType.STRING,
-                                                index: columnindex,
-                                                entityclass: theEntity,
-                                                property: property);
+                                        templatefieldtype: TemplateFieldType.STRING,
+                                        index: columnindex,
+                                        entityclass: theEntity,
+                                        property: property);
                                         break
                         } // end of switch
@@ -150 +150 @@
 
                         (0..header.size() - 1).each { columnindex ->
-                if (sheet.getRow(rowindex))
-                    row.add( sheet.getRow(rowindex).getCell(columnindex, Row.CREATE_NULL_AS_BLANK) )
+                                if (sheet.getRow(rowindex))
+                                        row.add( sheet.getRow(rowindex).getCell(columnindex, Row.CREATE_NULL_AS_BLANK) )
                         }
 
@@ -204 +204 @@
                 def table = []
                 def failedcells = [] // list of records
-
+                
                 // walk through all rows and fill the table with records
                 (rowindex..sheet.getLastRowNum()).each { i ->
@@ -218 +218 @@
 
                 return [table, failedcells]
+        }
+
+        /**
+         * Removes a cell from the failedCells list, based on the entity and field. If the entity and field didn't fail before
+         * the method doesn't do anything.
+         * 
+         * @param failedcell    list of cells that have failed previously
+         * @param entity                entity to remove from the failedcells list
+         * @param field                 field to remove the failed cell for. If no field is given, all cells for this entity will be removed
+         * @return List                 Updated list of cells that have failed
+         */
+        def removeFailedCell(failedcells, entity, field = null ) {
+                if( !entity )
+                        return failedcells;
+
+                def filterClosure
+                if( field ) {
+                        def entityIdField = "entity_" + entity.getIdentifier() + "_" + field.name.toLowerCase()
+                        filterClosure = { cell -> cell.entityidentifier != entityIdField }
+                } else {
+                        def entityIdField = "entity_" + entity.getIdentifier() + "_"
+                        filterClosure = { cell -> !cell.entityidentifier.startsWith( entityIdField ) }
+                }
+
+                failedcells.each { record ->
+                        record.importcells = record.importcells.findAll( filterClosure )
+                }
+
+                return failedcells;
+        }
+
+        /**
+         * Returns the name of an input field as it is used for a specific entity in HTML.
+         *
+         * @param entity                entity to retrieve the field name for
+         * @param field                 field to retrieve the field name for
+         * @return String               Name of the HTML field for the given entity and field. Can also be used in the map
+         *                                              of request parameters
+         */
+        def getFieldNameInTableEditor(entity, field) {
+                if( field instanceof TemplateField )
+                        field = field.escapedName();
+
+                return "entity_" + entity.getIdentifier() + "_" + field
+        }
+
+        /**
+         * Retrieves a mapping column from a list based on the given fieldname
+         * @param mappingColumns                List of mapping columns
+         * @param fieldName                     Field name to find
+         * @return                                      Mapping column if a column is found, null otherwise
+         */
+        def findMappingColumn( mappingColumns, String fieldName ) {
+                return mappingColumns.find { it.property == fieldName.toLowerCase() }
         }
 
@@ -278 +332 @@
                                         case Study: log.info ".importer wizard, persisting Study `" + entity + "`: "
                                                 entity.owner = authenticationService.getLoggedInUser()
-                        
-                        if (study.validate()) {
-                            if (!entity.save(flush:true)) {
-                                log.error ".importer wizard, study could not be saved: " + entity
-                                throw new Exception('.importer wizard, study could not be saved: ' + entity)
-                            }
-                        } else {
-                            log.error ".importer wizard, study could not be validated: " + entity
-                            throw new Exception('.importer wizard, study could not be validated: ' + entity)
-                        }
-
-                        break
+
+                                                if (study.validate()) {
+                                                        if (!entity.save(flush:true)) {
+                                                                log.error ".importer wizard, study could not be saved: " + entity
+                                                                throw new Exception('.importer wizard, study could not be saved: ' + entity)
+                                                        }
+                                                } else {
+                                                        log.error ".importer wizard, study could not be validated: " + entity
+                                                        throw new Exception('.importer wizard, study could not be validated: ' + entity)
+                                                }
+
+                                                break
                                         case Subject: log.info ".importer wizard, persisting Subject `" + entity + "`: "
 
-                                                // is the current entity not already in the database?
-                                                //entitystored = isEntityStored(entity)
-
-                                                // this entity is new, so add it to the study
-                                                //if (entitystored==null)
+                                        // is the current entity not already in the database?
+                                        //entitystored = isEntityStored(entity)
+
+                                        // this entity is new, so add it to the study
+                                        //if (entitystored==null)
 
                                                 study.addToSubjects(entity)
@@ -306 +360 @@
                                         case Sample: log.info ".importer wizard, persisting Sample `" + entity + "`: "
 
-                                                // is this sample validatable (sample name unique for example?)
+                                        // is this sample validatable (sample name unique for example?)
                                                 study.addToSamples(entity)
 
@@ -391 +445 @@
         boolean persistEntity(entity) {
                 /*log.info ".import wizard persisting ${entity}"
-
-                try {            
-                        entity.save(flush: true)
-                        return true
-
-                } catch (Exception e) {
-                        def session = sessionFactory.currentSession
-                        session.setFlushMode(org.hibernate.FlushMode.MANUAL)
-                        log.error ".import wizard, failed to save entity:\n" + org.apache.commons.lang.exception.ExceptionUtils.getRootCauseMessage(e)
-                }
-
-                return true*/
-        //println "persistEntity"
+                 try {            
+                 entity.save(flush: true)
+                 return true
+                 } catch (Exception e) {
+                 def session = sessionFactory.currentSession
+                 session.setFlushMode(org.hibernate.FlushMode.MANUAL)
+                 log.error ".import wizard, failed to save entity:\n" + org.apache.commons.lang.exception.ExceptionUtils.getRootCauseMessage(e)
+                 }
+                 return true*/
+                //println "persistEntity"
         }
 
@@ -441 +492 @@
                                 }
 
-                                try {                    
+                                try {
                                         // which entity does the current cell (field) belong to?
                                         switch (mc.entityclass) {
@@ -466 +517 @@
                                         log.error ".import wizard error could not set property `" + mc.property + "` to value `" + value + "`"
                                         // store the mapping column and value which failed
-                    def identifier
+                                        def identifier
 
                                         switch (mc.entityclass) {
@@ -503 +554 @@
                         case TemplateFieldType.TEXT: return value.trim()
                         case TemplateFieldType.LONG: return (long) Double.valueOf(value)
-                //case TemplateFieldType.FLOAT      :   return Float.valueOf(value.replace(",","."));
+                        //case TemplateFieldType.FLOAT      :   return Float.valueOf(value.replace(",","."));
                         case TemplateFieldType.DOUBLE: return Double.valueOf(value.replace(",", "."));
                         case TemplateFieldType.STRINGLIST: return value.trim()
@@ -520 +571 @@
 
                 dotProduct(l_histo, r_histo) /
-                        Math.sqrt(dotProduct(l_histo, l_histo) *
+                                Math.sqrt(dotProduct(l_histo, l_histo) *
                                 dotProduct(r_histo, r_histo))
         }
@@ -546 +597 @@
 
                 similarity(l_str.toString().toLowerCase().toCharArray(),
-                        r_str.toString().toLowerCase().toCharArray(),
-                        degree)
+                                r_str.toString().toLowerCase().toCharArray(),
+                                degree)
         }
 

trunk/web-app/css/buttons.css

@@ -24 +24 @@
 }
 
+.options a.save {
+        background-image: url(../plugins/famfamfam-1.0.1/images/icons/page_save.png);
+}
+.options a.skip {
+        background-image: url(../plugins/famfamfam-1.0.1/images/icons/control_end_blue.png);
+}
+.options a.view {
+        background-image: url(../plugins/famfamfam-1.0.1/images/icons/application_form_magnify.png);
+}
+.options a.restart {
+        background-image: url(../plugins/famfamfam-1.0.1/images/icons/arrow_redo.png);
+}
+.options a.edit {
+        background-image: url(../plugins/famfamfam-1.0.1/images/icons/application_form_edit.png);
+}
+
 .options a.performAction {
         background-image: url(../plugins/famfamfam-1.0.1/images/icons/brick_go.png);

trunk/web-app/js/studywizard.js

@@ -148 +148 @@
 function handleWizardTable() {
         var that = this;
-        var wizardTables = $(".ajaxFlow").find('div.tableEditor');
+        var wizardTables = $('div.tableEditor');
 
         wizardTables.each(function() {