add csv parsing and begin proper import
This commit is contained in:
11
ayanova/package-lock.json
generated
11
ayanova/package-lock.json
generated
@@ -24,6 +24,7 @@
|
|||||||
"monaco-editor": "^0.30.1",
|
"monaco-editor": "^0.30.1",
|
||||||
"monaco-editor-webpack-plugin": "^6.0.0",
|
"monaco-editor-webpack-plugin": "^6.0.0",
|
||||||
"nprogress": "^0.2.0",
|
"nprogress": "^0.2.0",
|
||||||
|
"papaparse": "^5.3.2",
|
||||||
"register-service-worker": "^1.7.2",
|
"register-service-worker": "^1.7.2",
|
||||||
"vue": "^2.6.14",
|
"vue": "^2.6.14",
|
||||||
"vue-chartjs": "^3.5.1",
|
"vue-chartjs": "^3.5.1",
|
||||||
@@ -11053,6 +11054,11 @@
|
|||||||
"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
|
"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
|
||||||
"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
|
"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": {
|
"node_modules/parallel-transform": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
|
"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",
|
"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
|
||||||
"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
|
"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": {
|
"parallel-transform": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
"monaco-editor": "^0.30.1",
|
"monaco-editor": "^0.30.1",
|
||||||
"monaco-editor-webpack-plugin": "^6.0.0",
|
"monaco-editor-webpack-plugin": "^6.0.0",
|
||||||
"nprogress": "^0.2.0",
|
"nprogress": "^0.2.0",
|
||||||
|
"papaparse": "^5.3.2",
|
||||||
"register-service-worker": "^1.7.2",
|
"register-service-worker": "^1.7.2",
|
||||||
"vue": "^2.6.14",
|
"vue": "^2.6.14",
|
||||||
"vue-chartjs": "^3.5.1",
|
"vue-chartjs": "^3.5.1",
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import NProgress from "nprogress";
|
|||||||
import "nprogress/nprogress.css";
|
import "nprogress/nprogress.css";
|
||||||
import { DateTime } from "luxon";
|
import { DateTime } from "luxon";
|
||||||
import VueCurrencyInput from "vue-currency-input";
|
import VueCurrencyInput from "vue-currency-input";
|
||||||
|
//import Pappa from "papaparse";
|
||||||
|
|
||||||
//my libs
|
//my libs
|
||||||
import errorhandler from "./api/errorhandler";
|
import errorhandler from "./api/errorhandler";
|
||||||
|
|||||||
@@ -14,15 +14,14 @@
|
|||||||
</v-col>
|
</v-col>
|
||||||
<v-col cols="12" sm="6" lg="4" xl="3">
|
<v-col cols="12" sm="6" lg="4" xl="3">
|
||||||
<v-file-input
|
<v-file-input
|
||||||
v-model="uploadFiles"
|
v-model="uploadFile"
|
||||||
:label="$ay.t('Import')"
|
:label="$ay.t('Import')"
|
||||||
accept="application/json"
|
accept="text/csv"
|
||||||
prepend-icon="$ayiFileUpload"
|
prepend-icon="$ayiFileUpload"
|
||||||
multiple
|
show-size
|
||||||
chips
|
|
||||||
></v-file-input
|
></v-file-input
|
||||||
><v-btn
|
><v-btn
|
||||||
v-if="uploadFiles.length > 0 && ayaType != 0"
|
v-if="uploadFile.name && ayaType != 0"
|
||||||
:loading="uploading"
|
:loading="uploading"
|
||||||
color="primary"
|
color="primary"
|
||||||
text
|
text
|
||||||
@@ -30,6 +29,10 @@
|
|||||||
>{{ $ay.t("Upload") }}</v-btn
|
>{{ $ay.t("Upload") }}</v-btn
|
||||||
>
|
>
|
||||||
</v-col>
|
</v-col>
|
||||||
|
type:
|
||||||
|
{{ ayaType }}
|
||||||
|
uploadFile:
|
||||||
|
{{ uploadFile }}
|
||||||
|
|
||||||
<v-col cols="12">
|
<v-col cols="12">
|
||||||
<v-textarea
|
<v-textarea
|
||||||
@@ -44,6 +47,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
|
import papa from "papaparse";
|
||||||
const FORM_KEY = "adm-import";
|
const FORM_KEY = "adm-import";
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
@@ -51,7 +55,7 @@ export default {
|
|||||||
selectLists: {
|
selectLists: {
|
||||||
importableAyaTypes: []
|
importableAyaTypes: []
|
||||||
},
|
},
|
||||||
uploadFiles: [],
|
uploadFile: [],
|
||||||
ayaType: 0,
|
ayaType: 0,
|
||||||
importResult: "",
|
importResult: "",
|
||||||
rights: window.$gz.role.defaultRightsObject(),
|
rights: window.$gz.role.defaultRightsObject(),
|
||||||
@@ -71,39 +75,57 @@ export default {
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
async upload() {
|
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
|
//similar code in wiki-control
|
||||||
const vm = this;
|
// const vm = this;
|
||||||
const fileData = [];
|
// const fileData = [];
|
||||||
for (let i = 0; i < vm.uploadFiles.length; i++) {
|
// for (let i = 0; i < vm.uploadFile.length; i++) {
|
||||||
const f = vm.uploadFiles[i];
|
// const f = vm.uploadFile[i];
|
||||||
fileData.push({ name: f.name, lastModified: f.lastModified });
|
// fileData.push({ name: f.name, lastModified: f.lastModified });
|
||||||
}
|
// }
|
||||||
const at = {
|
|
||||||
ayaType: vm.ayaType,
|
// const at = {
|
||||||
files: vm.uploadFiles,
|
// ayaType: vm.ayaType,
|
||||||
fileData: JSON.stringify(fileData)
|
// files: vm.uploadFile,
|
||||||
};
|
// fileData: JSON.stringify(fileData)
|
||||||
try {
|
// };
|
||||||
vm.uploading = true;
|
|
||||||
const res = await window.$gz.api.upload("import/upload", at);
|
// try {
|
||||||
if (res.error) {
|
// vm.uploading = true;
|
||||||
window.$gz.errorHandler.handleFormError(res.error);
|
// const res = await window.$gz.api.upload("import/upload", at);
|
||||||
} else {
|
// if (res.error) {
|
||||||
vm.uploadFiles = [];
|
// window.$gz.errorHandler.handleFormError(res.error);
|
||||||
//result is an array of strings
|
// } else {
|
||||||
let outText = "";
|
// vm.uploadFile = [];
|
||||||
res.data.forEach(function appendImportResultItem(value) {
|
// //result is an array of strings
|
||||||
outText += value + "\n";
|
// let outText = "";
|
||||||
});
|
// res.data.forEach(function appendImportResultItem(value) {
|
||||||
vm.importResult = await window.$gz.translation.translateStringWithMultipleKeysAsync(
|
// outText += value + "\n";
|
||||||
outText
|
// });
|
||||||
);
|
// vm.importResult = await window.$gz.translation.translateStringWithMultipleKeysAsync(
|
||||||
}
|
// outText
|
||||||
} catch (error) {
|
// );
|
||||||
window.$gz.errorHandler.handleFormError(error);
|
// }
|
||||||
} finally {
|
// } catch (error) {
|
||||||
vm.uploading = false;
|
// window.$gz.errorHandler.handleFormError(error);
|
||||||
}
|
// } finally {
|
||||||
|
// vm.uploading = false;
|
||||||
|
// }
|
||||||
},
|
},
|
||||||
handleSelected() {}
|
handleSelected() {}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user