From 6544901bdd091ffc9365ac32a3248faf445298b6 Mon Sep 17 00:00:00 2001
From: William <william@willy.club>
Date: Tue, 26 Apr 2022 21:20:32 +0000
Subject: [PATCH] Commit

---
 app/view/pages/race/{resultservice.php => results.php} | 4 ++--
 app/view/template/header.php                           | 2 +-
 public/api/{v1/race/sync.php => race/results.php}      | 4 +---
 public/race/results.php                                | 5 +++++
 public/race/resultservice.php                          | 5 -----
 public/static/js/ResultService.js                      | 8 +++++---
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename app/view/pages/race/{resultservice.php => results.php} (72%)
 rename public/api/{v1/race/sync.php => race/results.php} (91%)
 create mode 100644 public/race/results.php
 delete mode 100644 public/race/resultservice.php

diff --git a/app/view/pages/race/resultservice.php b/app/view/pages/race/results.php
similarity index 72%
rename from app/view/pages/race/resultservice.php
rename to app/view/pages/race/results.php
index cae6f0c..a944735 100644
--- a/app/view/pages/race/resultservice.php
+++ b/app/view/pages/race/results.php
@@ -1,6 +1,6 @@
 <div id="alertBox" class="alert danger hidden" role="alert"></div>
 
-<h1>Resultatservice</h1>
+<h1>Resultater</h1>
 <br>
 
 <noscript>
@@ -14,6 +14,6 @@ Laster inn...
 <script src="../static/js/ResultService.js"></script>
 <script>
 document.addEventListener('DOMContentLoaded', () => {
-    new ResultService(alertBox, rankingTable, '../api/v1/race/sync.php?h=');
+    new ResultService(alertBox, rankingTable, '../api/race/results.php?h=');
 });
 </script>
\ No newline at end of file
diff --git a/app/view/template/header.php b/app/view/template/header.php
index dbef58a..6c313c6 100644
--- a/app/view/template/header.php
+++ b/app/view/template/header.php
@@ -38,7 +38,7 @@
             <h4>Felles</h4>
             <ul>
                 <li><a href="<?=$this->config['root_url']?>index.php">Forside</a></li>
-                <li><a href="<?=$this->config['root_url']?>race/resultservice.php">Resultater</a></li>
+                <li><a href="<?=$this->config['root_url']?>race/results.php">Resultater</a></li>
             </ul>
 
             <?php if ($this->user->logged_in): ?>
diff --git a/public/api/v1/race/sync.php b/public/api/race/results.php
similarity index 91%
rename from public/api/v1/race/sync.php
rename to public/api/race/results.php
index 7a6b954..4a84353 100644
--- a/public/api/v1/race/sync.php
+++ b/public/api/race/results.php
@@ -1,12 +1,10 @@
-<?php $app = require '../../../../app/inc.php';
+<?php $app = require '../../../app/inc.php';
 /**
  * We originally wanted to use SSE for this, but the hosting provider
  * did not support that so we resorted to simple polling instead
  * 
  * This page compiles a set of times and sends it if the provided hash of 
  * the data is not equal.
- * 
- * TODO: This code fucking sucks, all of it does
  */
 
 use App\Teamtable\TeamMapper;
diff --git a/public/race/results.php b/public/race/results.php
new file mode 100644
index 0000000..2fab9c5
--- /dev/null
+++ b/public/race/results.php
@@ -0,0 +1,5 @@
+<?php $app = require '../../app/inc.php';
+
+$app->view('template/header', ["title" => "Resultater"]);
+$app->view('pages/race/results');
+$app->view('template/footer');
\ No newline at end of file
diff --git a/public/race/resultservice.php b/public/race/resultservice.php
deleted file mode 100644
index 36bb55d..0000000
--- a/public/race/resultservice.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $app = require '../../app/inc.php';
-
-$app->view('template/header', ["title" => "Resultatservice"]);
-$app->view('pages/race/resultservice');
-$app->view('template/footer');
\ No newline at end of file
diff --git a/public/static/js/ResultService.js b/public/static/js/ResultService.js
index 9ebe9a1..2f6d4dd 100644
--- a/public/static/js/ResultService.js
+++ b/public/static/js/ResultService.js
@@ -2,9 +2,9 @@ class ResultService
 {
     constructor(alertBox, rankingTable, endpoint)
     {
-        this.alertBox = alertBox;
+        this.alertBox     = alertBox;
         this.rankingTable = rankingTable;
-        this.endpoint = endpoint;
+        this.endpoint     = endpoint;
         this.hash = 0;
         this.loop();
     }
@@ -39,6 +39,7 @@ class ResultService
         this.hash = json.hash;
 
         let data = json.data;
+        data.times = data.times.reverse();
 
         let tableHTML = "";
         tableHTML += "<table>";
@@ -49,8 +50,9 @@ class ResultService
         tableHTML += "</tr>";
 
         let iterator = 0;
-        data.times.reverse().forEach(element => {
+        data.times.forEach(element => {
             iterator++;
+
             tableHTML += "<tr>";
             tableHTML += "<td>" + iterator + "</td>";
             tableHTML += "<td>" + data.map.team.name[element.id] + "</td>";