Mirrors/WebTools-NG
2
0
Fork 0
mirror of https://github.com/WebTools-NG/WebTools-NG synced 2024-11-26 21:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

#239 fixed

Browse source
This commit is contained in:
UKDTOM 2021-02-15 01:08:16 +01:00
parent 89d20f3042
commit e43cae4dbc
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/components/modules/ExportTools/scripts/et.js
View file

@ -482,7 +482,7 @@ const excel2 = new class Excel {
return true;
}
async getFileName({ Library, Level, Type }){
async getFileName({ Library, Level, Type, Module }){
const dateFormat = require('dateformat');
const OutDir = wtconfig.get('General.ExportPath');
const timeStamp=dateFormat(new Date(), "yyyy.mm.dd_h.MM.ss");
@ -491,16 +491,20 @@ const excel2 = new class Excel {
outFile += Library + '_';
outFile += Level + '_';
outFile += timeStamp + '.' + Type;
console.log('Ged22', OutDir,wtutils.AppName, i18n.t('Modules.ET.Name'), outFile)
const targetDir = path.join(
OutDir, wtutils.AppName, Module);
const outFileWithPath = path.join(
OutDir, wtutils.AppName, i18n.t('Modules.ET.Name'), outFile);
console.log('Ged ExportFile', outFileWithPath)
targetDir, outFile);
// Make sure target dir exists
const fs = require('fs')
fs.mkdirSync(targetDir);
log.info(`OutFile is ${outFileWithPath}`)
return outFileWithPath;
}
async SaveWorkbook(Workbook, Library, Level, Type) {
const fs = require('fs')
const name = await this.getFileName( { Library: Library, Level: Level, Type: Type })
const name = await this.getFileName( { Library: Library, Level: Level, Type: Type, Module: i18n.t('Modules.ET.Name') })
log.info('Saving output file as: ' + name)
// Save Excel on Hard Disk
Workbook.xlsx.writeBuffer()
@ -831,7 +835,8 @@ const excel2 = new class Excel {
// Now we need to find out how many calls to make
const call = await et.getLevelCall(libType, level)
// Open a file stream
const tmpFile = await excel2.getFileName({ Library: libName, Level: level, Type: 'tmp' })
const tmpFile = await excel2.getFileName({ Library: libName, Level: level, Type: 'tmp', Module: i18n.t('Modules.ET.Name') })
console.log('Ged 5 et tmpFile', tmpFile)
var fs = require('fs');
var stream = fs.createWriteStream(tmpFile, {flags:'a'});
// Add the header

5
src/components/modules/Main/GlobalSettings.vue
View file

@ -91,13 +91,8 @@
log.debug(`Selected Directory is ${exportDir}`);
if (!wtutils.ExportDirPresent)
{
console.log('ged1 globalsetting dir error')
this.ExportDirVal = '*** ERROR ***';
}
else
{
console.log('ged123 globalsetting dir ok')
}
}
},
factoryReset() {