2
0
Fork 0
mirror of https://github.com/WebTools-NG/WebTools-NG synced 2025-02-02 21:23:25 +00:00

#365-2 WIP

This commit is contained in:
UKDTOM 2021-11-07 01:09:55 +01:00
parent 3837e67318
commit 3558c8998c
4 changed files with 41 additions and 11 deletions
src/components/modules/ExportTools
vue.config.js

View file

@ -228,6 +228,7 @@
},
methods: {
async serverSelected() {
etHelper.resetETHelper();
let serverCheck = this.$store.getters.getSelectedServer;
if (serverCheck == "none") {
log.debug("serverCheck is none");
@ -355,10 +356,12 @@
},
selLevelChanged: async function(myarg){
log.verbose(`Level to export selected as: ${this.selLevel}`);
etHelper.resetETHelper();
etHelper.Settings.Level = this.selLevel;
etHelper.Settings.levelName = await this.getText(myarg, this.exportLevels);
},
selLibraryChanged: async function(myarg){
etHelper.resetETHelper();
log.verbose(`Library key to export selected as: ${this.selLibrary}`);
etHelper.Settings.selLibKey = this.selLibrary;
etHelper.Settings.LibName = await this.getText(myarg, this.selLibraryOptions);
@ -496,16 +499,18 @@
etHelper.updateStatusMsg( etHelper.RawMsgType.Status, i18n.t("Modules.ET.Status.Running"));
// Populate et. settings with the selected values
console.log('Ged below depreciated')
/* console.log('Ged below depreciated')
et.expSettings.libType = this.selMediaType;
et.expSettings.libTypeSec = this.selExpTypeSec;
et.expSettings.exportLevel = this.selLevel;
et.expSettings.baseURL = this.$store.getters.getSelectedServerAddress;
et.expSettings.accessToken = this.$store.getters.getSelectedServerToken;
console.log('Ged USE below')
console.log('Ged USE below') */
etHelper.Settings.currentItem = 0;
etHelper.Settings.libType = this.selMediaType;
etHelper.Settings.Level = this.selLevel;
etHelper.Settings.libTypeSec = this.selExpTypeSec;
etHelper.Settings.baseURL = this.$store.getters.getSelectedServerAddress;
etHelper.Settings.accessToken = this.$store.getters.getSelectedServerToken;

View file

@ -47,6 +47,7 @@
"Level 1": 1,
"Level 2": 1,
"All": 2,
"all": 2,
"devTommy": 2
}
},

View file

@ -148,6 +148,29 @@ const etHelper = new class ETHELPER {
}
resetETHelper() {
this.#_FieldHeader = [];
this.Settings.Level = null;
this.Settings.libType = null;
this.Settings.libTypeSec = null;
this.Settings.outFile = null;
this.Settings.baseURL = null;
this.Settings.accessToken = null;
this.Settings.levelName = null;
this.Settings.csvFile = null;
this.Settings.csvStream = null;
this.Settings.xlsxFile = null;
this.Settings.xlsxStream = null;
this.Settings.call = null;
this.Settings.fields = null;
this.Settings.currentItem = 0;
this.Settings.totalItems = null;
}
//this.Settings.selLibKey = null;
//this.Settings.LibName = null;
isEmpty( {val} )
{
if ([null, 'undefined', ''].indexOf(val) > -1)
@ -497,17 +520,12 @@ const etHelper = new class ETHELPER {
for (i=0; i<array.length; i++) {
switch(String(subType)) {
case "string":
console.log('Ged 44-0: ' + key + '*' + subKey)
console.log('Ged 44-1: ' + JSON.stringify(array[i]))
valArrayVal = String(JSONPath({path: String(subKey), json: array[i]}));
// Make N/A if not found
console.log('Ged 44-2: ' + JSON.stringify(valArrayVal))
valArrayVal = this.isEmpty( { val: valArrayVal });
console.log('Ged 44-3: ' + JSON.stringify(valArrayVal))
// Remove CR, LineFeed ' and " from the string if present
valArrayVal = valArrayVal.replace(/'|"|\r|\n/g, ' ');
console.log('Ged 44-4: ' + JSON.stringify(valArrayVal))
valArrayVal = setStrSeperator( {str: valArrayVal});
break;
case "time":
valArrayVal = JSONPath({path: String(subKey), json: array[i]});
@ -705,6 +723,7 @@ const etHelper = new class ETHELPER {
{
this.Settings.libType = this.Settings.libTypeSec;
}
log.debug(`LibType: ${this.Settings.libType} * LevelName: ${this.Settings.levelName}`);
const count = await defLevels[this.Settings.libType]['LevelCount'][this.Settings.levelName]
log.info('Count needed is: ' + count)
return count
@ -913,7 +932,7 @@ const etHelper = new class ETHELPER {
if (!fs.existsSync(targetDir)) {
fs.mkdirSync(targetDir);
}
log.info(`OutFile is ${outFileWithPath}`);
log.info(`OutFile ET is ${outFileWithPath}`);
return outFileWithPath;
}
@ -1028,7 +1047,12 @@ const etHelper = new class ETHELPER {
// code block
log.error(`Unknown libtype: "${this.Settings.libType}" or level: "${this.Settings.level}" in "getLevelFields"`);
}
let levels = def[this.Settings.libType.toString()]['level'][this.Settings.levelName];
if ( this.Settings.levelName == 'All')
{
this.Settings.levelName = 'all';
}
let levels = def[this.Settings.libType.toString()]['level'][this.Settings.Level];
//let levels = def[this.Settings.libType.toString()]['level'][this.Settings.levelName];
if (levels == undefined)
{
// We are dealing with a custom level

View file

@ -28,7 +28,7 @@ module.exports = {
linux: {
category: "Utility",
icon: './src/assets/WebTools-512.png',
target: 'AppImage'
target: 'AppImage'
},
win: {
icon: './src/assets/WebTools-512.png'