diff --git a/src/components/AppRoot.ts b/src/components/AppRoot.ts index c60c622..9cf7b17 100644 --- a/src/components/AppRoot.ts +++ b/src/components/AppRoot.ts @@ -66,11 +66,23 @@ export class AppRoot extends Component { } private setupRouter() { + let initial = true; this.router .on("/", () => { this.home = true; this.page = new HomePage(this.api, this.services); }) + .on("*", () => { + this.router.navigate("/"); + }) + .hooks({ + after: () => { + if (!initial) { + this.page.focus(); + } + initial = false; + }, + }) .resolve(); } diff --git a/src/components/ServiceDayTooltip.ts b/src/components/ServiceDayTooltip.ts index 8206884..f2b6c39 100644 --- a/src/components/ServiceDayTooltip.ts +++ b/src/components/ServiceDayTooltip.ts @@ -76,7 +76,7 @@ export class ServiceDayTooltip extends Component {
${n.ended === null ||
- n.started.getTime() > now.getTime()
+ n.started.getTime() > now.getTime() ||
+ n.ended.getTime() > now.getTime()
? ServiceDayTooltip.STATUS_NAMES[n.status]
: html`
- Resolved after