Småfikser
This commit is contained in:
Trygve
parent
5f377cf811
commit
6825e90568
@ -48,7 +48,7 @@ include("api/statistics.php");
|
||||
?>
|
||||
</div>
|
||||
<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>
|
||||
Navn, startnummer eller klubb
|
||||
<input type="text" name="search" id="search">
|
||||
|
||||
@ -7,7 +7,6 @@ if ($method == "GET") {
|
||||
parse_str($_SERVER['QUERY_STRING'], $query);
|
||||
$course = $query['course'];
|
||||
$password = getallheaders()['Password'];
|
||||
print_r(getallheaders());
|
||||
if (!password_verify($password, $hash)) {
|
||||
http_response_code(response_code: 401);
|
||||
} else {
|
||||
|
||||
172
api/runner.php
172
api/runner.php
@ -37,91 +37,103 @@ if ($method == "POST") {
|
||||
}
|
||||
}
|
||||
if ($method == "PATCH") {
|
||||
parse_str(file_get_contents('php://input'), $_PATCH);
|
||||
$line = $_PATCH["id"] . ";;" . $_PATCH["name"] . ";" . $_PATCH["email"] . ";" . $_PATCH["phone"] . ";" . $_PATCH["club"] . ";" . $_PATCH["course"] . ";;;\n";
|
||||
|
||||
$all_lines = file("$documentRoot/data/db.csv");
|
||||
$csv_line = (int)$_PATCH["line_in_csv"];
|
||||
|
||||
$old_id = str_getcsv($all_lines[$csv_line], ";")[0];
|
||||
|
||||
$runners = read_runners_from_csv();
|
||||
$filtered = search_for_runner($runners, $_PATCH["id"]);
|
||||
|
||||
if (!is_int($csv_line)){
|
||||
http_response_code(response_code: 400);
|
||||
} elseif ($filtered != [] && $_PATCH["id"] != $old_id) {
|
||||
http_response_code(response_code: 400);
|
||||
echo("<span class='bg-danger'>Startnummer er allerede i bruk!</span>");
|
||||
$password = getallheaders()['Password'];
|
||||
if (!password_verify($password, $hash)) {
|
||||
http_response_code(response_code: 401);
|
||||
} else {
|
||||
$all_lines[$csv_line] = $line;
|
||||
file_put_contents("$documentRoot/data/db.csv",implode("",$all_lines));
|
||||
echo("<span class='bg-success'>Endret: $line</span>");
|
||||
}
|
||||
parse_str(file_get_contents('php://input'), $_PATCH);
|
||||
$line = $_PATCH["id"] . ";;" . $_PATCH["name"] . ";" . $_PATCH["email"] . ";" . $_PATCH["phone"] . ";" . $_PATCH["club"] . ";" . $_PATCH["course"] . ";;;\n";
|
||||
|
||||
$all_lines = file("$documentRoot/data/db.csv");
|
||||
$csv_line = (int)$_PATCH["line_in_csv"];
|
||||
|
||||
$old_id = str_getcsv($all_lines[$csv_line], ";")[0];
|
||||
|
||||
$runners = read_runners_from_csv();
|
||||
$filtered = search_for_runner($runners, $_PATCH["id"]);
|
||||
|
||||
if (!is_int($csv_line)){
|
||||
http_response_code(response_code: 400);
|
||||
} elseif ($filtered != [] && $_PATCH["id"] != $old_id) {
|
||||
http_response_code(response_code: 400);
|
||||
echo("<span class='bg-danger'>Startnummer er allerede i bruk!</span>");
|
||||
} else {
|
||||
$all_lines[$csv_line] = $line;
|
||||
file_put_contents("$documentRoot/data/db.csv",implode("",$all_lines));
|
||||
echo("<span class='bg-success'>Endret: $line</span>");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($method == "GET") {
|
||||
parse_str($_SERVER['QUERY_STRING'], $query);
|
||||
|
||||
$runners = read_runners_from_csv();
|
||||
$filtered = search_for_runner($runners, $query['search']);
|
||||
if (count($filtered) == 1 && $query['edit'] == "true") {
|
||||
$r = $filtered[0];
|
||||
$response .= "
|
||||
<h2>Endre $r->id $r->name</h2>
|
||||
<form hx-patch='/api/runner.php'>
|
||||
<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>Forening<input type='text' id='club' name='club' required value='$r->club'></label>
|
||||
<label>
|
||||
<fieldset>
|
||||
<input type='radio' name='course' value='Kadaverløpet' checked='checked'>
|
||||
Kadaverløpet
|
||||
</label>
|
||||
<label>
|
||||
<input type='radio' name='course' value=\"Minikadaver'n\">
|
||||
Minikadaver'n
|
||||
</label>
|
||||
</fieldset>
|
||||
<label>epost<input type='text' id='email' name='email' value='$r->email'></label>
|
||||
<label>telefon<input type='text' id='phone' name='phone' value='$r->phone'></label>
|
||||
<label><input type='hidden' id='student' name='student' required value='$r->is_student'></label>
|
||||
<label><input type='hidden' id='line_in_csv' name='line_in_csv' required value='$r->line_in_csv'></label>
|
||||
<button type='submit'>Endre løper</button>
|
||||
</form>
|
||||
";
|
||||
header("HX-Replace-Url: false");
|
||||
echo($response);
|
||||
} elseif (count($filtered) == 1){
|
||||
$r = $filtered[0];
|
||||
$response .= "
|
||||
<h2> $r->name</h2>
|
||||
<p> <b>Klubb:</b> $r->club</p>
|
||||
<p> <b>Løype:</b> $r->course</p>
|
||||
<p> <b>Epost:</b> <a href=\"mailto:$r->email\">$r->email</a></p>
|
||||
<p> <b>Mobilnummer:</b> <a href=\"tel:$r->phone\">$r->phone</a></p>
|
||||
<p> <b>Student?</b> $r->is_student</p>
|
||||
";
|
||||
header("HX-Replace-Url: false");
|
||||
echo($response);
|
||||
}
|
||||
elseif (count($filtered) > 1){
|
||||
$response = "";
|
||||
$password = getallheaders()['Password'];
|
||||
if (!password_verify($password, $hash)) {
|
||||
http_response_code(response_code: 401);
|
||||
} else {
|
||||
parse_str($_SERVER['QUERY_STRING'], $query);
|
||||
|
||||
for ($i = 0; $i < count($filtered); $i++) {
|
||||
$runner = $filtered[$i];
|
||||
if ($query['edit'] == "true") {
|
||||
$url = "/api/runner.php?search=$runner->id&edit=true";
|
||||
} else {
|
||||
$url = "/api/runner.php?search=$runner->id";
|
||||
}
|
||||
$response .= "<button class=\"default\" hx-get=\"$url\" hx-target=\"#runner\" hx-swap=\"show:none\">$runner->id $runner->name</button>";
|
||||
header("HX-Replace-Url: false");
|
||||
$runners = read_runners_from_csv();
|
||||
$filtered = search_for_runner($runners, $query['search']);
|
||||
if (isset($query['get'])) {
|
||||
$filtered = [get_runner($runners,$query['get'])];
|
||||
}
|
||||
if (count($filtered) == 1 && $query['edit'] == "true") {
|
||||
$r = $filtered[0];
|
||||
$response .= "
|
||||
<h2>Endre $r->id $r->name</h2>
|
||||
<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>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>
|
||||
<fieldset>
|
||||
<input type='radio' name='course' value='Kadaverløpet' checked='checked'>
|
||||
Kadaverløpet
|
||||
</label>
|
||||
<label>
|
||||
<input type='radio' name='course' value=\"Minikadaver'n\">
|
||||
Minikadaver'n
|
||||
</label>
|
||||
</fieldset>
|
||||
<label>epost<input type='text' id='email' name='email' value='$r->email'></label>
|
||||
<label>telefon<input type='text' id='phone' name='phone' value='$r->phone'></label>
|
||||
<label><input type='hidden' id='student' name='student' required value='$r->is_student'></label>
|
||||
<label><input type='hidden' id='line_in_csv' name='line_in_csv' required value='$r->line_in_csv'></label>
|
||||
<button type='submit'>Endre løper</button>
|
||||
</form>
|
||||
";
|
||||
header("HX-Replace-Url: false");
|
||||
echo($response);
|
||||
} elseif (count($filtered) == 1){
|
||||
$r = $filtered[0];
|
||||
$response .= "
|
||||
<h2> $r->name</h2>
|
||||
<p> <b>Klubb:</b> $r->club</p>
|
||||
<p> <b>Løype:</b> $r->course</p>
|
||||
<p> <b>Epost:</b> <a href=\"mailto:$r->email\">$r->email</a></p>
|
||||
<p> <b>Mobilnummer:</b> <a href=\"tel:$r->phone\">$r->phone</a></p>
|
||||
<p> <b>Student?</b> $r->is_student</p>
|
||||
";
|
||||
header("HX-Replace-Url: false");
|
||||
echo($response);
|
||||
}
|
||||
elseif (count($filtered) > 1){
|
||||
$response = "";
|
||||
|
||||
for ($i = 0; $i < count($filtered); $i++) {
|
||||
$runner = $filtered[$i];
|
||||
if ($query['edit'] == "true") {
|
||||
$url = "/api/runner.php?get=$runner->id&edit=true";
|
||||
} else {
|
||||
$url = "/api/runner.php?get=$runner->id";
|
||||
}
|
||||
$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");
|
||||
}
|
||||
echo($response);
|
||||
}
|
||||
else{
|
||||
echo("Ingen resultater...");
|
||||
}
|
||||
echo($response);
|
||||
}
|
||||
else{
|
||||
echo("Ingen resultater...");
|
||||
}
|
||||
|
||||
}
|
||||
@ -4,6 +4,7 @@ $documentRoot = $_SERVER['DOCUMENT_ROOT'];
|
||||
$config = parse_ini_file("$documentRoot/data/config.ini");
|
||||
date_default_timezone_set('UTC');
|
||||
$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;
|
||||
/*
|
||||
// Caching
|
||||
@ -165,7 +166,9 @@ function liveresult_table($runners) {
|
||||
$matposter = "<td>$tid_1_mat</td><td>$tid_2_mat</td>";
|
||||
}
|
||||
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";
|
||||
@ -174,8 +177,8 @@ function liveresult_table($runners) {
|
||||
}
|
||||
|
||||
function minikadadvern_table($runners) {
|
||||
usort($runners, "cmp");
|
||||
usort($runners, "cmp_course");
|
||||
//usort($runners, "cmp");
|
||||
//usort($runners, "cmp_course");
|
||||
$minikadaver_table = "<table><thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
@ -183,53 +186,18 @@ function minikadadvern_table($runners) {
|
||||
<th>Mål</th>
|
||||
</tr></thead>
|
||||
<tbody>";
|
||||
$kadaver_num = 0;
|
||||
$mini_num = 0;
|
||||
$mini_num = 0;
|
||||
for ($i = 0; $i < count($runners); $i++) {
|
||||
$runner = $runners[$i];
|
||||
$tid_maal = "";
|
||||
$sprekk = "<td></td>";
|
||||
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") {
|
||||
$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++;
|
||||
}
|
||||
|
||||
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";
|
||||
}
|
||||
elseif ($runner->course == "Minikadaver'n") {
|
||||
$minikadaver_table .= "<tr><td>". "" .".</td><td>$runner->name</td><td>$tid_maal</td></tr>\n";
|
||||
if ($runner->course == "Minikadaver'n") {
|
||||
$mini_num++;
|
||||
$runner_number = $mini_num . ".";
|
||||
if ($runner->get_control() != 2){$runner_number = "";};
|
||||
$minikadaver_table .= "<tr><td>". "$runner_number" ."</td><td>$runner->name</td><td>$tid_maal</td></tr>\n";
|
||||
}
|
||||
}
|
||||
$minikadaver_table .= "</tbody></table>";
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
</menu>
|
||||
</nav>
|
||||
<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>
|
||||
|
||||
<label for="id">Startnummer:
|
||||
@ -56,7 +56,7 @@
|
||||
</form>
|
||||
<div id="updated"></div>
|
||||
<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">
|
||||
<label>
|
||||
Søk etter navn, startnummer eller klubb
|
||||
|
||||
@ -34,13 +34,17 @@ class Runner
|
||||
}
|
||||
|
||||
function get_control(){
|
||||
$control = -1;
|
||||
for ($i = 0; $i < count($this->splits); $i++) {
|
||||
if ($this->splits[$i] != false) {
|
||||
$control++;
|
||||
}
|
||||
if ($this->splits[2] != false) {
|
||||
return 2;
|
||||
} elseif ($this->splits[1] != false) {
|
||||
return 1;
|
||||
}
|
||||
elseif ($this->splits[0] != false) {
|
||||
return 0;
|
||||
}
|
||||
else {
|
||||
return -1;
|
||||
}
|
||||
return $control;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -20,7 +20,6 @@
|
||||
<h1>Påmeldte Kadaverløpet 2025</h1>
|
||||
</div>
|
||||
<h2>Oppdatert 28.10.25</h2>
|
||||
<div class="flash attention">Startnummer blir tildelt nærmere arrangementet. Prøver å oppdatere lista jevnlig. TBN</div>
|
||||
<?php
|
||||
$query = ["type"=>"paameldte"];
|
||||
include("api/table.php");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user