Merge pull request #141 from WebTools-NG/#94-Export-Episodes-as-well

Fixed #139
This commit is contained in:
Tommy Mikkelsen 2020-09-06 01:04:16 +02:00 committed by GitHub
commit 09e6f8d17b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 12 deletions

View file

@ -125,7 +125,8 @@
"OrgTitleNull": "Default \"Original Title\" to \"Title\", if empty", "OrgTitleNull": "Default \"Original Title\" to \"Title\", if empty",
"SortTitleNull": "Default \"Sort Title\" to \"Title\", if empty", "SortTitleNull": "Default \"Sort Title\" to \"Title\", if empty",
"AutoXLSCol": "Autosize column (xlsx only)", "AutoXLSCol": "Autosize column (xlsx only)",
"AutoXLSRow": "Autosize row (xlsx only)" "AutoXLSRow": "Autosize row (xlsx only)",
"NotAvailIndicator": "What to use if a field can't be found"
}, },
"LevelInfo": "Export level determines which data are going to be exported.", "LevelInfo": "Export level determines which data are going to be exported.",
"ExportLevel": "Export Level", "ExportLevel": "Export Level",

View file

@ -1,13 +1,10 @@
<template> <template>
<b-container fluid> <b-container fluid>
<div class="col-lg-10 col-md-12 col-xs-12"> <div class="col-lg-10 col-md-12 col-xs-12">
<h2>{{ $t("Modules.ET.Name") }} <br> <h3>{{ $t("Modules.ET.Name") }} <br>
<small>{{ $t("Modules.ET.Description") }}</small> <small>{{ $t("Modules.ET.Description") }}</small>
</h2> </h3>
<br /> <br />
<div> <!-- Media type to export --> <div> <!-- Media type to export -->
<b-form-group id="etTypeGroup" v-bind:label="$t('Modules.ET.HSelectMedia')" label-size="lg" label-class="font-weight-bold pt-0"> <b-form-group id="etTypeGroup" v-bind:label="$t('Modules.ET.HSelectMedia')" label-size="lg" label-class="font-weight-bold pt-0">
<b-tooltip target="etTypeGroup" triggers="hover"> <b-tooltip target="etTypeGroup" triggers="hover">
@ -66,6 +63,7 @@
variant="success" variant="success"
>{{ $t("Modules.ET.HExportMedia") }}</b-button> >{{ $t("Modules.ET.HExportMedia") }}</b-button>
</div> </div>
<br>
<b-container fluid> <b-container fluid>
<b-row> <b-row>
<b-col sm="2"> <b-col sm="2">

View file

@ -15,6 +15,9 @@
<b-input-group id="ArraySepGrp" :prepend="$t('Modules.ET.Settings.ArraySep')" class="mt-3"> <b-input-group id="ArraySepGrp" :prepend="$t('Modules.ET.Settings.ArraySep')" class="mt-3">
<b-form-input id="ArraySep" name="ArraySep" type="text" class="form-control" v-model="ArraySep" :disabled=false :maxlength=1 @change="setArraySep()"></b-form-input> <b-form-input id="ArraySep" name="ArraySep" type="text" class="form-control" v-model="ArraySep" :disabled=false :maxlength=1 @change="setArraySep()"></b-form-input>
</b-input-group> </b-input-group>
<b-input-group id="NotAvailIndicatorGrp" :prepend="$t('Modules.ET.Settings.NotAvailIndicator')" class="mt-3">
<b-form-input id="NotAvailIndicator" name="NotAvailIndicator" type="text" class="form-control" v-model="NotAvailIndicator" :disabled=false @change="setNotAvailIndicator()"></b-form-input>
</b-input-group>
<b-input-group id="ColumnSepGrp" :prepend="$t('Modules.ET.Settings.ColumnSep')" class="mt-3"> <b-input-group id="ColumnSepGrp" :prepend="$t('Modules.ET.Settings.ColumnSep')" class="mt-3">
<b-form-input id="ColumnSep" name="ColumnSep" type="text" class="form-control" v-model="ColumnSep" :disabled=false :maxlength=1 @change="setColumnSep"></b-form-input> <b-form-input id="ColumnSep" name="ColumnSep" type="text" class="form-control" v-model="ColumnSep" :disabled=false :maxlength=1 @change="setColumnSep"></b-form-input>
</b-input-group> </b-input-group>
@ -54,9 +57,8 @@
return { return {
outDirVal: wtconfig.get('ET.OutPath', i18n.t('Modules.ET.Settings.SelectOutDir')), outDirVal: wtconfig.get('ET.OutPath', i18n.t('Modules.ET.Settings.SelectOutDir')),
ArraySep: wtconfig.get('ET.ArraySep'), ArraySep: wtconfig.get('ET.ArraySep'),
// ColumnSep: wtconfig.get('ET.ColumnSep'), NotAvailIndicator: wtconfig.get('ET.NotAvail', 'N/A'),
ColumnSep: '', ColumnSep: '',
//ColumnSep1: this.computedColumnSep,
TimeOut: wtconfig.get('PMS.TimeOut'), TimeOut: wtconfig.get('PMS.TimeOut'),
cbSelected: [], cbSelected: [],
cbOptions: [ cbOptions: [
@ -121,6 +123,9 @@
setArraySep: function(){ setArraySep: function(){
wtconfig.set('ET.ArraySep', this.ArraySep) wtconfig.set('ET.ArraySep', this.ArraySep)
}, },
setNotAvailIndicator: function(){
wtconfig.set('ET.NotAvail', this.NotAvailIndicator)
},
setTimeOut: function(){ setTimeOut: function(){
wtconfig.set('PMS.TimeOut', this.TimeOut) wtconfig.set('PMS.TimeOut', this.TimeOut)
} }

View file

@ -227,6 +227,9 @@ const wtutils = new class WTUtils {
if ( wtconfig.get('ET.OutPath', 'N/A') == 'N/A' ){ if ( wtconfig.get('ET.OutPath', 'N/A') == 'N/A' ){
wtconfig.set('ET.OutPath', '') wtconfig.set('ET.OutPath', '')
} }
if ( wtconfig.get('ET.NotAvail', 'N/A') == 'N/A' ){
wtconfig.set('ET.NotAvail', 'N/A')
}