Mirrors/WebTools-NG
2
0
Fork 0
mirror of https://github.com/WebTools-NG/WebTools-NG synced 2025-02-16 11:28:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into #507-Download-Module

Browse source
This commit is contained in:
Tommy Mikkelsen 2022-07-23 00:42:10 +02:00
commit a1afc0cf32
6 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -22,6 +22,8 @@
* [#530 ET Suggested file naming - incorrect output](https://github.com/WebTools-NG/WebTools-NG/issues/530) (Bug fix)
* [#538 ET Library output needs the Library Title in 1st Column](https://github.com/WebTools-NG/WebTools-NG/issues/538) (Bug fix)
* [#537 ET Custom Level - blank with no name](https://github.com/WebTools-NG/WebTools-NG/issues/537) (Bug fix)
* [#543 ET Limit Export dialogue shows start value equal to end value](https://github.com/WebTools-NG/WebTools-NG/issues/543) (Bug fix)
* [#542 Export Art & Posters NOT honouring the Dimension settings](https://github.com/WebTools-NG/WebTools-NG/issues/542) (Bug fix)
## V0.3.17 (20220601)

3
public/locales/en.json
View file

@ -261,7 +261,8 @@
"Name": "@:Modules.ET.Name Settings",
"Note": "Note: * Click here for general settings regarding export *",
"Return": "Return to @:Modules.ET.Name",
"NoTimeStamp": "Don't add a timestamp to export file name"
"NoTimeStamp": "Don't add a timestamp to export file name",
"NoItemRange": "Don't add item range to export file name"
},
"LevelInfo": "Export level determines which data are going to be exported.",
"SelectLevel": "Select level",

1
src/components/modules/ExportTools/Export.vue
View file

@ -281,6 +281,7 @@
// Will ask for a starting item as well as an ending item, then export
// Start by getting the maximum and min items
etHelper.Settings.currentItem = 0;
this.itemStartNo = 0;
etHelper.Settings.baseURL = this.$store.getters.getSelectedServerAddress;
etHelper.Settings.accessToken = this.$store.getters.getSelectedServerToken;
etHelper.Settings.totalItems = await etHelper.getSectionSize();

7
src/components/modules/ExportTools/Settings/settings.vue
View file

@ -74,7 +74,8 @@
{ text: i18n.t('Modules.ET.Settings.SortTitleNull'), value: 'SortTitleNull' },
{ text: i18n.t('Modules.ET.Settings.suggestedFileNoExtra'), value: 'suggestedFileNoExtra' },
{ text: i18n.t('Modules.ET.Settings.suggestedUseOrigenTitle'), value: 'suggestedUseOrigenTitle' },
{ text: i18n.t('Modules.ET.Settings.NoTimeStamp'), value: 'NoTimeStamp' }
{ text: i18n.t('Modules.ET.Settings.NoTimeStamp'), value: 'NoTimeStamp' },
{ text: i18n.t('Modules.ET.Settings.NoItemRange'), value: 'NoItemRange' }
],
SelectedMoviesIDOptions: ['imdb', 'tmdb'],
SelectedMoviesID: '',
@ -91,7 +92,7 @@
dialog.ShowMsg( i18n.t("Modules.ET.Name"), i18n.t("Common.Ok"), i18n.t("Common.AppName"), 'For this version, export to XLSX is currently disabled', 'info');
},
getDefaults(){
const cbItems = ["ExpCSV","ExpXLSX", "OrgTitleNull", "SortTitleNull", "suggestedFileNoExtra", "suggestedUseOrigenTitle", "NoTimeStamp"];
const cbItems = ["ExpCSV","ExpXLSX", "OrgTitleNull", "SortTitleNull", "suggestedFileNoExtra", "suggestedUseOrigenTitle", "NoTimeStamp", "NoItemRange"];
for(let i = 0; i < cbItems.length; i++){
if (wtconfig.get("ET." + cbItems[i], false)){
this.cbSelected.push(cbItems[i]);
@ -104,7 +105,7 @@
},
filterTable(){
this.$nextTick(()=>{console.log(this.cbSelected);})
for( var cbItem of ["ExpCSV","ExpXLSX","OrgTitleNull", "SortTitleNull", "AutoXLSCol", "AutoXLSRow", "suggestedFileNoExtra", "suggestedUseOrigenTitle", "NoTimeStamp"]){
for( var cbItem of ["ExpCSV","ExpXLSX","OrgTitleNull", "SortTitleNull", "AutoXLSCol", "AutoXLSRow", "suggestedFileNoExtra", "suggestedUseOrigenTitle", "NoTimeStamp", "NoItemRange"]){
wtconfig.set("ET." + cbItem, (this.cbSelected.includes(cbItem)))
}
},

9
src/components/modules/ExportTools/scripts/ethelper.js
View file

@ -1396,8 +1396,9 @@ const etHelper = new class ETHELPER {
fileName
);
// Build up pic url
const width = res.split('*')[1].trim();
const hight = res.split('*')[0].trim();
//const width = res.split('*')[1].trim();
const hight = res.split('*')[1].trim();
const width = res.split('*')[0].trim();
let URL = this.Settings.baseURL + '/photo/:/transcode?width=';
URL += width + '&height=' + hight;
URL += '&minSize=1&url=';
@ -1566,7 +1567,9 @@ const etHelper = new class ETHELPER {
arrFile.push(this.Settings.fileMajor);
arrFile.push(this.Settings.fileMinor);
arrFile.push(this.Settings.levelName);
arrFile.push('Item ' + this.Settings.startItem + '-' + this.Settings.endItem);
if (!wtconfig.get('ET.NoItemRange', false)){
arrFile.push('Item ' + this.Settings.startItem + '-' + this.Settings.endItem);
}
if (!wtconfig.get('ET.NoTimeStamp', false)){
arrFile.push(timeStamp);
}

BIN
wiki/general/Home01.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB