admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add csv parsing and begin proper import

Browse Source
This commit is contained in:
John Cardinal
2022-03-23 19:39:29 +00:00
parent 61d8e30738
commit 2180df8f21
4 changed files with 73 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ayanova/package-lock.json generated
View File

@@ -24,6 +24,7 @@
"monaco-editor": "^0.30.1",
"monaco-editor-webpack-plugin": "^6.0.0",
"nprogress": "^0.2.0",
"papaparse": "^5.3.2",
"register-service-worker": "^1.7.2",
"vue": "^2.6.14",
"vue-chartjs": "^3.5.1",
@@ -11053,6 +11054,11 @@
"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
},
"node_modules/papaparse": {
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.3.2.tgz",
"integrity": "sha512-6dNZu0Ki+gyV0eBsFKJhYr+MdQYAzFUGlBMNj3GNrmHxmz1lfRa24CjFObPXtjcetlOv5Ad299MhIK0znp3afw=="
},
"node_modules/parallel-transform": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
@@ -25532,6 +25538,11 @@
"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
},
"papaparse": {
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.3.2.tgz",
"integrity": "sha512-6dNZu0Ki+gyV0eBsFKJhYr+MdQYAzFUGlBMNj3GNrmHxmz1lfRa24CjFObPXtjcetlOv5Ad299MhIK0znp3afw=="
},
"parallel-transform": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",

1
ayanova/package.json
View File

@@ -25,6 +25,7 @@
"monaco-editor": "^0.30.1",
"monaco-editor-webpack-plugin": "^6.0.0",
"nprogress": "^0.2.0",
"papaparse": "^5.3.2",
"register-service-worker": "^1.7.2",
"vue": "^2.6.14",
"vue-chartjs": "^3.5.1",

1
ayanova/src/main.js
View File

@@ -11,6 +11,7 @@ import NProgress from "nprogress";
import "nprogress/nprogress.css";
import { DateTime } from "luxon";
import VueCurrencyInput from "vue-currency-input";
//import Pappa from "papaparse";
//my libs
import errorhandler from "./api/errorhandler";

98
ayanova/src/views/adm-import.vue
View File

@@ -14,15 +14,14 @@
</v-col>
<v-col cols="12" sm="6" lg="4" xl="3">
<v-file-input
v-model="uploadFiles"
v-model="uploadFile"
:label="$ay.t('Import')"
accept="application/json"
accept="text/csv"
prepend-icon="$ayiFileUpload"
multiple
chips
show-size
></v-file-input
><v-btn
v-if="uploadFiles.length > 0 && ayaType != 0"
v-if="uploadFile.name && ayaType != 0"
:loading="uploading"
color="primary"
text
@@ -30,6 +29,10 @@
>{{ $ay.t("Upload") }}</v-btn
>
</v-col>
type:
{{ ayaType }}
uploadFile:
{{ uploadFile }}
<v-col cols="12">
<v-textarea
@@ -44,6 +47,7 @@
</div>
</template>
<script>
import papa from "papaparse";
const FORM_KEY = "adm-import";
export default {
data() {
@@ -51,7 +55,7 @@ export default {
selectLists: {
importableAyaTypes: []
},
uploadFiles: [],
uploadFile: [],
ayaType: 0,
importResult: "",
rights: window.$gz.role.defaultRightsObject(),
@@ -71,39 +75,57 @@ export default {
},
methods: {
async upload() {
console.log("UPLOAD: uploadFile is:", this.uploadFile);
if (this.uploadFile && this.uploadFile.name) {
console.log("Processing uploadfile");
papa.parse(this.uploadFile, {
worker: true,
step: function(row) {
console.log("Row:", row.data);
},
complete: function() {
console.log("All done!");
}
});
} else {
console.log("NO upload file");
}
//similar code in wiki-control
const vm = this;
const fileData = [];
for (let i = 0; i < vm.uploadFiles.length; i++) {
const f = vm.uploadFiles[i];
fileData.push({ name: f.name, lastModified: f.lastModified });
}
const at = {
ayaType: vm.ayaType,
files: vm.uploadFiles,
fileData: JSON.stringify(fileData)
};
try {
vm.uploading = true;
const res = await window.$gz.api.upload("import/upload", at);
if (res.error) {
window.$gz.errorHandler.handleFormError(res.error);
} else {
vm.uploadFiles = [];
//result is an array of strings
let outText = "";
res.data.forEach(function appendImportResultItem(value) {
outText += value + "\n";
});
vm.importResult = await window.$gz.translation.translateStringWithMultipleKeysAsync(
outText
);
}
} catch (error) {
window.$gz.errorHandler.handleFormError(error);
} finally {
vm.uploading = false;
}
// const vm = this;
// const fileData = [];
// for (let i = 0; i < vm.uploadFile.length; i++) {
// const f = vm.uploadFile[i];
// fileData.push({ name: f.name, lastModified: f.lastModified });
// }
// const at = {
// ayaType: vm.ayaType,
// files: vm.uploadFile,
// fileData: JSON.stringify(fileData)
// };
// try {
// vm.uploading = true;
// const res = await window.$gz.api.upload("import/upload", at);
// if (res.error) {
// window.$gz.errorHandler.handleFormError(res.error);
// } else {
// vm.uploadFile = [];
// //result is an array of strings
// let outText = "";
// res.data.forEach(function appendImportResultItem(value) {
// outText += value + "\n";
// });
// vm.importResult = await window.$gz.translation.translateStringWithMultipleKeysAsync(
// outText
// );
// }
// } catch (error) {
// window.$gz.errorHandler.handleFormError(error);
// } finally {
// vm.uploading = false;
// }
},
handleSelected() {}
}