Changeset 732
- Timestamp:
- Jul 27, 2010, 3:18:15 PM (12 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy
r727 r732 79 79 def entityClass = Class.forName(entity, true, this.getClass().getClassLoader()) 80 80 81 session.importer_ header = ImporterService.getHeader(wb, 0, entityClass)81 session.importer_workbook = wb 82 82 session.importer_study = Study.get(params.study.id.toInteger()) 83 83 session.importer_template_id = params.template_id 84 session.importer_sheet = params.sheet.toInteger() -1 // 0 == first sheet 85 session.importer_workbook = wb 86 84 session.importer_sheetindex = params.sheetindex.toInteger() -1 // 0 == first sheet 85 session.importer_datamatrix_start = params.datamatrix_start.toInteger() -1 // 0 == first row 86 session.importer_headerrow = params.headerrow.toInteger() 87 88 session.importer_header = ImporterService.getHeader(wb, 89 session.importer_sheetindex, 90 session.importer_headerrow, 91 session.importer_datamatrix_start, 92 entityClass) 93 87 94 session.importer_header.each { 88 95 selectedentities.add([name:params.entity, columnindex:it.key.toInteger()]) … … 91 98 def templates = Template.get(session.importer_template_id) 92 99 93 render(view:"step2_simple", model:[entities: selectedentities, header:session.importer_header, datamatrix:ImporterService.getDatamatrix(wb, session.importer_header, session.importer_sheet, 5), templates:templates]) 100 render(view:"step2_simple", model:[entities: selectedentities, 101 header:session.importer_header, 102 datamatrix:ImporterService.getDatamatrix( 103 wb, session.importer_header, 104 session.importer_sheet, 105 session.importer_datamatrix_start, 106 5), 107 templates:templates]) 94 108 } 95 109 -
trunk/grails-app/services/dbnp/importer/ImporterService.groovy
r729 r732 49 49 * @return header representation as a MappingColumn hashmap 50 50 */ 51 def getHeader(HSSFWorkbook wb, int sheetindex, theEntity=null){ 52 53 def sheet = wb.getSheetAt(sheetindex) 54 def datamatrix_start = sheet.getFirstRowNum() + 2 51 def getHeader(HSSFWorkbook wb, int sheetindex, int headerrow, int datamatrix_start, theEntity=null){ 52 53 def sheet = wb.getSheetAt(sheetindex) 55 54 def sheetrow = sheet.getRow(datamatrix_start) 56 55 //def header = [] … … 153 152 */ 154 153 155 HSSFCell[][] getDatamatrix(HSSFWorkbook wb, header, int sheetindex, int count) {154 HSSFCell[][] getDatamatrix(HSSFWorkbook wb, header, int sheetindex, int datamatrix_start, int count) { 156 155 def sheet = wb.getSheetAt(sheetindex) 157 156 def rows = [] 158 def df = new DataFormatter() 159 def datamatrix_start = 1 157 def df = new DataFormatter() 160 158 161 159 // walk through all rows -
trunk/grails-app/views/importer/index_simple.gsp
r682 r732 69 69 </tr> 70 70 <tr> 71 <td width="100px"> 72 Use data from sheet: 73 </td> 74 <td width="100px"> 75 <g:select name="sheetindex" from="${1..10}"/> 76 </td> 77 </tr> 78 <tr> 79 <td width="100px"> 80 Columnheader starts at row: 81 </td> 82 <td width="100px"> 83 <g:select name="headerrow" from="${1..10}"/> 84 </td> 85 </tr> 86 <tr> 87 <td width="100px"> 88 Data starts at row: 89 </td> 90 <td width="100px"> 91 <g:select name="datamatrix_start" from="${2..10}"/> 92 </td> 93 </tr> 94 <tr> 71 95 <td> 72 96 Choose your study:
Note: See TracChangeset
for help on using the changeset viewer.