From 941e1a896548df879af7b16ac8d810039edb3694 Mon Sep 17 00:00:00 2001
From: William <william@willy.club>
Date: Thu, 21 Apr 2022 14:41:19 +0200
Subject: [PATCH] Commit

---
 app/view/pages/race/live.php | 94 ++++++++++++++++++++----------------
 public/api/v1/race/sync.php  | 10 +---
 2 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/app/view/pages/race/live.php b/app/view/pages/race/live.php
index 456fd1c..bb54eff 100644
--- a/app/view/pages/race/live.php
+++ b/app/view/pages/race/live.php
@@ -12,61 +12,71 @@ Laster inn...
 </div>
 
 <script>
-let hash = 0;
-let alertbox = document.getElementById("alert");
 
-document.addEventListener('DOMContentLoaded', function() {
-    loop();
+document.addEventListener('DOMContentLoaded', () => {
+    new ResultService();
 });
 
-async function loop()
+class ResultService 
 {
-    try {
-        await updateTable();
-        alertbox.classList.add("hidden");
-    } catch (error) {
-        alertbox.innerHTML = "<b>Noe gikk galt: </b>" + error;
-        alertbox.classList.remove("hidden");
-    }
-
-    setTimeout(function() {
-        loop();
-    }, 1000);
-}
-
-async function updateTable()
-{
-    let response = await fetch("../api/v1/race/sync.php?h=" + hash);
-
-    if (response.status === 204)
+    constructor()
     {
-        return;
+        this.hash     = 0;
+        this.alertbox = document.getElementById("alert");
+        this.table    = document.getElementById("ranking-table");
+
+        this.#loop();
     }
 
-    let json = await response.json();
+    async #loop(self)
+    {
+        try {
+            await this.#updateTable();
+            this.alertbox.classList.add("hidden");
+        } catch (error) {
+            console.log(error);
+            this.alertbox.innerHTML = "<b>Noe gikk galt: </b>" + error;
+            this.alertbox.classList.remove("hidden");
+        }
 
-    hash = json.hash;
+        setTimeout(() => {
+            this.#loop();
+        }, 1000);
+    }
 
-    let data = json.data;
+    async #updateTable()
+    {
+        let response = await fetch("../api/v1/race/sync.php?h=" + this.hash);
 
-    let table_html = "";
-    table_html += "<table>";
-    table_html += "<tr>";
-    table_html += "<th>Navn</th>";
-    table_html += "<th>Bestetid</th>";
-    table_html += "</tr>";
+        if (response.status === 204)
+        {
+            return;
+        }
 
-    data.forEach(element => {
-        table_html += "<tr>";
-        table_html += "<td>" + element.n + "</td>";
-        table_html += "<td>" + element.d + "</td>";
-        table_html += "</tr>";
-    });
+        let json = await response.json();
 
-    table_html += "<table>";
+        this.hash = json.hash;
 
-    console.log(data);
+        let data = json.data;
 
-    document.getElementById("ranking-table").innerHTML = table_html;
+        let tableHTML = "";
+        tableHTML += "<table>";
+        tableHTML += "<tr>";
+        tableHTML += "<th>Navn</th>";
+        tableHTML += "<th>Bestetid</th>";
+        tableHTML += "</tr>";
+
+        data.forEach(element => {
+            tableHTML += "<tr>";
+            tableHTML += "<td>" + element.name + "</td>";
+            tableHTML += "<td>" + element.date + "</td>";
+            tableHTML += "</tr>";
+        });
+
+        tableHTML += "<table>";
+
+        this.table.innerHTML = tableHTML;
+    }
 }
+
 </script>
\ No newline at end of file
diff --git a/public/api/v1/race/sync.php b/public/api/v1/race/sync.php
index 56fb1e5..febcade 100644
--- a/public/api/v1/race/sync.php
+++ b/public/api/v1/race/sync.php
@@ -22,15 +22,9 @@ foreach ($times as $time)
 {
     $team = $team_mapper->get($time->team_id);
 
-    if (!$team)
-    {
-        // this should not happen as related times should be deleted with the team
-        #continue;
-    }
-
     $row = [
-        "n"   => $team->name,
-        "d"   => $time->date->getTimestamp()
+        "name"   => $team->name,
+        "date"   => $time->date->getTimestamp()
     ];
 
     array_push($data, $row);