Compare commits

..

28 Commits
sql ... master

Author SHA1 Message Date
Trygve
6825e90568 Småfikser 2025-10-31 14:48:53 +01:00
Trygve
5f377cf811 Fiksa header pssord og la til minkadavertid 2025-10-31 11:59:38 +01:00
Trygve
2aff55b50d aaaaaaaa 2025-10-31 01:45:41 +01:00
Trygve
5b62326c42 La til endring av databasen og sjekk av ridstreng 2025-10-30 23:21:49 +01:00
Trygve
f2ede38dca lagde matpost nedtelling 2025-10-30 21:06:47 +01:00
Trygve
568c00ddd6 fiksa url 2025-10-30 11:05:25 +01:00
Trygve
96e42577fc Mappendringer 2025-10-30 11:05:16 +01:00
Trygve
95c1b1d4f3 Skrev instruks 2025-10-29 22:17:57 +01:00
Trygve
03197bd926 Småfikser 2025-10-29 21:54:11 +01:00
Trygve
2a70642dbd Fjerna unødvendig favicon 2025-10-29 01:10:18 +01:00
Trygve
cef8fd63f3 Fjerna gammel js 2025-10-29 01:08:51 +01:00
Trygve
b30996ceea Splitta kadavertabellen og minikadavertabellen 2025-10-29 01:01:58 +01:00
Trygve
fdddbbb0ef La til epost knapp 2025-10-28 23:46:42 +01:00
Trygve
4cc7ff821c Flytta endepunkter inn i api/ 2025-10-28 21:44:08 +01:00
Trygve
604fb365c6 Registrer ukjent startnummer 2025-10-28 20:58:03 +01:00
Trygve
b86be61331 100% bredde på tabell 2025-10-28 15:35:29 +01:00
Trygve
78efda52d9 La til gitignore 2025-10-28 13:54:24 +01:00
Trygve
572ec41f85 Ny font og favicon 2025-10-28 13:53:23 +01:00
Trygve
a684cb4841 finpuss på søk 2025-10-27 23:44:50 +01:00
Trygve
e6d76cd69c Lagde løpersøk 2025-10-27 23:14:35 +01:00
Trygve
544517b3d8 Flytta import av løpere og strekktider til egen php fil 2025-10-27 20:49:01 +01:00
Trygve
16b98e0b9f La til tid etter vinner 2025-10-27 17:38:38 +01:00
Trygve
88dda157b5 Lagde config fil og side for å endre starttidspunkt 2025-10-27 15:18:24 +01:00
Trygve
cfd95bea41 Oppfriskning 2025-10-27 13:01:25 +01:00
Trygve
648bb5443c Oppdrydning 2025-10-27 12:04:10 +01:00
Trygve
91451b382f Lagde innloggingsise 2025-10-27 11:36:58 +01:00
Trygve
52b20828b7 Starta på admin.php 2025-10-26 23:30:11 +01:00
Trygve
d408d18de5 Påmeldingslista er oppe å går 2025-10-24 18:59:46 +02:00
46 changed files with 1740 additions and 429 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
data/*
launch.json

Binary file not shown.

93
admin.php Normal file
View File

@ -0,0 +1,93 @@
<!DOCTYPE html>
<html lang="no">
<head>
<meta charset="UTF-8" />
<title>EKT admin</title>
<meta name="viewport" content="width=device-width,initial-scale=1" />
<meta name="description" content="Elektronisk Kadaver Tidtakningssystem" />
<link rel="stylesheet" href="css/matcha.css">
<link rel="icon" type="image/png" href="/img/favicon-96x96.png" sizes="96x96" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" sizes="180x180" href="/img/apple-touch-icon.png" />
<meta name="apple-mobile-web-app-title" content="Kadaver'n" />
<link rel="manifest" href="/img/site.webmanifest" />
<style>
.profile-card{
background-color: var(--bg-active);
font-size: 1.4em;
padding: 1rem;
border-radius: var(--bd-radius);
width: fit-content;
margin-left: auto;
margin-right: auto;
}
.profile-card h2{
font-size: 2rem;
}
</style>
</head>
<body>
<nav>
<menu>
<li class="selected"><a href="/admin.php">📊 Dashbord</a></li>
<li class="disabled"><a href="/registrering.php">⏱️ Registrer passering matpost/mål</a></li>
<li class="disabled"><a href="/db_editor.html">👥 Endre løperbase</a></li>
<li class="disabled"><a href="/config_editor.html">⚙️ Konfigurasjon</a></li>
<li class="disabled">⏳️ Nedtelling matpost
<menu>
<li><a href="/matpost_nedtelling.php?matpost=0">1. mat</a></li>
<li><a href="/matpost_nedtelling.php?matpost=1">2. mat</a></li>
</menu>
</li>
</menu>
</nav>
<button class="danger" onclick="log_out()">Logg ut</button>
<div class='flex wrap' hx-get="/api/statistics.php" hx-trigger="every 5s">
<?php
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" hx-headers='js:{"Password": localStorage.getItem("passord")}'>
<label>
Navn, startnummer eller klubb
<input type="text" name="search" id="search">
</label>
<button type="submit">Søk</button>
</form>
<div id="runner" class="profile-card"></div>
<button hx-get="/api/email.php" hx-target="#emails" hx-headers='js:{"Password": localStorage.getItem("passord")}'>hent alle eposter</button>
<button hx-get="/api/email.php?course=Kadaverløpet" hx-target="#emails" hx-headers='js:{"Password": localStorage.getItem("passord")}'>Hent bare eposter for fullkadavern</button>
<button hx-get="/api/email.php?course=Minikadaver'n" hx-target="#emails" hx-headers='js:{"Password": localStorage.getItem("passord")}'>Hent bare eposter for minikadaver'n</button>
<div class="flash default">
<output id="emails"></output>
</div>
<h1>Løpende resultater</h1>
<h2>Kadaverløpet</h2>
<div class='flex' hx-get="api/table.php?type=liveresultater" hx-trigger="load, every 5s"></div>
<h2>Minikadaver'n</h2>
<div class='flex' hx-get="api/table.php?type=minikadavern" hx-trigger="load, every 15s"></div>
<?php
include("api/table.php");
//liveresult_table($runners);
?>
<script>
function log_out(){
localStorage.removeItem("navn");
localStorage.removeItem("passord");
window.location.href = "/login.html";
}
let xmlHttpReq = new XMLHttpRequest();
xmlHttpReq.open("POST", "/api/is_authorized.php", false);
xmlHttpReq.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8")
xmlHttpReq.send("username=" + localStorage.getItem("navn")+"&"+"password=" + localStorage.getItem("passord"));
if (xmlHttpReq.status != 200){
window.location.href = "/login.html";
}
</script>
<script src="/lib/htmx.min.js"></script>
</body>
</html>

67
api/config.php Normal file
View File

@ -0,0 +1,67 @@
<?php
$documentRoot = $_SERVER['DOCUMENT_ROOT'];
function write_ini_file($assoc_array, $path) {
$content = "";
foreach ($assoc_array as $section => $values) {
if (is_array($values)) {
$content .= "[$section]\n";
foreach ($values as $key => $val) {
$content .= "$key = \"$val\"\n";
}
} else {
$content .= "$section = \"$values\"\n";
}
$content .= "\n";
}
file_put_contents($path, data: $content);
}
$config = parse_ini_file("$documentRoot/data/config.ini");
include("$documentRoot/data/hash.php");
$method = $_SERVER['REQUEST_METHOD'];
if ($method == "POST") {
$start_time = $_POST['start_time'];
$start_time_mini = $_POST['mini_time'];
$password = $_POST['Password'];
$password = getallheaders()['Password'];
$new_time = DateTime::createFromFormat(DateTime::ISO8601, $start_time. "+01");
if (!password_verify($password, $hash)) {
http_response_code(response_code: 401);
} elseif (!$new_time) {
http_response_code(response_code: 400);
echo("Feil datoformat din noldus!!!!!!!11!!! Skriv inn sekund");
} else {
$file = "$documentRoot/data/config.ini";
$config["start_date"] = $start_time . "+01";
$config["start_date_mini"] = $start_time_mini . "+01";
write_ini_file($config, $file);
header("HX-Replace-Url: false");
echo("Starttida er oppdatert til: $start_time for Kadaver'n <br> $start_time_mini for Minikadaer'n");
}
}
elseif ($method == "GET"){
$start_kadaver = explode("+", $config["start_date"])[0];
$start_mini = explode("+", $config["start_date_mini"])[0];
$response = "
<form action='/api/config.php' method='POST' hx-boost='true' hx-target='#updated' hx-swap='show:none' hx-headers='js:{\"Password\": localStorage.getItem(\"passord\")}'>
<label>
Starttid Kadaverløpet
<input type='datetime-local' id='start_time' name='start_time' step='1' value='$start_kadaver'>
</label>
<label>
Starttid Minikadaver'n
<input type='datetime-local' id='mini_time' name='mini_time' step='1' value='$start_mini'>
</label>
<button type='submit'>Oppdater</button>
</form>
<div id='updated'></div>
";
echo($response);
}

50
api/countdown.php Normal file
View File

@ -0,0 +1,50 @@
<?php
$documentRoot = $_SERVER['DOCUMENT_ROOT'];
include("$documentRoot/import_runners.php");
function format($seconds) {
// Ensure it's an integer and non-negative
$seconds = max(0, (int)$seconds);
$minutes = floor($seconds / 60);
$remainingSeconds = $seconds % 60;
// Format with leading zeros (e.g., 02:05)
return sprintf('%02d:%02d', $minutes, $remainingSeconds);
}
$method = $_SERVER['REQUEST_METHOD'];
$time_limit = 240;
if ($method == "GET") {
parse_str($_SERVER['QUERY_STRING'], $query);
$control = $query['matpost'];
$runners = read_runners_from_csv();
usort($runners, "cmp");
$runners = array_reverse($runners);
$hourMin = date('H:i:s');
$waiting = "$hourMin
<h1>Tid igjen matpost:<h1><div class='flex wrap center'>";
$finished = "<h1>Kan løpe videre:<h1><div class='flex wrap center'>";
for ($i = 0; $i < count($runners); $i++) {
$runner = $runners[$i];
if ($runner->get_control() == $control){
$time_since_punch = time() - ($runner->splits[$control])->getTimestamp();
//Løperen har ikke venta 4 minutt:
if ($time_since_punch < $time_limit) {
$time = format($time_limit - $time_since_punch);
$waiting .= "<div class=\"flash attention\">$runner->id $runner->name <span class=\"time\">-$time</span></div>";
} elseif ($time_since_punch >= $time_limit && $time_since_punch <900){ //Løperen har venta ferdig
$time = format(time()-$runner->splits[$control]->getTimestamp() - $time_limit) ;
$finished .= "<div class=\"flash success\">$runner->id $runner->name <span class=\"time\">+$time</span></div>";
}
}
}
echo($waiting . "</div>". $finished . "</div>");
}

26
api/email.php Normal file
View File

@ -0,0 +1,26 @@
<?php
$documentRoot = $_SERVER['DOCUMENT_ROOT'];
include("$documentRoot/import_runners.php");
include("$documentRoot/data/hash.php");
$method = $_SERVER['REQUEST_METHOD'];
if ($method == "GET") {
parse_str($_SERVER['QUERY_STRING'], $query);
$course = $query['course'];
$password = getallheaders()['Password'];
if (!password_verify($password, $hash)) {
http_response_code(response_code: 401);
} else {
$runners = read_runners_from_csv();
$emails = "";
for ($i = 0; $i < count($runners); $i++) {
$email = $runners[$i]->email;
if (!isset($query['course'])){
$emails .= "$email, ";
}
elseif ($course == $runners[$i]->course) {
$emails .= "$email, ";
}
}
echo($emails);
}
}

17
api/is_authorized.php Normal file
View File

@ -0,0 +1,17 @@
<?php
$documentRoot = $_SERVER['DOCUMENT_ROOT'];
include("$documentRoot/data/hash.php");
$method = $_SERVER['REQUEST_METHOD'];
if ($method == "POST") {
$password = $_POST['password'];
if (!password_verify($password, $hash)) {
http_response_code(response_code: 401);
}
else {
http_response_code(response_code: 200);
}
}else {
http_response_code(response_code: 405);
}

View File

@ -1,16 +1,18 @@
<?php
$documentRoot = $_SERVER['DOCUMENT_ROOT'];
$control = $_POST['control'];
$runner_id = $_POST['id'];
$time = $_POST['time'];
$password = $_POST['password'];
$hash = file_get_contents("hash.txt");
include("$documentRoot/data/hash.php");
if (!password_verify($password, $hash)) {
http_response_code(response_code: 401);
}
else {
$file = 'passering.csv';
$file = "$documentRoot/data/passering.csv";
$current = file_get_contents($file);
$current .= $control . "," . $runner_id . "," . $time . "\n";
file_put_contents($file, $current);

139
api/runner.php Normal file
View File

@ -0,0 +1,139 @@
<?php
$documentRoot = $_SERVER['DOCUMENT_ROOT'];
include("$documentRoot/import_runners.php");
include("$documentRoot/data/hash.php");
$method = $_SERVER['REQUEST_METHOD'];
if ($method == "POST") {
$runner_id = $_POST['id'];
$name = $_POST['name'];
$club = $_POST['club'];
$course = $_POST['course'];
$line = $runner_id . ";;" . $name . ";;;" . $club . ";" . $course . ";;;\n";
$password = $_POST['password'];
if (!password_verify($password, $hash)) {
http_response_code(response_code: 401);
}
elseif (!ctype_digit($runner_id)){
http_response_code(response_code: 400);
}
else {
$runners = read_runners_from_csv();
$filtered = search_for_runner($runners, $runner_id);
if ($filtered != []) {
http_response_code(response_code: 400);
echo("<span class='bg-danger'>Startnummer er allerede i bruk!</span>");
} else {
$file = "$documentRoot/data/db.csv";
file_put_contents($file, $line, FILE_APPEND);
header("HX-Replace-Url: false");
echo("Løper lagt til: $line");
}
}
}
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);
$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") {
$password = getallheaders()['Password'];
if (!password_verify($password, $hash)) {
http_response_code(response_code: 401);
} else {
parse_str($_SERVER['QUERY_STRING'], $query);
$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...");
}
}
}

41
api/statistics.php Normal file
View File

@ -0,0 +1,41 @@
<?php
$documentRoot = $_SERVER['DOCUMENT_ROOT'];
require_once("$documentRoot/import_runners.php");
$method = $_SERVER['REQUEST_METHOD'];
if ($method == "GET") {
parse_str($_SERVER['QUERY_STRING'], $query);
$runners = read_runners_from_csv();
$minikadavern = 0;
$minikadavern_total = 0;
$mat1 = 0;
$mat2 = 0;
$maal = 0;
$total = 0;
for ($i = 0; $i < count($runners); $i++) {
$runner = $runners[$i];
if ($runner->course == "Minikadaver'n") {
$minikadavern_total++;
if ($runner->get_control() == 2) {
$minikadavern++;
}
}
else {
$total++;
if ($runner->get_control() >= 0) {
$mat1++;
}
if ($runner->get_control() >= 1) {
$mat2++;
}
if ($runner->get_control() == 2) {
$maal++;
}
}
}
echo("
<div class='flash accent m-1'><b>$mat1 av $total</b> har passert 1. matpost</div>
<div class='flash accent m-1'><b>$mat2 av $total</b> har passert 2. matpost</div>
<div class='flash accent m-1'><b>$maal av $total</b> har fullført Kadaver'n</div>
<div class='flash accent m-1'><b>$minikadavern av $minikadavern_total</b> har fullført Minikadaver'n</div>");
}

224
api/table.php Normal file
View File

@ -0,0 +1,224 @@
<?php
$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
header("Last-Modified: " . date("F d Y H:i:s.", filemtime("data/passering.csv")));
$etag = '"' . md5_file("data/passering.csv"). '"';
header(header: 'ETag: ' . $etag );
if(isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
// If HTTP_IF_NONE_MATCH is same as the generated ETag => content is the same as browser cache
// So send a 304 Not Modified response header and exit
if($_SERVER['HTTP_IF_NONE_MATCH'] == $etag) {
http_response_code(304);
exit();
}
}
*/
require_once("$documentRoot/import_runners.php");
function registration_table($runners) {
parse_str($_SERVER['QUERY_STRING'], $query);
$matpost = $query["control"];
$runners_filtered = [];
if ($query["filter"]) {
for ($i = 0; $i < count($runners); $i++) {
if (filter_runners($runners[$i], $query["filter"])) {
array_push($runners_filtered, $runners[$i]);
}
}
$runners = $runners_filtered;
}
if (count($runners) == 0) {
$runner_id = $query["filter"];
$response = "<div class=\"flash default\">Fant ingen løper med dette startnummeret. Registrer likevell? <button onclick=\"register_runner($runner_id)\">Registrer startnummer $runner_id ✅️</button></div>";
echo($response);
} else {
echo(" <thead><tr>
<th>#</th>
<th>Navn</th>
<th>Tid</th>
<th></th>
</tr></thead>
<tbody>");
for ($i = 0; $i < count($runners); $i++) {
$runner = $runners[$i];
// Klokkeslett for denne posten
if ($runner->splits[$matpost-1] != false) {
$tid_passering = $GLOBALS['start_time']->diff($runner->splits[$matpost-1])->format('%H:%I:%S');
}
else {
$tid_passering = "";
}
if ($runner->get_control() == $matpost-1) {
// Løperen har vært på denne matposten og vi farger raden grønn
$button = "<button onclick=\"register_runner($runner->id)\">☑️</button>";
$cssclass = "class=\"bg-success\"";
}
elseif ($runner->get_control() > $matpost-1) {
// Løperen har vært på denne matposten og vi farger raden grønn
$button = "<button onclick=\"register_runner($runner->id)\">☑️</button>";
$cssclass = "class=\"bg-active\"";
}
else {
$button = "<button onclick=\"register_runner($runner->id)\">✅️</button>";
$cssclass = "";
}
echo ("<tr $cssclass><td>$runner->id</td><td>$runner->name</td><td>$tid_passering</td><td>$button</td></tr>\n");
}
echo("</tbody>");
}
}
function participants_table($runners) {
usort($runners, "cmp_course");
$kadaverløpere = 0;
$minikadaverløpere = 0;
for ($i = 0; $i < count($runners); $i++) {
if ($runners[$i]->course == "Kadaverløpet") {
$kadaverløpere++;
}
elseif ($runners[$i]->course == "Minikadaver'n") {
$minikadaverløpere++;
}
}
echo("<div class=\"flex space-evenly\">
<div class=\"flash accent\">$kadaverløpere påmeldt Kadaverløpet</div><div class=\"flash accent\">$minikadaverløpere påmeldte i Minikadaver'n</div>
</div>");
echo("<table><thead>
<tr>
<th>S.nr</th>
<th>Navn</th>
<th>Klubb/Forening</th>
<th>Variant</th>
</tr></thead>
<tbody>");
for ($i = 0; $i < count($runners); $i++) {
$runner = $runners[$i];
echo ("<tr><td>$runner->id</td><td>$runner->name</td><td>$runner->club</td><td>$runner->course</td></tr>\n");
}
echo("<table><tbody>");
}
function liveresult_table($runners) {
usort($runners, "cmp");
usort($runners, "cmp_course");
$kadaver_table = "<table><thead>
<tr>
<th>#</th>
<th>Navn</th>
<th>1. matpost</th>
<th>2. matpost</th>
<th>Mål</th>
<th>Etter</th>
<th>Sprekkindeks</th>
</tr></thead>
<tbody>";
$kadaver_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');
}
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>";
}
if ($runner->course == "Kadaverløpet") {
$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";
echo($kadaver_table);
}
function minikadadvern_table($runners) {
//usort($runners, "cmp");
//usort($runners, "cmp_course");
$minikadaver_table = "<table><thead>
<tr>
<th>#</th>
<th>Navn</th>
<th>Mål</th>
</tr></thead>
<tbody>";
$mini_num = 0;
for ($i = 0; $i < count($runners); $i++) {
$runner = $runners[$i];
$tid_maal = "";
if ($runner->splits[2] != false) {
$tid_maal = $GLOBALS['start_time_mini']->diff($runner->splits[2])->format('%H:%I:%S');
}
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>";
echo($minikadaver_table);
}
$runners = read_runners_from_csv();
if (!isset($query)){
parse_str($_SERVER['QUERY_STRING'], $query);
if ($query["type"] == "registrering"){
registration_table($runners);
}
elseif ($query["type"] == "paameldte") {
participants_table($runners);
}
elseif ($query["type"] == "liveresultater") {
liveresult_table($runners);
}
elseif ($query["type"] == "minikadavern") {
minikadadvern_table($runners);
}
}

68
config_editor.html Normal file
View File

@ -0,0 +1,68 @@
<!DOCTYPE html>
<html lang="no">
<head>
<meta charset="UTF-8" />
<title>EKT admin</title>
<meta name="viewport" content="width=device-width,initial-scale=1" />
<meta name="description" content="Elektronisk Kadaver Tidtakningssystem" />
<link rel="icon" type="image/png" href="/img/favicon-96x96.png" sizes="96x96" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" sizes="180x180" href="/img/apple-touch-icon.png" />
<meta name="apple-mobile-web-app-title" content="Kadaver'n" />
<link rel="manifest" href="/img/site.webmanifest" />
<link rel="stylesheet" href="css/matcha.css">
</head>
<body>
<nav>
<menu>
<li class="disabled"><a href="/admin.php">📊 Dashbord</a></li>
<li class="disabled"><a href="/registrering.php">⏱️ Registrer passering på matpost/mål</a></li>
<li class="disabled"><a href="/db_editor.html">👥 Endre løperbase</a></li>
<li class="selected"><a href="/config_editor.html">⚙️ Konfigurasjon</a></li>
<li class="disabled">⏳️ Nedtelling matpost
<menu>
<li><a href="/matpost_nedtelling.php?matpost=0">1. mat</a></li>
<li><a href="/matpost_nedtelling.php?matpost=1">2. mat</a></li>
</menu>
</li>
</menu>
</nav>
<h2>Sett dato og tid startskuddet gikk:</h2>
<div hx-get="/api/config.php" hx-swap="outerHTML" hx-trigger="load"></div>
<script>
function log_out(){
localStorage.removeItem("navn");
localStorage.removeItem("passord");
window.location.href = "/login.html";
}
// Sjekk om brukeren er logga inn. hvis ikke hiv de ut til innloggingskjermen
let xmlHttpReq = new XMLHttpRequest();
xmlHttpReq.open("POST", "/api/is_authorized.php", false);
xmlHttpReq.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8")
xmlHttpReq.send("username=" + localStorage.getItem("navn")+"&"+"password=" + localStorage.getItem("passord"));
if (xmlHttpReq.status != 200){
window.location.href = "/login.html";
}
document.getElementById('password').value = localStorage.getItem("passord");
xmlHttpReq.open("GET", "/api/config.php", false);
xmlHttpReq.send();
document.getElementById('start_time').value = xmlHttpReq.response.split('+')[0]
console.log(xmlHttpReq.response)
</script>
<script src="/lib/htmx.min.js"></script>
<script>
document.body.addEventListener('htmx:beforeSwap', function(evt) {
// Allow 422 and 400 responses to swap
// We treat these as form validation errors
if (evt.detail.xhr.status === 422 || evt.detail.xhr.status === 400) {
evt.detail.shouldSwap = true;
evt.detail.isError = false;
}
});
</script>
</body>
</html>

17
css/matcha.css Normal file

File diff suppressed because one or more lines are too long

102
db_editor.html Normal file
View File

@ -0,0 +1,102 @@
<!DOCTYPE html>
<html lang="no">
<head>
<meta charset="UTF-8" />
<title>EKT admin</title>
<meta name="viewport" content="width=device-width,initial-scale=1" />
<meta name="description" content="Elektronisk Kadaver Tidtakningssystem" />
<link rel="icon" type="image/png" href="/img/favicon-96x96.png" sizes="96x96" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" sizes="180x180" href="/img/apple-touch-icon.png" />
<meta name="apple-mobile-web-app-title" content="Kadaver'n" />
<link rel="manifest" href="/img/site.webmanifest" />
<link rel="stylesheet" href="css/matcha.css">
</head>
<body>
<nav>
<menu>
<li class="disabled"><a href="/admin.php">📊 Dashbord</a></li>
<li class="disabled"><a href="/registrering.php">⏱️ Registrer passering på matpost/mål</a></li>
<li class="selected"><a href="/db_editor.html">👥 Endre løperbase</a></li>
<li class="disabled"><a href="/config_editor.html">⚙️ Konfigurasjon</a></li>
<li class="disabled">⏳️ Nedtelling matpost
<menu>
<li><a href="/matpost_nedtelling.php?matpost=0">1. mat</a></li>
<li><a href="/matpost_nedtelling.php?matpost=1">2. mat</a></li>
</menu>
</li>
</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" hx-headers='js:{"Password": localStorage.getItem("passord")}'>
<input style="display: none;" type="text" id="password" name="password" required>
<label for="id">Startnummer:
<input type="text" id="id" name="id" required>
</label>
<label for="navn">Navn:
<input type="text" id="name" name="name">
</label>
<label for="club">Klubb:
<input type="text" id="club" name="club">
</label>
<fieldset>
<legend>Klasse</legend>
<label>
<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>
<button type="submit">Legg til løper</button>
</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" hx-headers='js:{"Password": localStorage.getItem("passord")}'>
<input type="hidden" id="edit" name="edit" value="true">
<label>
Søk etter navn, startnummer eller klubb
<input type="text" name="search" id="search">
</label>
<button type="submit">Søk</button>
</form>
<div id="runner"></div>
</div>
<div id="updated"></div>
<script>
function log_out(){
localStorage.removeItem("navn");
localStorage.removeItem("passord");
window.location.href = "/login.html";
}
// Sjekk om brukeren er logga inn. hvis ikke hiv de ut til innloggingskjermen
let xmlHttpReq = new XMLHttpRequest();
xmlHttpReq.open("POST", "/api/is_authorized.php", false);
xmlHttpReq.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8")
xmlHttpReq.send("username=" + localStorage.getItem("navn")+"&"+"password=" + localStorage.getItem("passord"));
if (xmlHttpReq.status != 200){
window.location.href = "/login.html";
}
document.getElementById('password').value = localStorage.getItem("passord");
</script>
<script src="/lib/htmx.min.js"></script>
<script>
document.body.addEventListener('htmx:beforeSwap', function(evt) {
// Allow 422 and 400 responses to swap
// We treat these as form validation errors
if (evt.detail.xhr.status === 422 || evt.detail.xhr.status === 400) {
evt.detail.shouldSwap = true;
evt.detail.isError = false;
}
});
</script>
</body>
</html>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
img/apple-touch-icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
img/favicon-96x96.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
img/favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

17
img/favicon.svg Normal file

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 409 KiB

21
img/site.webmanifest Normal file
View File

@ -0,0 +1,21 @@
{
"name": "Kadaver'n løpende resultater",
"short_name": "Kadaver'n",
"icons": [
{
"src": "/img/web-app-manifest-192x192.png",
"sizes": "192x192",
"type": "image/png",
"purpose": "maskable"
},
{
"src": "/img/web-app-manifest-512x512.png",
"sizes": "512x512",
"type": "image/png",
"purpose": "maskable"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 KiB

View File

@ -1,4 +0,0 @@
CREATE TABLE IF NOT EXISTS løpere(id INTEGER PRIMARY KEY, navn TEXT);
.separator ,
.mode csv
.import db.csv QNH

152
import_runners.php Normal file
View File

@ -0,0 +1,152 @@
<?php
$documentRoot = $_SERVER['DOCUMENT_ROOT'];
class Runner
{
public int $id;
public string $name;
public string $club;
public string $course;
public string $email;
public string $phone;
public string $is_student;
public array $splits;
function __construct($id, $name, $club, $course, $email, $phone, $is_student, $line_in_csv)
{
if ($id == null) {
$id = 0;
$name = "";
}
$this->id = $id;
$this->name = $name;
$this->club = $club;
$this->course = $course;
$this->email = $email;
$this->phone = $phone;
$this->is_student = $is_student;
$this->line_in_csv = $line_in_csv;
$this->splits = [false, false, false];
}
function set_split($control, $timestamp)
{
$this->splits[$control] = $timestamp;
}
function get_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;
}
}
}
//find runner by id in list of Runner objects
function get_runner($runnner_list, int $id)
{
for ($i = 0; $i < count($runnner_list); $i++) {
if ($runnner_list[$i]->id == $id) {
return $runnner_list[$i];
}
}
return false;
}
function search_for_runner($runner_list, $search_term) {
$filtered_runners = [];
for ($i = 0; $i < count($runner_list); $i++) {
$runner = $runner_list[$i];
if (str_contains(strtolower($runner->name), strtolower($search_term))){
array_push($filtered_runners, $runner);
}
elseif (str_contains($runner->id, $search_term)){
array_push($filtered_runners, $runner);
}
elseif (str_contains(strtolower($runner->club), strtolower($search_term))){
array_push($filtered_runners, $runner);
}
}
return $filtered_runners;
}
function cmp(Runner $a, Runner $b) {
$a_control = $a->get_control();
$b_control = $b->get_control();
if ($a_control > $b_control){
return -1;
}
if ($a_control < $b_control){
return 1;
}
if ($a_control == -1) {
return 1;
}
if ($b_control == -1) {
return -1;
}
if ($a->splits[$a_control]->getTimestamp() < $b->splits[$b_control]->getTimestamp()){
return -1;
}
if ($a->splits[$a_control]->getTimestamp() > $b->splits[$b_control]->getTimestamp()){
return 1;
}
return 0;
}
function cmp_course(Runner $a, Runner $b) {
return strcmp($a->course, $b->course);
}
function filter_runners(Runner $runner, $id) {
if ($runner->id == $id) {
return True;
}
else {
return False;
}
}
function time_diff(DateTime $date_1, DateTime $date_2) {
return $date_2->getTimestamp() - $date_1->getTimestamp();
}
function read_runners_from_csv(){
$documentRoot = $_SERVER['DOCUMENT_ROOT'];
$runners = [];
$csv_runners = file_get_contents("$documentRoot/data/db.csv");
$csv_runners = str_getcsv($csv_runners, "\n");
for ($i = 1; $i < count($csv_runners); $i++) {
$line = str_getcsv($csv_runners[$i], ";");
array_push($runners, new Runner($line[0], $line[2], $line[5], $line[6], $line[3], $line[4], $line[7], $i));
}
$timings = file_get_contents("$documentRoot/data/passering.csv");
$timings = str_getcsv($timings, "\n");
for ($i = 0; $i < count($timings); $i++) {
$line = str_getcsv($timings[$i]);
$time = DateTime::createFromFormat("Y-m-d\TH:i:sp", $line[2]);
if (!$time) {
//error
continue;
}
$runner = get_runner($runners, (int) $line[1]);
if (!$runner) {
//error
continue;
}
$runner->set_split($line[0]-1, $time);
}
return $runners;
}

View File

@ -5,7 +5,12 @@
<title>EKT</title>
<meta name="viewport" content="width=device-width,initial-scale=1" />
<meta name="description" content="Elektronisk Kadaver Tidtakningssystem" />
<link rel="stylesheet" href="matcha.css">
<link rel="icon" type="image/png" href="/img/favicon-96x96.png" sizes="96x96" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" sizes="180x180" href="/img/apple-touch-icon.png" />
<meta name="apple-mobile-web-app-title" content="Kadaver'n" />
<link rel="manifest" href="/img/site.webmanifest" />
<link rel="stylesheet" href="css/matcha.css">
<style>
@media only screen and (max-width: 650px) {
body {
@ -27,7 +32,7 @@
</div>
<h2>Vi tar forbehold om feil. Dette er ikke offisielle resultater</h2>
<?php
include("table.php");
include("api/table.php");
liveresult_table($runners);
?>
<footer>
@ -43,7 +48,7 @@ liveresult_table($runners);
table.innerHTML = this.responseText;
localStorage.setItem("ETag", this.getResponseHeader("ETag"));
}};
request.open("GET", "table.php?type=liveresultater");
request.open("GET", "api/table.php?type=liveresultater");
request.setRequestHeader("If-None-Match", localStorage.getItem("ETag"));
request.send();
}

481
instruks/index.html Normal file

File diff suppressed because one or more lines are too long

33
instruks/index.md Normal file
View File

@ -0,0 +1,33 @@
% Bruksinstruks Elektronisk Kadaver Tidtakningssystem
# Hvordan funker skitet?
Elektronisk Kadaver Tidtakningssystem (EKT) lar matpostpersonell registrere tidspunkt løpere ankommer på gjennom Internett.
All dataen er lagra i tekstfiler.
db.csv har alle løperene og passering.csv har alle registreringene gjort på matpost og i mål. php koden kverner dette og spytter ut resultatlister og diverse.
Når du registrerer en løper vil en ny linje bli lagt til i passering.csv. Registrerer du eller noen andre samme person på samme matpost igjen vil den siste registreringa gjelde. Det betyr i praksis at det ikke er mulig å gjøre noe galt siden ingenting blir skrevet over eller sletta. Trykker man feil blir i verste fall en mellomtid feil og dette kan enkelt rettes opp i etter løpet.
# I Praksis
Gå til [ekt.trygve.net/admin.php](https://ekt.trygve.net/admin.php)
Blir du bedt om å logge inn skriver du inn et vilkårlig brukernavn og passordet du fikk av løpsleder.
Skal du registrere passeringer trykker du på denne knappen:
![](meny.png)
Det første du må gjøre er å velge hvilken matpost du står på. Husk å bytte dette hvis du flytter til en annen matpost/mål
![](velg_post.png)
Når en løper skal registreres skriver du inn startnummeret. Løperens navn skal da dukke opp og du trykker på ✅️
![](registrer1.png)
Etter løperen har passert matposten blir bakgrunnen grønn:
![](registrer2.png)
Har løperen passert en senere matpost eller mål blir bakgrunnen lilla.
![](registrer3.png)
Har det skjedd en feil og startnummeret ikke ligger i systemet får du valget å registrere den likevell. Tida blir lagra, men vill ikke dukke opp i resultatlista før løperen blir registrert i databasen. Det er derfor lurt å spørre løperen om hva han/hun heter og skrive det ned.
![](registrer4.png)

BIN
instruks/meny.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

BIN
instruks/registrer1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

BIN
instruks/registrer2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

BIN
instruks/registrer3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

BIN
instruks/registrer4.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

BIN
instruks/velg_post.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

1
lib/htmx.min.js vendored Normal file

File diff suppressed because one or more lines are too long

53
login.html Normal file
View File

@ -0,0 +1,53 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Login (GET)</title>
<!-- css/matcha.css -->
<link rel="stylesheet" href="css/matcha.css">
<main>
<h2>Login</h2>
<form method="POST" action="/api/is_authorized.php" id="login">
<label for="username">Navn</label>
<input id="navn" name="username" type="text" required>
<label for="password">Passord</label>
<input id="password" name="password" type="password" required>
<div class="flash danger" style="display: none;" id="feil">Feil passord</div>
<button type="submit">Log inn</button>
</form>
</main>
</body>
</html>
<script>
let xmlHttpReq = new XMLHttpRequest();
xmlHttpReq.open("POST", "/api/is_authorized.php", false);
xmlHttpReq.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8")
xmlHttpReq.send("username=" + localStorage.getItem("navn")+"&"+"password=" + localStorage.getItem("passord"));
if (xmlHttpReq.status == 200){
window.location.replace("/admin.php");
}
document.forms["login"].addEventListener("submit", async (event) => {
event.preventDefault();
const resp = await fetch(event.target.action, {
method: "POST",
body: new URLSearchParams(new FormData(event.target)),
});
const status = await resp.status;
if (status == 200){
localStorage.setItem("navn", document.getElementById('navn').value);
localStorage.setItem("passord", document.getElementById('password').value);
window.location.replace("/admin.php");
}
else{
document.getElementById('feil').style.display = "block"
}
});
localStorage.setItem("name", "Chris");
</script>

File diff suppressed because one or more lines are too long

67
matpost_nedtelling.php Normal file
View File

@ -0,0 +1,67 @@
<!DOCTYPE html>
<html lang="no">
<head>
<meta charset="UTF-8" />
<title>EKT admin</title>
<meta name="viewport" content="width=device-width,initial-scale=1" />
<meta name="description" content="Elektronisk Kadaver Tidtakningssystem" />
<link rel="icon" type="image/png" href="/img/favicon-96x96.png" sizes="96x96" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" sizes="180x180" href="/img/apple-touch-icon.png" />
<meta name="apple-mobile-web-app-title" content="Kadaver'n" />
<link rel="manifest" href="/img/site.webmanifest" />
<link rel="stylesheet" href="css/matcha.css">
<style>
body {
padding: 0;
margin: 0;
width: 100%;
max-width: 100%;
}
.ui {
padding: 0 1.5rem;
padding-top: 0px;
padding-right: 1.5rem;
padding-bottom: 0px;
padding-left: 1.5rem;
margin: 0 auto;
margin-top: 0px;
margin-right: auto;
margin-bottom: 0px;
margin-left: auto;
max-width: var(--ct-width);
}
.time {
font-size: 1.5em;
font-weight: bold;
}
.flash {
margin: 0.2em;
}
</style>
</head>
<body hx-ext="morph">
<nav class="ui">
<menu>
<li class="disabled"><a href="/admin.php">📊 Dashbord</a></li>
<li class="disabled"><a href="/registrering.php">⏱️ Registrer passering matpost/mål</a></li>
<li class="disabled"><a href="/db_editor.html">👥 Endre løperbase</a></li>
<li class="disabled"><a href="/config_editor.html">⚙️ Konfigurasjon</a></li>
<li class="selected">⏳️ Nedtelling matpost
<menu>
<li><a href="/matpost_nedtelling.php?matpost=0">1. mat</a></li>
<li><a href="/matpost_nedtelling.php?matpost=1">2. mat</a></li>
</menu>
</li>
</menu>
</nav>
<?php
parse_str($_SERVER['QUERY_STRING'], $query);
$control = $query['matpost'];
echo("<div hx-get='/api/countdown.php?matpost=$control' hx-trigger='load, every 1s' hx-swap='morph:innerHTML'></div>");
?>
<script src="/lib/htmx.min.js"></script>
<script src="https://unpkg.com/idiomorph@0.7.4/dist/idiomorph-ext.min.js" integrity="sha384-SsScJKzATF/w6suEEdLbgYGsYFLzeKfOA6PY+/C5ZPxOSuA+ARquqtz/BZz9JWU8" crossorigin="anonymous"></script>
</body>
</html>

View File

@ -1,91 +0,0 @@
<?php
function import_csv_to_sqlite(&$pdo, $csv_path, $options = array())
{
extract($options);
if (($csv_handle = fopen($csv_path, "r")) === FALSE)
throw new Exception('Cannot open CSV file');
if(!$delimiter)
$delimiter = ',';
if(!$table)
$table = preg_replace("/[^A-Z0-9]/i", '', basename($csv_path));
if(!$fields){
$fields = array_map(function ($field){
return strtolower(preg_replace("/[^A-Z0-9]/i", '', $field));
}, fgetcsv($csv_handle, 0, $delimiter));
}
$create_fields_str = join(', ', array_map(function ($field){
return "$field TEXT NULL";
}, $fields));
$pdo->beginTransaction();
$create_table_sql = "CREATE TABLE IF NOT EXISTS $table ($create_fields_str)";
$pdo->exec($create_table_sql);
$insert_fields_str = join(', ', $fields);
$insert_values_str = join(', ', array_fill(0, count($fields), '?'));
$insert_sql = "INSERT INTO $table ($insert_fields_str) VALUES ($insert_values_str)";
$insert_sth = $pdo->prepare($insert_sql);
$inserted_rows = 0;
while (($data = fgetcsv($csv_handle, 0, $delimiter)) !== FALSE) {
$insert_sth->execute($data);
$inserted_rows++;
}
$pdo->commit();
fclose($csv_handle);
return array(
'table' => $table,
'fields' => $fields,
'insert' => $insert_sth,
'inserted_rows' => $inserted_rows
);
}
import_csv_to_sqlite()
$password = $_POST['password'];
function send_response ($response, $code = 200) {
http_response_code($code);
die(json_encode($response));
}
if ($method === 'POST') {
if (!password_verify($password, $hash)) {
http_response_code(response_code: 401);
}
else {
$file = 'passering.csv';
$current = file_get_contents($file);
$current .= $control . "," . $runner_id . "," . $time . "\n";
file_put_contents($file, $current);
}
if (empty($data['favorite'])) {
send_response([
'status' => 'failed',
'message' => 'Please provide a favorite movie.',
], 400);
}
send_response([
'status' => 'success',
'message' => 'Fila er lasta opp',
]);
}
else {
send_response([
'status' => 'success',
'message' => 'Fila er lasta opp',
], 400);
}

View File

@ -5,7 +5,7 @@
<title>Påmeldte Kadaverløpet</title>
<meta name="viewport" content="width=device-width,initial-scale=1" />
<meta name="description" content="Elektronisk Kadaver Tidtakningssystem" />
<link rel="stylesheet" href="matcha.css">
<link rel="stylesheet" href="css/matcha.css">
<style>
@media (prefers-color-scheme: dark) {
.invert {
@ -17,12 +17,13 @@
<body>
<div class="flex align-center">
<figure><img src="img/kadaver.png" alt="" width="100px" class="invert"></figure>
<h1>Påmeldte Kadaverløpet 2024</h1>
<h1>Påmeldte Kadaverløpet 2025</h1>
</div>
<h2>Oppdatert 1.11.24</h2>
<h2>Oppdatert 28.10.25</h2>
<?php
$query = ["type"=>"paameldte"];
include("table.php");
include("api/table.php");
participants_table($runners);
?>
<footer>
<h3>Laget av Trygve. <a href="https://git.willy.club/Trygve/elektronisk-kadaver-tidtakingssystem">Kildekode</a></h3>

View File

@ -2,16 +2,35 @@
<html lang="no">
<head>
<meta charset="UTF-8" />
<title>EKT</title>
<title>EKT admin</title>
<meta name="viewport" content="width=device-width,initial-scale=1" />
<meta name="description" content="Elektronisk Kadaver Tidtakningssystem" />
<link rel="stylesheet" href="matcha.css">
<link rel="icon" type="image/png" href="/img/favicon-96x96.png" sizes="96x96" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" sizes="180x180" href="/img/apple-touch-icon.png" />
<meta name="apple-mobile-web-app-title" content="Kadaver'n" />
<link rel="manifest" href="/img/site.webmanifest" />
<link rel="stylesheet" href="css/matcha.css">
<style>
body {
padding: 0;
margin: 0;
width: 100%;
max-width: 100%;
}
.settings {
padding: 0 1.5rem;
padding-top: 0px;
padding-right: 1.5rem;
padding-bottom: 0px;
padding-left: 1.5rem;
margin: 0 auto;
margin-top: 0px;
margin-right: auto;
margin-bottom: 0px;
margin-left: auto;
max-width: var(--ct-width);
}
fieldset {
display: flex;
@ -27,9 +46,21 @@
</style>
</head>
<body>
<div class="settings">
<legend>Passord</legend>
<input type="password" name="passord" id="password">
<div class="settings">
<nav>
<menu>
<li class="disabled"><a href="/admin.php">📊 Dashbord</a></li>
<li class="selected"><a href="/registrering.php">⏱️ Registrer passering matpost/mål</a></li>
<li class="disabled"><a href="/db_editor.html">👥 Endre løperbase</a></li>
<li class="disabled"><a href="/config_editor.html">⚙️ Konfigurasjon</a></li>
<li class="disabled">⏳️ Nedtelling matpost
<menu>
<li><a href="/matpost_nedtelling.php?matpost=0">1. mat</a></li>
<li><a href="/matpost_nedtelling.php?matpost=1">2. mat</a></li>
</menu>
</li>
</menu>
</nav>
<fieldset>
<legend>Velg post</legend>
<label>
@ -72,12 +103,12 @@ function register_runner(id) {
return 0;
}
let formData = new FormData();
formData.append(name= 'password', value=document.getElementById('password').value)
formData.append(name= 'password', localStorage.getItem("passord"))
formData.append(name= 'control', value=control);
formData.append(name= 'id', value=id);
time = new Date(Date.now()).toISOString().split('.')[0]+"Z"
formData.append('time', time);
response = fetch("passing.php", {
response = fetch("api/passing.php", {
method: "POST",
body: formData,
})
@ -94,11 +125,23 @@ function update() {
const table = document.getElementById("runners");
control = get_control();
filter = document.getElementById("search").value;
let request = new Request(`table.php?type=registrering&control=`+control+`&filter=`+filter);
let request = new Request(`api/table.php?type=registrering&control=`+control+`&filter=`+filter);
fetch(request)
.then((response) => response.text())
.then((text) => {table.innerHTML = text;})
}
// Sjekk om brukeren er logga inn. hvis ikke hiv de ut til innloggingskjermen
let xmlHttpReq = new XMLHttpRequest();
xmlHttpReq.open("POST", "/api/is_authorized.php", false);
xmlHttpReq.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8")
xmlHttpReq.send("username=" + localStorage.getItem("navn")+"&"+"password=" + localStorage.getItem("passord"));
if (xmlHttpReq.status != 200){
window.location.href = "/login.html";
}
document.getElementById('password').value = localStorage.getItem("passord");
</script>
</body>
</html>

301
table.php
View File

@ -1,301 +0,0 @@
<?php
date_default_timezone_set('UTC');
$GLOBALS['start_time'] = DateTime::createFromFormat(DateTime::ISO8601, "2024-11-02T08:53:00+01");
$GLOBALS['number_of_controls'] = 3;
// Caching
header("Last-Modified: " . date("F d Y H:i:s.", filemtime("passering.csv")));
$etag = '"' . md5_file("passering.csv"). '"';
header(header: 'ETag: ' . $etag );
if(isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
// If HTTP_IF_NONE_MATCH is same as the generated ETag => content is the same as browser cache
// So send a 304 Not Modified response header and exit
if($_SERVER['HTTP_IF_NONE_MATCH'] == $etag) {
http_response_code(304);
exit();
}
}
class Runner
{
public int $id;
public string $name;
public string $club;
public string $course;
public array $splits;
function __construct($id, $name, $club, $course)
{
if ($id == null) {
$id = 0;
$name = "";
}
$this->id = $id;
$this->name = $name;
$this->club = $club;
$this->course = $course;
for ($i = 0; $i < $GLOBALS['number_of_controls']; $i++) {
$this->splits[$i] = false;
}
}
function set_split($control, $timestamp)
{
$this->splits[$control] = $timestamp;
}
function get_control()
{ for ($i = 0; $i < count($this->splits); $i++) {
if (!is_object($this->splits[$i])) {
return $i-1;
}
}
return count($this->splits)-1;
}
}
//find runner by id in list of Runner objects
function get_runner($runnner_list, int $id)
{
for ($i = 0; $i < count($runnner_list); $i++) {
if ($runnner_list[$i]->id == $id) {
return $runnner_list[$i];
}
}
return false;
}
function cmp(Runner $a, Runner $b) {
$a_control = $a->get_control();
$b_control = $b->get_control();
if ($a_control > $b_control){
return -1;
}
if ($a_control < $b_control){
return 1;
}
if ($a_control == -1) {
return 1;
}
if ($b_control == -1) {
return -1;
}
if ($a->splits[$a_control]->getTimestamp() < $b->splits[$b_control]->getTimestamp()){
return -1;
}
if ($a->splits[$a_control]->getTimestamp() > $b->splits[$b_control]->getTimestamp()){
return 1;
}
return 0;
}
function cmp_course(Runner $a, Runner $b) {
return strcmp($a->course, $b->course);
}
function filter_runners(Runner $runner, $id) {
if ($runner->id == $id) {
return True;
}
else {
return False;
}
}
function time_diff(DateTime $date_1, DateTime $date_2) {
return $date_2->getTimestamp() - $date_1->getTimestamp();
}
$runners = [];
$csv_runners = file_get_contents("db.csv");
$csv_runners = str_getcsv($csv_runners, "\n");
//print_r($csv_runners);
for ($i = 1; $i < count($csv_runners); $i++) {
$line = str_getcsv($csv_runners[$i]);
array_push($runners, new Runner($line[0], $line[1], $line[2], $line[3]));
}
$timings = file_get_contents("passering.csv");
$timings = str_getcsv($timings, "\n");
for ($i = 0; $i < count($timings); $i++) {
$line = str_getcsv($timings[$i]);
$time = DateTime::createFromFormat("Y-m-d\TH:i:sp", $line[2]);
if (!$time) {
//error
continue;
}
$runner = get_runner($runners, (int) $line[1]);
if (!$runner) {
//error
continue;
}
$runner->set_split($line[0]-1, $time);
}
function registration_table($runners) {
$matpost = $query["control"];
$runners_filtered = [];
if ($query["filter"]) {
for ($i = 0; $i < count($runners); $i++) {
if (filter_runners($runners[$i], $query["filter"])) {
array_push($runners_filtered, $runners[$i]);
}
}
$runners = $runners_filtered;
}
echo(" <thead><tr>
<th>#</th>
<th>Navn</th>
<th>Tid</th>
<th></th>
</tr></thead>
<tbody>");
for ($i = 0; $i < count($runners); $i++) {
$runner = $runners[$i];
// Klokkeslett for denne posten
if ($runner->splits[$matpost-1] != false) {
$tid_passering = $GLOBALS['start_time']->diff($runner->splits[$matpost-1])->format('%H:%I:%S');
}
else {
$tid_passering = "";
}
if ($runner->get_control() == $matpost-1) {
// Løperen har vært på denne matposten og vi farger raden grønn
$button = "<button onclick=\"register_runner($runner->id)\">✓</button>";
$cssclass = "class=\"bg-success\"";
}
elseif ($runner->get_control() > $matpost-1) {
// Løperen har vært på denne matposten og vi farger raden grønn
$button = "<button onclick=\"register_runner($runner->id)\">✓</button>";
$cssclass = "class=\"bg-active\"";
}
else {
$button = "<button onclick=\"register_runner($runner->id)\">✓</button>";
$cssclass = "";
}
echo ("<tr $cssclass><td>$runner->id</td><td>$runner->name</td><td>$tid_passering</td><td>$button</td></tr>\n");
}
echo("</tbody>");
}
function participants_table($runners) {
usort($runners, "cmp_course");
$kadaverløpere = 0;
$minikadaverløpere = 0;
for ($i = 0; $i < count($runners); $i++) {
if ($runners[$i]->course == "Kadaverløpet") {
$kadaverløpere++;
}
elseif ($runners[$i]->course == "Minikadaver'n") {
$minikadaverløpere++;
}
}
echo("<div class=\"flex space-evenly\">
<div class=\"flash accent\">$kadaverløpere påmeldt Kadaverløpet</div><div class=\"flash accent\">$minikadaverløpere påmeldte i Minikadaver'n</div>
</div>");
echo("<table><thead>
<tr>
<th>S.nr</th>
<th>Navn</th>
<th>Klubb/Forening</th>
<th>Variant</th>
</tr></thead>
<tbody>");
for ($i = 0; $i < count($runners); $i++) {
$runner = $runners[$i];
echo ("<tr><td>$runner->id</td><td>$runner->name</td><td>$runner->club</td><td>$runner->course</td></tr>\n");
}
echo("<table><tbody>");
}
function liveresult_table($runners) {
usort($runners, "cmp");
usort($runners, "cmp_course");
$kadaver_table = "<table><thead>
<tr>
<th>#</th>
<th>Navn</th>
<th>1. matpost</th>
<th>2. matpost</th>
<th>Mål</th>
<th>Sprekkindeks</th>
</tr></thead>
<tbody>";
$minikadaver_table = "<table><thead>
<tr>
<th>#</th>
<th>Navn</th>
<th>Mål</th>
</tr></thead>
<tbody>";
$kadaver_num = 0;
$mini_num = 0;
for ($i = 0; $i < count($runners); $i++) {
$runner = $runners[$i];
$tid_maal = "";
if ($runner->splits[2] != false) {
$tid_maal = $GLOBALS['start_time']->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 = "";
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>$sprekk</tr>\n";
}
elseif ($runner->course == "Minikadaver'n") {
$minikadaver_table .= "<tr><td>". "" .".</td><td>$runner->name</td><td>$tid_maal</td></tr>\n";
}
}
$kadaver_table .= "</tbody></table>";
$minikadaver_table .= "</tbody></table>";
echo($kadaver_table);
}
if (!isset($query)){
parse_str($_SERVER['QUERY_STRING'], $query);
if ($query["type"] == "registrering"){
registration_table($runners);
}
elseif ($query["type"] == "paameldte") {
participants_table($runners);
}
elseif ($query["type"] == "liveresultater") {
liveresult_table($runners);
}
}