Fastest lap indication in results card (#279)

marcokreeft87 · Aug 6, 2023 · b864f82 · b864f82
1 parent c0d22c1
commit b864f82
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 25 deletions.
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": "1.8.4",
+  "version": "1.8.5",
   "description": "Frontend card for Home Assistant to display Formula One data",
   "main": "index.js",
   "scripts": {

diff --git a/src/api/f1-models.ts b/src/api/f1-models.ts
@@ -93,11 +93,6 @@ export interface Root {
     status: string
     Time?: Time
     FastestLap?: FastestLap | undefined
-    // FirstPractice: FirstPractice
-    // SecondPractice: SecondPractice
-    // ThirdPractice?: ThirdPractice
-    // Qualifying: Qualifying
-    // Sprint?: Sprint
   }
 
   export interface QualifyingResult {

diff --git a/src/cards/results.ts b/src/cards/results.ts
@@ -75,7 +75,7 @@ export default class Results extends BaseCard {
                         </tr>
                     </thead>
                     <tbody>
-                        ${reduceArray(selectedRace.SprintResults, this.config.row_limit).map(result => this.renderResultRow(result))}
+                        ${reduceArray(selectedRace.SprintResults, this.config.row_limit).map(result => this.renderResultRow(result, false))}
                     </tbody>
                 </table>`
             : html`<table class="nopadding">
@@ -110,6 +110,7 @@ export default class Results extends BaseCard {
     }
 
     renderResults(selectedRace: Race): HTMLTemplateResult {
+        const fastest = selectedRace?.Results?.filter((result) => result.FastestLap?.rank === '1')[0];
         return selectedRace ?
             html`<table class="nopadding">
                     <thead>                    
@@ -123,8 +124,13 @@ export default class Results extends BaseCard {
                         </tr>
                     </thead>
                     <tbody>
-                        ${reduceArray(selectedRace.Results, this.config.row_limit).map(result => this.renderResultRow(result))}
+                        ${reduceArray(selectedRace.Results, this.config.row_limit).map(result => this.renderResultRow(result, result.position === fastest?.position))}
                     </tbody>
+                    ${fastest ? html`<tfoot>
+                    <tfoot>
+                        <tr>
+                            <td colspan="6" class="text-right"><small>* Fastest lap: ${fastest.FastestLap.Time.time}</small></td>
+                    </tfoot>` : ''}
                 </table>` 
         : html`<table class="nopadding">
                     <tr>
@@ -133,11 +139,11 @@ export default class Results extends BaseCard {
                 </table>`;
     }
 
-    renderResultRow(result: Result): HTMLTemplateResult {
+    renderResultRow(result: Result, fastest: boolean): HTMLTemplateResult {
         return html`
             <tr>
                 <td class="width-50 text-center">${result.position}</td>
-                <td>${(this.config.standings?.show_flag ? html`<img height="10" width="20" src="${getCountryFlagByNationality(this, result.Driver.nationality)}">&nbsp;` : '')}${getDriverName(result.Driver, this.config)}</td>
+                <td>${(this.config.standings?.show_flag ? html`<img height="10" width="20" src="${getCountryFlagByNationality(this, result.Driver.nationality)}">&nbsp;` : '')}${getDriverName(result.Driver, this.config)}${fastest ? ' *' : ''}</td>
                 ${(this.config.standings?.show_team ? html`${renderConstructorColumn(this, result.Constructor)}` : '')}
                 <td>${result.grid}</td>
                 <td class="width-60 text-center">${result.points}</td>

diff --git a/tests/cards/results.test.ts b/tests/cards/results.test.ts