Changeset 312 for trunk

Timestamp:

Mar 24, 2010, 4:01:18 PM (11 years ago)

Author:

tabma

Message:

• uniquely identified column selection moved to first page and changed to radio

Location:

trunk/grails-app

Files:

• services/dbnp/importer/ImporterService.groovy (modified) (2 diffs)
• views/importer/common/_preview.gsp (modified) (1 diff)
• views/importer/common/_properties.gsp (modified) (2 diffs)
• views/importer/step2.gsp (modified) (1 diff)

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

@@ -59 +59 @@
 
         for (HSSFCell c: sheet.getRow(datamatrix_start)) {
-            def datamatrix_celltype = sheet.getRow(datamatrix_start).getCell(c.getColumnIndex()).getCellType()
-            def headercell = sheet.getRow(sheet.getFirstRowNum()).getCell(c.getColumnIndex())
+            def index   =   c.getColumnIndex()
+            def datamatrix_celltype = sheet.getRow(datamatrix_start).getCell(index).getCellType()
+            def headercell = sheet.getRow(sheet.getFirstRowNum()).getCell(index)
 
             // Check for every celltype, currently redundant code, but possibly this will be 
@@ -67 +68 @@
             switch (datamatrix_celltype) {
                     case HSSFCell.CELL_TYPE_STRING:
-                            header[c.getColumnIndex()] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING);
+                            header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING, index:index);
                             break
                     case HSSFCell.CELL_TYPE_NUMERIC:                    
                             if (HSSFDateUtil.isCellDateFormatted(c)) {
-                                header[c.getColumnIndex()] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.DATE)
+                                header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.DATE, index:index)
                             }
                             else
-                                header[c.getColumnIndex()] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.INTEGER);
+                                header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.INTEGER,index:index);
                             break
                     case HSSFCell.CELL_TYPE_BLANK:
-                            header[c.getColumnIndex()] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING);
+                            header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING, index:index);
                             break
                     default:
-                            header[c.getColumnIndex()] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING);
+                            header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING,index:index);
                             break
             }

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

@@ -15 +15 @@
 <g:form name="previewform" action="savepreview">
     <table>
+        <tr>
+            <td>Identifier:</td>
+                <g:each var="column" in="${header}">
+                    <td>
+                        <g:radio name="identifier" value="${column.value.index}"/>
+                    </td>
+                </g:each>
+            </td>
+        </tr>
         <tr>
           <td>Columnname:</td>

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

@@ -18 +18 @@
               <% if (selectedentities.any { it.type.toInteger() ==stdentity.type.toInteger()} && stdentity.type.toInteger()!=-1) { %>
               <tr><td colspan="2"><h4>${stdentity.name}</h4></td></tr>
-              <tr>
-                  <td>Identifier:</td>
+              <tr>                
                   <td>Columnname:</td>
                   <td>Property:</td>
@@ -25 +24 @@
                 <g:each var="selentity" in="${selectedentities}">
                     <g:if test="${selentity.type.toLong()==stdentity.type}">
-                        <tr>
-                            <td width="12px">
-                                <g:checkBox name="identifier"/>
-                            </td>
+                        <tr>                        
                             <td class="header" width="200px">
                                 <b>${header[selentity.columnindex.toInteger()].name}</b>

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

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