diff --git a/app/view/pages/index.php b/app/view/pages/index.php
index 29d6bcc..46dcb39 100644
--- a/app/view/pages/index.php
+++ b/app/view/pages/index.php
@@ -1,2 +1,3 @@
Stafett for livet tellesystem
-Elever på Kvadraturen Vidergående Skole har som skoleprosjekt laget et system for telling av løpere for Kreftforeningens Stafett for livet.
\ No newline at end of file
+Elever på Kvadraturen Vidergående Skole har som skoleprosjekt laget et system for telling av løpere for Kreftforeningens Stafett for livet.
+
\ No newline at end of file
diff --git a/public/api/race/results.php b/public/api/race/results.php
index 4a84353..7922f53 100644
--- a/public/api/race/results.php
+++ b/public/api/race/results.php
@@ -16,7 +16,7 @@ $time_mapper = new TimeMapper($app->database->conn);
$prev_hash = filter_input(INPUT_GET, 'h');
$teams = [];
-$name_map = [];
+$team_map = [];
$times = [];
$time_ref = NULL;
@@ -28,9 +28,13 @@ foreach ($time_mapper->getAll() as $time)
}
$team = $teams[$time->team_id];
- if (!isset($name_map[$team->id]))
+ if (!isset($team_map[$team->id]))
{
- $name_map[$team->id] = htmlspecialchars($team->name);
+ $team_map[$team->id] = [
+ "name" => htmlspecialchars($team->name),
+ "company" => htmlspecialchars($team->company),
+ "rounds" => htmlspecialchars($team->rounds),
+ ];
}
if ($time_ref === NULL)
@@ -48,9 +52,7 @@ foreach ($time_mapper->getAll() as $time)
$data = [
"map" => [
- "team" => [
- "name" => $name_map,
- ],
+ "team" => $team_map,
"time_reference" => $time_ref
],
"times" => $times
diff --git a/public/static/img/3ELDEA.jpg b/public/static/img/3ELDEA.jpg
new file mode 100644
index 0000000..624d90c
Binary files /dev/null and b/public/static/img/3ELDEA.jpg differ
diff --git a/public/static/js/ResultService.js b/public/static/js/ResultService.js
index 2f6d4dd..7b52459 100644
--- a/public/static/js/ResultService.js
+++ b/public/static/js/ResultService.js
@@ -46,7 +46,9 @@ class ResultService
tableHTML += "";
tableHTML += "# | ";
tableHTML += "Lag | ";
+ tableHTML += "Bedrift | ";
tableHTML += "Tid | ";
+ tableHTML += "Runder | ";
tableHTML += "
";
let iterator = 0;
@@ -55,8 +57,10 @@ class ResultService
tableHTML += "";
tableHTML += "" + iterator + " | ";
- tableHTML += "" + data.map.team.name[element.id] + " | ";
+ tableHTML += "" + data.map.team[element.id].name + " | ";
+ tableHTML += "" + data.map.team[element.id].company + " | ";
tableHTML += "" + element.time + " | ";
+ tableHTML += "" + data.map.team[element.id].rounds+ " | ";
tableHTML += "
";
});