Skip to content

Commit

Permalink
Merge branch 'release/0.16.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Mulholland committed May 9, 2018
2 parents b9d83b4 + 88fee82 commit 80fb933
Show file tree
Hide file tree
Showing 29 changed files with 1,088 additions and 373 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "DataCurator",
"version": "0.15.0",
"version": "0.16.0",
"author": " <[email protected]>",
"description": "Data Curator is a simple desktop CSV editor to help describe, validate and share usable open data",
"license": "MIT",
Expand Down Expand Up @@ -99,7 +99,7 @@
"sortablejs": "^1.6.0",
"spectron-fake-dialog": "^0.0.1",
"svgo": "^1.0.5",
"tableschema": "^1.7.0",
"tableschema": "^1.9.1",
"tmp": "^0.0.33",
"unzipper": "^0.8.12",
"vee-validate": "^2.0.4",
Expand Down
6 changes: 3 additions & 3 deletions src/main/excel.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ export function importExcel() {
if (fileNames === undefined) { return }
var fileName = fileNames[0]
var workbook = XLSX.readFile(fileName)
var first_sheet_name = workbook.SheetNames[0]
var worksheet = workbook.Sheets[first_sheet_name]
// var first_sheet_name = workbook.SheetNames[0]
// var worksheet = workbook.Sheets[first_sheet_name]

let shortcutsSubMenu = getSubMenuFromMenu('File', 'Open Excel Sheet...')
shortcutsSubMenu.enabled = false
Expand All @@ -30,7 +30,7 @@ export function importExcel() {
closeWindowSafely(browserWindow)
})
ipc.once('worksheetSelected', function(e, sheet_name) {
let data = XLSX.utils.sheet_to_csv(workbook.Sheets[sheet_name])
var data = XLSX.utils.sheet_to_json(workbook.Sheets[sheet_name], {header: 1})
closeWindowSafely(browserWindow)
createWindowTabWithData(data)
})
Expand Down
Loading

0 comments on commit 80fb933

Please sign in to comment.