Web: Settings: Auto Backup: Fixed problem with showing weekday from storage.
This commit is contained in:
parent
1f22a0a4f8
commit
526a6b7839
@ -109,7 +109,7 @@ class AutomaticBackup extends React.PureComponent {
|
|||||||
this.getMaxNumberCopies();
|
this.getMaxNumberCopies();
|
||||||
|
|
||||||
this.weekdaysOptions = [];
|
this.weekdaysOptions = [];
|
||||||
this.arrayWeekdays = moment.weekdays(true);
|
this.arrayWeekdays = moment.weekdays();
|
||||||
this._isMounted = false;
|
this._isMounted = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -241,7 +241,7 @@ class AutomaticBackup extends React.PureComponent {
|
|||||||
if (+defaultPeriod === 1) {
|
if (+defaultPeriod === 1) {
|
||||||
//Every Week option
|
//Every Week option
|
||||||
//debugger;
|
//debugger;
|
||||||
const arrayIndex = this.lng === "en" ? defaultDay : defaultDay - 1;
|
const arrayIndex = defaultDay - 1;
|
||||||
defaultWeekly = true;
|
defaultWeekly = true;
|
||||||
|
|
||||||
this._isMounted &&
|
this._isMounted &&
|
||||||
@ -362,10 +362,14 @@ class AutomaticBackup extends React.PureComponent {
|
|||||||
};
|
};
|
||||||
this.weekdaysOptions.push(obj);
|
this.weekdaysOptions.push(obj);
|
||||||
}
|
}
|
||||||
|
const isEnglishLanguage = this.lng === "en";
|
||||||
|
|
||||||
this._isMounted &&
|
this._isMounted &&
|
||||||
this.setState({
|
this.setState({
|
||||||
weekOptions: this.weekdaysOptions,
|
weekOptions: this.weekdaysOptions,
|
||||||
selectedWeekdayOption: this.weekdaysOptions[0].label,
|
selectedWeekdayOption: isEnglishLanguage
|
||||||
|
? this.weekdaysOptions[0].label
|
||||||
|
: this.weekdaysOptions[1].label,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -44,9 +44,12 @@ class DocumentsModule extends React.Component {
|
|||||||
numberPeriodFromSessionStorage = getFromSessionStorage("numberPeriod");
|
numberPeriodFromSessionStorage = getFromSessionStorage("numberPeriod");
|
||||||
//debugger;
|
//debugger;
|
||||||
console.log("weekOptions", weekOptions);
|
console.log("weekOptions", weekOptions);
|
||||||
|
console.log("selectedWeekdayOption", selectedWeekdayOption);
|
||||||
|
//debugger;
|
||||||
const weekName =
|
const weekName =
|
||||||
numberPeriodFromSessionStorage === 2
|
(numberPeriodFromSessionStorage === 2 && dayFromSessionStorage) ||
|
||||||
? weekOptions[+dayFromSessionStorage].label
|
(weeklySchedule && dayFromSessionStorage)
|
||||||
|
? weekOptions[+dayFromSessionStorage - 1].label
|
||||||
: "";
|
: "";
|
||||||
const periodName = numberPeriodFromSessionStorage
|
const periodName = numberPeriodFromSessionStorage
|
||||||
? periodOptions[+numberPeriodFromSessionStorage - 1].label
|
? periodOptions[+numberPeriodFromSessionStorage - 1].label
|
||||||
|
@ -46,8 +46,9 @@ class ThirdPartyModule extends React.Component {
|
|||||||
|
|
||||||
numberPeriodFromSessionStorage = getFromSessionStorage("numberPeriod");
|
numberPeriodFromSessionStorage = getFromSessionStorage("numberPeriod");
|
||||||
const weekName =
|
const weekName =
|
||||||
numberPeriodFromSessionStorage === 2
|
(numberPeriodFromSessionStorage === 2 && dayFromSessionStorage) ||
|
||||||
? weekOptions[+dayFromSessionStorage].label
|
(weeklySchedule && dayFromSessionStorage)
|
||||||
|
? weekOptions[+dayFromSessionStorage - 1].label
|
||||||
: "";
|
: "";
|
||||||
const periodName = numberPeriodFromSessionStorage
|
const periodName = numberPeriodFromSessionStorage
|
||||||
? periodOptions[+numberPeriodFromSessionStorage - 1].label
|
? periodOptions[+numberPeriodFromSessionStorage - 1].label
|
||||||
|
@ -57,6 +57,7 @@ class ThirdPartyStorageModule extends React.PureComponent {
|
|||||||
monthlySchedule,
|
monthlySchedule,
|
||||||
weeklySchedule,
|
weeklySchedule,
|
||||||
periodOptions,
|
periodOptions,
|
||||||
|
weekOptions,
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
this.isSetDefaultIdStorage = false;
|
this.isSetDefaultIdStorage = false;
|
||||||
@ -66,8 +67,9 @@ class ThirdPartyStorageModule extends React.PureComponent {
|
|||||||
maxCopiesFromSessionStorage = getFromSessionStorage("maxCopies");
|
maxCopiesFromSessionStorage = getFromSessionStorage("maxCopies");
|
||||||
numberPeriodFromSessionStorage = getFromSessionStorage("numberPeriod");
|
numberPeriodFromSessionStorage = getFromSessionStorage("numberPeriod");
|
||||||
const weekName =
|
const weekName =
|
||||||
numberPeriodFromSessionStorage === 2
|
(numberPeriodFromSessionStorage === 2 && dayFromSessionStorage) ||
|
||||||
? weekOptions[+dayFromSessionStorage].label
|
(weeklySchedule && dayFromSessionStorage)
|
||||||
|
? weekOptions[+dayFromSessionStorage - 1].label
|
||||||
: "";
|
: "";
|
||||||
const periodName = numberPeriodFromSessionStorage
|
const periodName = numberPeriodFromSessionStorage
|
||||||
? periodOptions[+numberPeriodFromSessionStorage - 1].label
|
? periodOptions[+numberPeriodFromSessionStorage - 1].label
|
||||||
|
Loading…
Reference in New Issue
Block a user