Added sprint results and moved qualifying to tab in results card (#136)

marcokreeft87 · Feb 5, 2023 · ad3cfb0 · ad3cfb0
1 parent ef84921
commit ad3cfb0
Show file tree

Hide file tree

Showing 20 changed files with 625 additions and 634 deletions.
diff --git a/README.md b/README.md
@@ -204,28 +204,13 @@ f1_font: true
 ```
 ![image](https://user-images.githubusercontent.com/10223677/215340692-898a03ef-2f66-46fd-92da-6e842d413500.png)
 
-
-```
-type: custom:formulaone-card
-card_type: qualifying_results
-title: Qualifying
-f1_font: true
-
-```
-![image](https://user-images.githubusercontent.com/10223677/216780167-df1cd864-9c54-47fe-afed-cb0c6b4cd4bb.png)
-
-This card can also show the flags and team names of the driver, alongside the logo of the teams:
-
-```
-type: custom:formulaone-card
-card_type: qualifying_results
-standings:
-  show_flag: true
-  show_team: true
-  show_teamlogo: true
-
-```
-  
+## Icons
+The following icons can be altered.
+| Card type(s)                        | Key           | Default value                       |
+| ----------------------------------- | ------------- | ----------------------------------- |
+| results                             | results       | mdi:trophy                          |        
+| results                             | qualifying    | mdi:timer-outline                   |
+| results                             | sprint        | mdi:flag-checkered                  |
 
 ## Translations
 
@@ -249,16 +234,17 @@ The following texts can be translated or altered.
 | constructor_standings | constructor | 'Constructor' |
 | constructor_standings, driver_standings, last_result | points | 'Pts' |
 | constructor_standings, driver_standings | wins | 'Wins' |
-| driver_standings, results, qualifying_results | team | 'Team' |
-| driver_standings, last_result, results, qualifying_results | driver | 'Driver' |
+| driver_standings, results | team | 'Team' |
+| driver_standings, last_result, results | driver | 'Driver' |
 | last_result | grid | 'Grid' |
 | last_result | status | 'Status' |
 | schedule | time | 'Time' |
-| results,qualifying_results | raceheader | 'Race' | 
-| results.qualifying_results | seasonheader | 'Season' | 
-| results,qualifying_results | selectseason | 'Select season' | 
-| results,qualifying_results | selectrace | 'Select race' | 
-| results,qualifying_results | noresults | 'Please select a race thats already been run' | 
+| results | raceheader | 'Race' | 
+| results | seasonheader | 'Season' | 
+| results | selectseason | 'Select season' | 
+| results | selectrace | 'Select race' | 
+| results | noresults | 'Please select a race thats already been run' | 
+| results | nosprint | 'No sprint race results available.' |
 | countdown | days | 'd' |
 | countdown | hours' : 'h' |
 | countdown | minutes' : 'm' |
@@ -291,7 +277,7 @@ translations:
 ## TODO
 - [x] Convert Ergast client to use fetch to reduce library size
 - [x] Qualifying result card (https://ergast.com/mrd/methods/qualifying/)
-- [ ] Sprint result card (https://ergast.com/mrd/methods/sprint/)
+- [x] Sprint result card (https://ergast.com/mrd/methods/sprint/)
 - [ ] Live timing poc (https://livetiming.formula1.com/static/2022/2022-11-20_Abu_Dhabi_Grand_Prix/2022-11-20_Race/RaceControlMessages.json) 
 - [x] Use F1 font 
 - [ ] Editor
diff --git a/formulaone-card.js b/formulaone-card.js
diff --git a/formulaone-card.js.gz b/formulaone-card.js.gz
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "formulaone-card",
-  "version": "0.9.1",
+  "version": "1.0.0",
   "description": "Frontend card for Home Assistant to display Formula One data",
   "main": "index.js",
   "scripts": {

diff --git a/src/api/ergast-client.ts b/src/api/ergast-client.ts
@@ -33,6 +33,12 @@ export default class ErgastClient  {
       return data?.MRData.StandingsTable.StandingsLists[0].ConstructorStandings;
     }
 
+    async GetSprintResults(season: number, round: number) : Promise<RaceTable> {
+      const data = await this.GetData<Root>(`${season}/${round}/sprint.json`, false, 0);
+
+      return data?.MRData.RaceTable;
+    }
+
     async GetQualifyingResults(season: number, round: number) : Promise<RaceTable> {
       const data = await this.GetData<Root>(`${season}/${round}/qualifying.json`, false, 0);
 

diff --git a/src/api/models.ts b/src/api/models.ts
@@ -59,6 +59,7 @@ export interface Root {
     time: string
     Results?: Result[]
     QualifyingResults?: QualifyingResult[]
+    SprintResults?: Result[]
     FirstPractice: FirstPractice
     SecondPractice: SecondPractice
     ThirdPractice?: ThirdPractice
@@ -92,11 +93,11 @@ export interface Root {
     status: string
     Time?: Time
     FastestLap: FastestLap
-    FirstPractice: FirstPractice
-    SecondPractice: SecondPractice
-    ThirdPractice?: ThirdPractice
-    Qualifying: Qualifying
-    Sprint?: Sprint
+    // FirstPractice: FirstPractice
+    // SecondPractice: SecondPractice
+    // ThirdPractice?: ThirdPractice
+    // Qualifying: Qualifying
+    // Sprint?: Sprint
   }
 
   export interface QualifyingResult {

diff --git a/src/cards/base-card.ts b/src/cards/base-card.ts
@@ -38,7 +38,8 @@ export abstract class BaseCard {
         const races = cardProperties?.races as Race[];
         const selectedRace = cardProperties?.selectedRace as Race;
         const selectedSeason = cardProperties?.selectedSeason as string;
-        return { races, selectedRace, selectedSeason };
+        const selectedTabIndex = cardProperties?.selectedTabIndex as number ?? 0;
+        return { races, selectedRace, selectedSeason, selectedTabIndex };
     }
 
     protected getParentCardValues() {

diff --git a/src/cards/qualifying-results.ts b/src/cards/qualifying-results.ts