Trygve/elektronisk-kadaver-tidtakingssystem
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Småfikser

Browse Source
This commit is contained in:
Trygve 2025-10-31 14:48:53 +01:00
parent 5f377cf811
commit 6825e90568
7 changed files with 118 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin.php
View File

@ -48,7 +48,7 @@ include("api/statistics.php");
?> ?>
</div> </div>
<h1>Søk opp løper</h1> <h1>Søk opp løper</h1>
<form action="/api/runner.php" method="GET" hx-boost="true" hx-target="#runner" hx-swap="show:none"> <form action="/api/runner.php" method="GET" hx-boost="true" hx-target="#runner" hx-swap="show:none" hx-headers='js:{"Password": localStorage.getItem("passord")}'>
<label> <label>
Navn, startnummer eller klubb Navn, startnummer eller klubb
<input type="text" name="search" id="search"> <input type="text" name="search" id="search">

1
api/email.php
View File

@ -7,7 +7,6 @@ if ($method == "GET") {
parse_str($_SERVER['QUERY_STRING'], $query); parse_str($_SERVER['QUERY_STRING'], $query);
$course = $query['course']; $course = $query['course'];
$password = getallheaders()['Password']; $password = getallheaders()['Password'];
print_r(getallheaders());
if (!password_verify($password, $hash)) { if (!password_verify($password, $hash)) {
http_response_code(response_code: 401); http_response_code(response_code: 401);
} else { } else {

22
api/runner.php
View File

@ -37,6 +37,10 @@ if ($method == "POST") {
} }
} }
if ($method == "PATCH") { if ($method == "PATCH") {
$password = getallheaders()['Password'];
if (!password_verify($password, $hash)) {
http_response_code(response_code: 401);
} else {
parse_str(file_get_contents('php://input'), $_PATCH); parse_str(file_get_contents('php://input'), $_PATCH);
$line = $_PATCH["id"] . ";;" . $_PATCH["name"] . ";" . $_PATCH["email"] . ";" . $_PATCH["phone"] . ";" . $_PATCH["club"] . ";" . $_PATCH["course"] . ";;;\n"; $line = $_PATCH["id"] . ";;" . $_PATCH["name"] . ";" . $_PATCH["email"] . ";" . $_PATCH["phone"] . ";" . $_PATCH["club"] . ";" . $_PATCH["course"] . ";;;\n";
@ -59,17 +63,25 @@ if ($method == "PATCH") {
echo("<span class='bg-success'>Endret: $line</span>"); echo("<span class='bg-success'>Endret: $line</span>");
} }
} }
}
if ($method == "GET") { if ($method == "GET") {
$password = getallheaders()['Password'];
if (!password_verify($password, $hash)) {
http_response_code(response_code: 401);
} else {
parse_str($_SERVER['QUERY_STRING'], $query); parse_str($_SERVER['QUERY_STRING'], $query);
$runners = read_runners_from_csv(); $runners = read_runners_from_csv();
$filtered = search_for_runner($runners, $query['search']); $filtered = search_for_runner($runners, $query['search']);
if (isset($query['get'])) {
$filtered = [get_runner($runners,$query['get'])];
}
if (count($filtered) == 1 && $query['edit'] == "true") { if (count($filtered) == 1 && $query['edit'] == "true") {
$r = $filtered[0]; $r = $filtered[0];
$response .= " $response .= "
<h2>Endre $r->id $r->name</h2> <h2>Endre $r->id $r->name</h2>
<form hx-patch='/api/runner.php'> <form hx-patch='/api/runner.php' hx-headers='js:{\"Password\": localStorage.getItem(\"passord\")}'>
<label>Startnummer<input type='number' id='id' name='id' required value='$r->id'></label> <label>Startnummer<input type='number' id='id' name='id' required value='$r->id'></label>
<label>Navn<input type='text' id='name' name='name' required value='$r->name'></label> <label>Navn<input type='text' id='name' name='name' required value='$r->name'></label>
<label>Forening<input type='text' id='club' name='club' required value='$r->club'></label> <label>Forening<input type='text' id='club' name='club' required value='$r->club'></label>
@ -111,11 +123,11 @@ if ($method == "GET") {
for ($i = 0; $i < count($filtered); $i++) { for ($i = 0; $i < count($filtered); $i++) {
$runner = $filtered[$i]; $runner = $filtered[$i];
if ($query['edit'] == "true") { if ($query['edit'] == "true") {
$url = "/api/runner.php?search=$runner->id&edit=true"; $url = "/api/runner.php?get=$runner->id&edit=true";
} else { } else {
$url = "/api/runner.php?search=$runner->id"; $url = "/api/runner.php?get=$runner->id";
} }
$response .= "<button class=\"default\" hx-get=\"$url\" hx-target=\"#runner\" hx-swap=\"show:none\">$runner->id $runner->name</button>"; $response .= "<button class=\"default\" hx-get=\"$url\" hx-target=\"#runner\" hx-swap=\"show:none\" hx-headers='js:{\"Password\": localStorage.getItem(\"passord\")}'>$runner->id $runner->name</button>";
header("HX-Replace-Url: false"); header("HX-Replace-Url: false");
} }
echo($response); echo($response);
@ -123,5 +135,5 @@ if ($method == "GET") {
else{ else{
echo("Ingen resultater..."); echo("Ingen resultater...");
} }
}
} }

54
api/table.php
View File

@ -4,6 +4,7 @@ $documentRoot = $_SERVER['DOCUMENT_ROOT'];
$config = parse_ini_file("$documentRoot/data/config.ini"); $config = parse_ini_file("$documentRoot/data/config.ini");
date_default_timezone_set('UTC'); date_default_timezone_set('UTC');
$GLOBALS['start_time'] = DateTime::createFromFormat(DateTime::ISO8601, $config["start_date"]); $GLOBALS['start_time'] = DateTime::createFromFormat(DateTime::ISO8601, $config["start_date"]);
$GLOBALS['start_time_mini'] = DateTime::createFromFormat(DateTime::ISO8601, $config["start_date_mini"]);
$GLOBALS['number_of_controls'] = 3; $GLOBALS['number_of_controls'] = 3;
/* /*
// Caching // Caching
@ -165,7 +166,9 @@ function liveresult_table($runners) {
$matposter = "<td>$tid_1_mat</td><td>$tid_2_mat</td>"; $matposter = "<td>$tid_1_mat</td><td>$tid_2_mat</td>";
} }
if ($runner->course == "Kadaverløpet") { if ($runner->course == "Kadaverløpet") {
$kadaver_table .= "<tr><td>". $kadaver_num .".</td><td>$runner->name</td>$matposter<td>$tid_maal</td><td>$tid_etter</td>$sprekk</tr>\n"; $runner_number = $kadaver_num .".";
if ($runner->get_control() == -1){$runner_number = "";};
$kadaver_table .= "<tr><td>". $runner_number ."</td><td>$runner->name</td>$matposter<td>$tid_maal</td><td>$tid_etter</td>$sprekk</tr>\n";
} }
} }
$kadaver_table .= "</tbody></table>\n"; $kadaver_table .= "</tbody></table>\n";
@ -174,8 +177,8 @@ function liveresult_table($runners) {
} }
function minikadadvern_table($runners) { function minikadadvern_table($runners) {
usort($runners, "cmp"); //usort($runners, "cmp");
usort($runners, "cmp_course"); //usort($runners, "cmp_course");
$minikadaver_table = "<table><thead> $minikadaver_table = "<table><thead>
<tr> <tr>
<th>#</th> <th>#</th>
@ -183,53 +186,18 @@ function minikadadvern_table($runners) {
<th>Mål</th> <th>Mål</th>
</tr></thead> </tr></thead>
<tbody>"; <tbody>";
$kadaver_num = 0;
$mini_num = 0; $mini_num = 0;
for ($i = 0; $i < count($runners); $i++) { for ($i = 0; $i < count($runners); $i++) {
$runner = $runners[$i]; $runner = $runners[$i];
$tid_maal = ""; $tid_maal = "";
$sprekk = "<td></td>";
if ($runner->splits[2] != false) { if ($runner->splits[2] != false) {
$tid_maal = $GLOBALS['start_time']->diff($runner->splits[2])->format('%H:%I:%S'); $tid_maal = $GLOBALS['start_time_mini']->diff($runner->splits[2])->format('%H:%I:%S');
} }
if ($runner->course == "Kadaverløpet") { if ($runner->course == "Minikadaver'n") {
$kadaver_num++;
$tid_1_mat = "";
if ($runner->splits[0] != false) {
// https://www.php.net/manual/en/class.dateinterval.php
$tid_1_mat = $GLOBALS['start_time']->diff($runner->splits[0])->format('%H:%I:%S');
}
$tid_2_mat = "";
//tid etter vinner
$tid_etter = "";
if ($runner->splits[2] != false && $kadaver_num > 0) {
$tid_etter = $runners[0]->splits[2]->diff($runner->splits[2])->format('%I:%S');
}
//sprekkindekss
if ($runner->splits[1] != false) {
$tid_2_mat = $GLOBALS['start_time']->diff($runner->splits[1])->format('%H:%I:%S');
try {
$sprekk = "<td>" . number_format(100*(time_diff($GLOBALS['start_time'],$runner->splits[2]) - time_diff($GLOBALS['start_time'],$runner->splits[1])) / time_diff($GLOBALS['start_time'],$runner->splits[2]), 0) . "%</td>";
}
catch (DivisionByZeroError $e){
$sprekk = "<td></td>";
}
catch (TypeError $e) {
$sprekk = "<td></td>";
}
}
$matposter = "<td>$tid_1_mat</td><td>$tid_2_mat</td>";
}
else {
$mini_num++; $mini_num++;
} $runner_number = $mini_num . ".";
if ($runner->get_control() != 2){$runner_number = "";};
if ($runner->course == "Kadaverløpet") { $minikadaver_table .= "<tr><td>". "$runner_number" ."</td><td>$runner->name</td><td>$tid_maal</td></tr>\n";
$kadaver_table .= "<tr><td>". $kadaver_num .".</td><td>$runner->name</td>$matposter<td>$tid_maal</td><td>$tid_etter</td>$sprekk</tr>\n";
}
elseif ($runner->course == "Minikadaver'n") {
$minikadaver_table .= "<tr><td>". "" .".</td><td>$runner->name</td><td>$tid_maal</td></tr>\n";
} }
} }
$minikadaver_table .= "</tbody></table>"; $minikadaver_table .= "</tbody></table>";

4
db_editor.html
View File

@ -28,7 +28,7 @@
</menu> </menu>
</nav> </nav>
<h2>Legg til løper</h2> <h2>Legg til løper</h2>
<form action="/api/runner.php" method="POST" hx-boost="true" hx-target="#updated" hx-swap="show:none"> <form action="/api/runner.php" method="POST" hx-boost="true" hx-target="#updated" hx-swap="show:none" hx-headers='js:{"Password": localStorage.getItem("passord")}'>
<input style="display: none;" type="text" id="password" name="password" required> <input style="display: none;" type="text" id="password" name="password" required>
<label for="id">Startnummer: <label for="id">Startnummer:
@ -56,7 +56,7 @@
</form> </form>
<div id="updated"></div> <div id="updated"></div>
<h2>Endre løper</h2> <h2>Endre løper</h2>
<form action="/api/runner.php" method="GET" hx-boost="true" hx-target="#runner" hx-swap="show:none"> <form action="/api/runner.php" method="GET" hx-boost="true" hx-target="#runner" hx-swap="show:none" hx-headers='js:{"Password": localStorage.getItem("passord")}'>
<input type="hidden" id="edit" name="edit" value="true"> <input type="hidden" id="edit" name="edit" value="true">
<label> <label>
Søk etter navn, startnummer eller klubb Søk etter navn, startnummer eller klubb

14
import_runners.php
View File

@ -34,13 +34,17 @@ class Runner
} }
function get_control(){ function get_control(){
$control = -1; if ($this->splits[2] != false) {
for ($i = 0; $i < count($this->splits); $i++) { return 2;
if ($this->splits[$i] != false) { } elseif ($this->splits[1] != false) {
$control++; return 1;
} }
elseif ($this->splits[0] != false) {
return 0;
}
else {
return -1;
} }
return $control;
} }
} }

1
paameldte.php
View File

@ -20,7 +20,6 @@
<h1>Påmeldte Kadaverløpet 2025</h1> <h1>Påmeldte Kadaverløpet 2025</h1>
</div> </div>
<h2>Oppdatert 28.10.25</h2> <h2>Oppdatert 28.10.25</h2>
<div class="flash attention">Startnummer blir tildelt nærmere arrangementet. Prøver å oppdatere lista jevnlig. TBN</div>
<?php <?php
$query = ["type"=>"paameldte"]; $query = ["type"=>"paameldte"];
include("api/table.php"); include("api/table.php");