fixed always check battery priority setting when it's in other priority mode
This commit is contained in:
parent
35938e9597
commit
2d612876c2
|
|
@ -100,14 +100,16 @@ function SodistoreHomeConfiguration(props: SodistoreHomeConfigurationProps) {
|
||||||
clusterNumber: props.values.Config.ClusterNumber ?? 1,
|
clusterNumber: props.values.Config.ClusterNumber ?? 1,
|
||||||
PvNumber: props.values.Config.PvNumber ?? 0,
|
PvNumber: props.values.Config.PvNumber ?? 0,
|
||||||
timeChargeandDischargePower: props.values.Config?.TimeChargeandDischargePower ?? 0,
|
timeChargeandDischargePower: props.values.Config?.TimeChargeandDischargePower ?? 0,
|
||||||
startTimeChargeandDischargeDayandTime:
|
startTimeChargeandDischargeDayandTime: (() => {
|
||||||
props.values.Config?.StartTimeChargeandDischargeDayandTime
|
const raw = props.values.Config?.StartTimeChargeandDischargeDayandTime;
|
||||||
? dayjs(props.values.Config.StartTimeChargeandDischargeDayandTime).toDate()
|
const parsed = raw ? dayjs(raw) : null;
|
||||||
: null,
|
return parsed && parsed.year() >= 2020 ? parsed.toDate() : new Date();
|
||||||
stopTimeChargeandDischargeDayandTime:
|
})(),
|
||||||
props.values.Config?.StopTimeChargeandDischargeDayandTime
|
stopTimeChargeandDischargeDayandTime: (() => {
|
||||||
? dayjs(props.values.Config.StopTimeChargeandDischargeDayandTime).toDate()
|
const raw = props.values.Config?.StopTimeChargeandDischargeDayandTime;
|
||||||
: null,
|
const parsed = raw ? dayjs(raw) : null;
|
||||||
|
return parsed && parsed.year() >= 2020 ? parsed.toDate() : new Date();
|
||||||
|
})(),
|
||||||
controlPermission: String(props.values.Config.ControlPermission).toLowerCase() === "true",
|
controlPermission: String(props.values.Config.ControlPermission).toLowerCase() === "true",
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -200,9 +202,11 @@ function SodistoreHomeConfiguration(props: SodistoreHomeConfigurationProps) {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
// Add time validation function
|
// Add time validation function — only relevant for Sinexcel BatteryPriority
|
||||||
const validateTimeOnly = () => {
|
const validateTimeOnly = () => {
|
||||||
if (formValues.startTimeChargeandDischargeDayandTime &&
|
if (device === 4 &&
|
||||||
|
OperatingPriorityOptions[formValues.operatingPriority] === 'BatteryPriority' &&
|
||||||
|
formValues.startTimeChargeandDischargeDayandTime &&
|
||||||
formValues.stopTimeChargeandDischargeDayandTime) {
|
formValues.stopTimeChargeandDischargeDayandTime) {
|
||||||
const startHours = formValues.startTimeChargeandDischargeDayandTime.getHours();
|
const startHours = formValues.startTimeChargeandDischargeDayandTime.getHours();
|
||||||
const startMinutes = formValues.startTimeChargeandDischargeDayandTime.getMinutes();
|
const startMinutes = formValues.startTimeChargeandDischargeDayandTime.getMinutes();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue