Battery UI: show fully visible day as history window title (#31663)
This commit is contained in:
parent
623427e728
commit
b1f35fbaa7
2 changed files with 7 additions and 7 deletions
|
|
@ -50,6 +50,7 @@ import WindowNav from "./WindowNav.vue";
|
|||
import BatteryHistoryChart from "./BatteryHistoryChart.vue";
|
||||
|
||||
const HOUR = 3600 * 1000;
|
||||
const DAY = 24 * HOUR;
|
||||
const MIN_OFFSET = -30; // page back ~30 days
|
||||
|
||||
// History + forecast chart with its date navigation, unit toggle and legend. Presentation
|
||||
|
|
@ -92,17 +93,16 @@ export default defineComponent({
|
|||
},
|
||||
winStart(): Date {
|
||||
const baseStartH = this.hasForecastData ? 24 : 48;
|
||||
return new Date(this.now.getTime() - baseStartH * HOUR + this.dayOffset * 24 * HOUR);
|
||||
return new Date(this.now.getTime() - baseStartH * HOUR + this.dayOffset * DAY);
|
||||
},
|
||||
winEnd(): Date {
|
||||
const baseEndH = this.hasForecastData ? 24 : 0;
|
||||
return new Date(this.now.getTime() + baseEndH * HOUR + this.dayOffset * 24 * HOUR);
|
||||
return new Date(this.now.getTime() + baseEndH * HOUR + this.dayOffset * DAY);
|
||||
},
|
||||
windowLabel(): string {
|
||||
// relative day name if close (e.g. "gestern – morgen"), else "Sa. 27."
|
||||
const fmt = (d: Date) =>
|
||||
this.relativeDayName(d) ?? `${this.weekdayShort(d)} ${d.getDate()}.`;
|
||||
return `${fmt(this.winStart)} – ${fmt(this.winEnd)}`;
|
||||
// day of "now" shifted by paging; this is the only fully visible day
|
||||
const d = new Date(this.now.getTime() + this.dayOffset * DAY);
|
||||
return this.relativeDayName(d) ?? `${this.weekdayShort(d)} ${d.getDate()}.`;
|
||||
},
|
||||
prevDisabled(): boolean {
|
||||
return this.dayOffset <= MIN_OFFSET;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
:on-click="() => $emit('prev')"
|
||||
data-testid="battery-chart-prev"
|
||||
/>
|
||||
<span class="text-center text-truncate evcc-default-text" style="width: 11em">{{
|
||||
<span class="text-center text-truncate evcc-default-text" style="width: 6em">{{
|
||||
label
|
||||
}}</span>
|
||||
<DateNavigatorButton
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue