Skip to content
Snippets Groups Projects
Commit 77bda6bf authored by Julia Friesel's avatar Julia Friesel
Browse files

Make import errors prettier and actually handle them

parent 44cc4482
No related branches found
No related tags found
No related merge requests found
...@@ -42,11 +42,11 @@ async function openShareDialogAndExport() { ...@@ -42,11 +42,11 @@ async function openShareDialogAndExport() {
try { try {
data = getDataAsCsvDataUri() data = getDataAsCsvDataUri()
if (!data) { if (!data) {
return Alert.alert(labels.errors.noData) return alertError(labels.errors.noData)
} }
} catch (err) { } catch (err) {
console.error(err) console.error(err)
return Alert.alert(labels.errors.couldNotConvert) return alertError(labels.errors.couldNotConvert)
} }
try { try {
...@@ -59,7 +59,7 @@ async function openShareDialogAndExport() { ...@@ -59,7 +59,7 @@ async function openShareDialogAndExport() {
}) })
} catch (err) { } catch (err) {
console.error(err) console.error(err)
return Alert.alert(labels.errors.problemSharing) return alertError(labels.errors.problemSharing)
} }
} }
...@@ -83,14 +83,17 @@ async function getFileContentAndImport() { ...@@ -83,14 +83,17 @@ async function getFileContentAndImport() {
try { try {
fileContent = await rnfs.readFile(fileInfo.uri, 'utf8') fileContent = await rnfs.readFile(fileInfo.uri, 'utf8')
} catch (err) { } catch (err) {
console.log(err) return alertError('Could not open file')
return Alert.alert('Could not open file')
} }
try { try {
importCsv(fileContent, false) await importCsv(fileContent, false)
Alert.alert('Data successfully imported') Alert.alert('Success', 'Data successfully imported')
} catch(err) { } catch(err) {
//TODO alertError(err.message)
} }
} }
function alertError(msg) {
Alert.alert('Error', msg)
}
\ No newline at end of file
...@@ -37,15 +37,9 @@ export default async function importCsv(csv, deleteFirst) { ...@@ -37,15 +37,9 @@ export default async function importCsv(csv, deleteFirst) {
}, {}) }, {})
} }
let cycleDays const cycleDays = await csvParser(config)
try { .fromString(csv)
cycleDays = await csvParser(config) .on('header', validateHeaders)
.fromString(csv)
.on('header', validateHeaders)
} catch(err) {
// TODO
console.log(err)
}
//remove symptoms where all fields are null //remove symptoms where all fields are null
putNullForEmptySymptoms(cycleDays) putNullForEmptySymptoms(cycleDays)
...@@ -72,7 +66,7 @@ function tryToCreateCycleDay(day, i) { ...@@ -72,7 +66,7 @@ function tryToCreateCycleDay(day, i) {
try { try {
db.create('CycleDay', day) db.create('CycleDay', day)
} catch (err) { } catch (err) {
const msg = `Error for line ${i + 1}(${day.date}): ${err.message}` const msg = `Line ${i + 1}(${day.date}): ${err.message}`
throw new Error(msg) throw new Error(msg)
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment