Changeset 1944

Timestamp:

28-06-11 17:02:21 (3 years ago)

Author:

robert@…

Message:

- Added warning to simplewizard for importing a large number of samples

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/SimpleWizardController.groovy (modified) (4 diffs)
• views/simpleWizard/simpleWizard/columns.gsp (modified) (1 diff)

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

@@ -611 +611 @@
                 def importerHeader;
                 def importerDataMatrix;
+                def numDataRows;
 
                 try {           
@@ -625 +626 @@
                                         dataMatrixStart - 1,    // 0 == first row
                                         5)
+                        
+                        // Determine the number of rows to be imported
+                        def sheet = workbook.getSheetAt(sheetIndex - 1)
+                        numDataRows = sheet.getLastRowNum() - ( dataMatrixStart - 1 ) + 1;
                 } catch( Exception e ) {
                         // An error occurred while reading the excel file.
@@ -671 +676 @@
                                         dataMatrixStart: dataMatrixStart,
                                         headerRow: headerRow,
+                                        numDataRows: numDataRows,
                                         data: [
                                                 header: importerHeader,
@@ -831 +837 @@
 
                     switch( entity.class ) {
-                        case Sample:
+                        case Sample:                                                    // instantiate a sample
+                                                        def newSample = new Sample(
+                                                                        parentSubject   : subject,
+                                                                        parentEvent             : samplingEvent,
+                                                                        parentEventGroup: eventGroup,
+                                                                        name                    : sampleName,
+                                                                        template                : (samplingEvent.sampleTemplate) ? samplingEvent.sampleTemplate : ''
+                                                                )
+
+                                                        flow.study.addToSamples(newSample)
                             if( !study.samples?.find( equalClosure ) ) {
                                 study.addToSamples( entity );

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

@@ -33 +33 @@
                                 Please match the columns from the excel file with the fields in the database.
                         </span> 
+                        <g:if test="${excel.numDataRows > 200}">
+                                <span class="info">
+                                        <span class="error" style="background-position: 0 50%;">Too many samples in excel file</span> 
+                                        Your uploaded excel file contains more than 200 samples. This wizard might become very slow when importing that many samples.<br />
+                                        The best you can do is to save your study (go back to the first page of the wizard and click save), and use the <i>Import</i> -&gt; 
+                                        <i>A part or a study design</i> menu option.
+                                </span> 
+                        </g:if>
                             
                         <div class="importcolumns">