Added option to countdown till any event

README.md

@@ -65,6 +65,7 @@ or added by clicking the "Add to lovelace" button on the HACS dashboard after in
 | translations | dictionary | _[translations](#Translations)_ | Dictionary to override the default translation |
 | actions | object | _[Actions](#actions)_ | The tap, double tap or hold actions set on the image of the countdown, last_result, results, qualifying_results and next-race cards |
 | row_limit | number | | Limit the schedule, results, last_result, driver_standings and constructor_standings to this amount of row |
+| countdown_type | string | 'race' | Set the event to countdown to (race,qualifying,practice1,practice2,practice3,sprint) |
 
 
 ### Actions

package.json

@@ -1,6 +1,6 @@
 {
  "name": "formulaone-card",
- "version": "1.0.3",
+ "version": "1.1.0",
  "description": "Frontend card for Home Assistant to display Formula One data",
  "main": "index.js",
  "scripts": {

src/cards/countdown.ts

@@ -7,6 +7,7 @@ import { Race } from "../api/models";
 import { ActionHandlerEvent, hasAction, HomeAssistant } from "custom-card-helpers";
 import FormulaOneCard from "..";
 import { actionHandler } from "../directives/action-handler-directive";
+import { CountdownType } from "../types/formulaone-card-types";
 
 export default class Countdown extends BaseCard {
  hass: HomeAssistant;
@@ -81,17 +82,12 @@ export default class Countdown extends BaseCard {
  return html`${getApiErrorMessage('next race')}`
  }
 
- const nextRace = response.filter(race => {
- const raceDateTime = new Date(race.date + 'T' + race.time);
- raceDateTime.setHours(raceDateTime.getHours() + 3);
- return raceDateTime >= new Date();
- })[0];
+ const { nextRace, raceDateTime } = this.getNextEvent(response);
 
  if(!nextRace) {
  return getEndOfSeasonMessage(this.translation('endofseason'));
  }
 
- const raceDateTime = new Date(nextRace.date + 'T' + nextRace.time);
  const timer = this.countDownTillDate(raceDateTime); 
  const hasConfigAction = this.config.actions !== undefined;
 
@@ -117,4 +113,41 @@ export default class Countdown extends BaseCard {
  html`${getApiLoadingMessage()}`
  )}`;
  }
+
+ getNextEvent(response: Race[]) {
+
+ const nextRace = response.filter(race => {
+ const raceDateTime = new Date(race.date + 'T' + race.time);
+ raceDateTime.setHours(raceDateTime.getHours() + 3);
+ return raceDateTime >= new Date();
+ })[0];
+
+ let raceDateTime = null;
+ if(nextRace) {
+ switch(this.config.countdown_type as CountdownType) {
+ case CountdownType.Practice1:
+ raceDateTime = new Date(nextRace.FirstPractice.date + 'T' + nextRace.FirstPractice.time);
+ break;
+ case CountdownType.Practice2:
+ raceDateTime = new Date(nextRace.SecondPractice.date + 'T' + nextRace.SecondPractice.time);
+ break;
+ case CountdownType.Practice3:
+ raceDateTime = new Date(nextRace.ThirdPractice.date + 'T' + nextRace.ThirdPractice.time);
+ break;
+ case CountdownType.Qualifying: 
+ raceDateTime = new Date(nextRace.Qualifying.date + 'T' + nextRace.Qualifying.time);
+ break;
+ case CountdownType.Sprint: 
+ if(nextRace.Sprint) {
+ raceDateTime = new Date(nextRace.Sprint.date + 'T' + nextRace.Sprint.time);
+ }
+ break; 
+ default:
+ raceDateTime = new Date(nextRace.date + 'T' + nextRace.time);
+ break;
+ }
+ }
+
+ return { nextRace, raceDateTime };
+ }
 }

src/types/formulaone-card-types.ts

@@ -21,6 +21,16 @@ export interface FormulaOneCardConfig extends LovelaceCardConfig {
  f1_font?: boolean;
  row_limit?: number;
  icons?: CustomIcons;
+ countdown_type?: CountdownType;
+}
+
+export enum CountdownType {
+ Race = "race",
+ Qualifying = "qualifying",
+ Practice1 = "practice1",
+ Practice2 = "practice2",
+ Practice3 = "practice3",
+ Sprint = "sprint"
 }
 
 export interface ActionOptions {

tests/cards/countdown.test.ts

@@ -1,6 +1,6 @@
 import { createMock } from "ts-auto-mock";
 import Countdown from "../../src/cards/countdown";
-import { FormulaOneCardConfig } from "../../src/types/formulaone-card-types";
+import { CountdownType, FormulaOneCardConfig } from "../../src/types/formulaone-card-types";
 import { getRenderStringAsync } from "../utils";
 import { MRData } from '../testdata/schedule.json'
 import { MRData as resultData } from '../testdata/results.json'
@@ -235,6 +235,26 @@ describe('Testing countdown file', () => {
  expect(customCardHelper.handleAction).toBeCalledTimes(3);
 
  spy.mockClear();
+ }), 
+ test.each`
+ countdown_type | current_date | expected
+ ${CountdownType.Practice1}, ${new Date(2022, 3, 19)}, ${new Date("2022-04-22T11:30:00.000Z")}
+ ${CountdownType.Practice2}, ${new Date(2022, 3, 19)}, ${new Date("2022-04-23T10:30:00.000Z")}
+ ${CountdownType.Practice3}, ${new Date(2022, 2, 1)}, ${new Date("2022-03-19T12:00:00.000Z")}
+ ${CountdownType.Qualifying}, ${new Date(2022, 3, 19)}, ${new Date("2022-04-22T15:00:00.000Z")} 
+ ${CountdownType.Race}, ${new Date(2022, 3, 19)}, ${new Date("2022-04-24T13:00:00.000Z")} 
+ ${CountdownType.Sprint}, ${new Date(2022, 3, 19)}, ${new Date("2022-04-23T14:30:00.000Z")}
+ `(`Calling render with countdown_type $countdown_type`, async ({ countdown_type, current_date, expected }) => {
+ config.countdown_type = countdown_type; 
+ card.config = config; 
+
+ jest.useFakeTimers();
+ jest.setSystemTime(current_date); // Weird bug in jest setting this to the last of the month
+
+ const result = card.getNextEvent(MRData.RaceTable.Races);
+ jest.useRealTimers();
+
+ expect(result.raceDateTime).toMatchObject(expected);
  });
 });