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

Compare commits

base: Trygve:9a0dd90bd622a9ce0665c180688969afc9c2c319
Branches Tags
Trygve:master Trygve:sql
...
compare: Trygve:sql
Branches Tags
Trygve:master Trygve:sql

7 Commits
9a0dd90bd6 ... sql

Author SHA1 Message Date
Trygve
5c037ee8c5 sql test 2025-10-24 18:11:07 +02:00
Trygve
8d3b914433 caching 2024-11-10 21:35:49 +01:00
Trygve
744f4db361 la til sprekkindeks og caching 2024-11-05 18:02:15 +01:00
Trygve
27a924584e nødfikser 2024-11-05 12:57:13 +01:00
Trygve
2284704031 småfikser 2024-11-05 12:53:41 +01:00
Trygve
956da69043 Fiksa bugs 2024-11-05 12:51:55 +01:00
Trygve
a18c29cbe6 Server side søk 2024-11-01 13:32:18 +01:00
7 changed files with 205 additions and 76 deletions
Expand all files Collapse all files

4
import_csv.sql Normal file
View File

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

18
index.php
View File

@@ -27,7 +27,8 @@
</div> </div>
<h2>Vi tar forbehold om feil. Dette er ikke offisielle resultater</h2> <h2>Vi tar forbehold om feil. Dette er ikke offisielle resultater</h2>
<?php <?php
include("table.php") include("table.php");
liveresult_table($runners);
?> ?>
<footer> <footer>
<h3>Laget av Trygve. <a href="https://git.willy.club/Trygve/elektronisk-kadaver-tidtakingssystem">Kildekode</a></h3> <h3>Laget av Trygve. <a href="https://git.willy.club/Trygve/elektronisk-kadaver-tidtakingssystem">Kildekode</a></h3>
@@ -36,12 +37,15 @@ include("table.php")
<script> <script>
function update() { function update() {
const table = document.querySelector("table"); const table = document.querySelector("table");
const myRequest = new Request(`table.php`); const request = new XMLHttpRequest();
fetch(myRequest) request.onreadystatechange = function() {
.then((response) => response.text()) if (this.readyState == 4 && this.status == 200) {
.then((text) => { table.innerHTML = this.responseText;
table.innerHTML = text; localStorage.setItem("ETag", this.getResponseHeader("ETag"));
}); }};
request.open("GET", "table.php?type=liveresultater");
request.setRequestHeader("If-None-Match", localStorage.getItem("ETag"));
request.send();
} }
setInterval(update, 5*1000) setInterval(update, 5*1000)
</script> </script>

91
oppdater_db.php Normal file
View File

@@ -0,0 +1,91 @@
<?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);
}

8
paameldte.php
View File

@@ -2,7 +2,7 @@
<html lang="no"> <html lang="no">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<title>Påmeldte kadaverløpet</title> <title>Påmeldte Kadaverløpet</title>
<meta name="viewport" content="width=device-width,initial-scale=1" /> <meta name="viewport" content="width=device-width,initial-scale=1" />
<meta name="description" content="Elektronisk Kadaver Tidtakningssystem" /> <meta name="description" content="Elektronisk Kadaver Tidtakningssystem" />
<link rel="stylesheet" href="matcha.css"> <link rel="stylesheet" href="matcha.css">
@@ -17,11 +17,11 @@
<body> <body>
<div class="flex align-center"> <div class="flex align-center">
<figure><img src="img/kadaver.png" alt="" width="100px" class="invert"></figure> <figure><img src="img/kadaver.png" alt="" width="100px" class="invert"></figure>
<h1>Påmeldte kadaverløpet 2024</h1> <h1>Påmeldte Kadaverløpet 2024</h1>
</div> </div>
<h2>Oppdatert 13.10.24</h2> <h2>Oppdatert 1.11.24</h2>
<?php <?php
$query = ["paameldte"]; $query = ["type"=>"paameldte"];
include("table.php"); include("table.php");
?> ?>
<footer> <footer>

42
registrering.php
View File

@@ -47,7 +47,7 @@
</fieldset> </fieldset>
<button onmousedown="update()">Oppdater tabell</button> <button onmousedown="update()">Oppdater tabell</button>
<input id="search" type="number" class="form-control" onkeyup="filterTable()" placeholder="Søk"> <input id="search" type="number" class="form-control" onkeyup="update()" placeholder="Søk etter startnummer">
<br> <br>
</div> </div>
<table id="runners"></table> <table id="runners"></table>
@@ -67,7 +67,7 @@ function get_control() {
function register_runner(id) { function register_runner(id) {
control = get_control(); control = get_control();
if (control == 0) { if (control == 0) {
console.error(error); console.error("Ingen post valgt");
alert("Velg en post!"); alert("Velg en post!");
return 0; return 0;
} }
@@ -84,48 +84,20 @@ function register_runner(id) {
.then(response => { .then(response => {
if (response.status == 401) { if (response.status == 401) {
alert("Feil passord!") alert("Feil passord!")
} }})
}) .then((response) => update());
document.getElementById("search").focus();
update()
document.getElementById("search").focus()
}; };
function filterTable() {
var input, filter, table, tr, td, i, txtValue;
input = document.getElementById("search");
filter = input.value;
table = document.getElementById("runners").getElementsByTagName("tbody")[0];
if (!table) {
setTimeout(filterTable, 100);
}
tr = table.getElementsByTagName("tr");
if (filter == "") {
for (i = 0; i < tr.length; i++) {
tr[i].style.display = "";
}
}
else {
for (i = 0; i < tr.length; i++) {
td = tr[i].getElementsByTagName("td");
txtValue = td[0].textContent;
if (txtValue == filter) {
tr[i].style.display = "";
} else {
tr[i].style.display = "none";
}
}
}
}
function update() { function update() {
const table = document.getElementById("runners"); const table = document.getElementById("runners");
control = get_control(); control = get_control();
let request = new Request(`table.php?registrering,`+control); filter = document.getElementById("search").value;
let request = new Request(`table.php?type=registrering&control=`+control+`&filter=`+filter);
fetch(request) fetch(request)
.then((response) => response.text()) .then((response) => response.text())
.then((text) => {table.innerHTML = text;}) .then((text) => {table.innerHTML = text;})
filterTable()
} }
</script> </script>
</body> </body>

114
table.php
View File

@@ -1,9 +1,22 @@
<?php <?php
date_default_timezone_set('UTC'); date_default_timezone_set('UTC');
$GLOBALS['start_time'] = DateTime::createFromFormat(DateTime::ISO8601, "2024-10-08T08:07:32+01"); $GLOBALS['start_time'] = DateTime::createFromFormat(DateTime::ISO8601, "2024-11-02T08:53:00+01");
$GLOBALS['number_of_controls'] = 3; $GLOBALS['number_of_controls'] = 3;
//declare(strict_types=1); // 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 class Runner
{ {
public int $id; public int $id;
@@ -14,8 +27,6 @@ class Runner
function __construct($id, $name, $club, $course) function __construct($id, $name, $club, $course)
{ {
//echo($id);
//echo($name);
if ($id == null) { if ($id == null) {
$id = 0; $id = 0;
$name = ""; $name = "";
@@ -35,14 +46,13 @@ class Runner
} }
function get_control() function get_control()
{ { for ($i = 0; $i < count($this->splits); $i++) {
// Returns wich control the runner last passed
for ($i = 0; $i < count($this->splits); $i++) {
if (!is_object($this->splits[$i])) { if (!is_object($this->splits[$i])) {
return $i-1; return $i-1;
} }
} }
return count($this->splits)-1; return count($this->splits)-1;
} }
} }
@@ -84,6 +94,18 @@ function cmp_course(Runner $a, Runner $b) {
return strcmp($a->course, $b->course); 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 = []; $runners = [];
$csv_runners = file_get_contents("db.csv"); $csv_runners = file_get_contents("db.csv");
@@ -115,13 +137,20 @@ for ($i = 0; $i < count($timings); $i++) {
$runner->set_split($line[0]-1, $time); $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;
}
if (!isset($query)){
$query = explode(",",$_SERVER['QUERY_STRING']);
}
if ($query[0] == "registrering"){
$matpost = $query[1];
echo(" <thead><tr> echo(" <thead><tr>
<th>#</th> <th>#</th>
<th>Navn</th> <th>Navn</th>
@@ -158,7 +187,8 @@ if ($query[0] == "registrering"){
} }
echo("</tbody>"); echo("</tbody>");
} }
elseif ($query[0] == "paameldte") {
function participants_table($runners) {
usort($runners, "cmp_course"); usort($runners, "cmp_course");
$kadaverløpere = 0; $kadaverløpere = 0;
@@ -190,16 +220,17 @@ elseif ($query[0] == "paameldte") {
} }
echo("<table><tbody>"); echo("<table><tbody>");
} }
else { function liveresult_table($runners) {
usort($runners, "cmp"); usort($runners, "cmp");
usort($runners, "cmp_course"); usort($runners, "cmp_course");
$kadaver_table = "<table><thead> $kadaver_table = "<table><thead>
<tr> <tr>
<th>#</th> <th>#</th>
<th>Navn</th> <th>Navn</th>
<th>1. matpost</th> <th>1. matpost</th>
<th>2. matpost</th> <th>2. matpost</th>
<th>Mål</th> <th>Mål</th>
<th>Sprekkindeks</th>
</tr></thead> </tr></thead>
<tbody>"; <tbody>";
$minikadaver_table = "<table><thead> $minikadaver_table = "<table><thead>
@@ -209,10 +240,16 @@ else {
<th>Mål</th> <th>Mål</th>
</tr></thead> </tr></thead>
<tbody>"; <tbody>";
$kadaver_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 = "";
if ($runner->course == "Kadaverløpet") { 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 = ""; $tid_1_mat = "";
if ($runner->splits[0] != false) { if ($runner->splits[0] != false) {
// https://www.php.net/manual/en/class.dateinterval.php // https://www.php.net/manual/en/class.dateinterval.php
@@ -221,23 +258,44 @@ else {
$tid_2_mat = ""; $tid_2_mat = "";
if ($runner->splits[1] != false) { if ($runner->splits[1] != false) {
$tid_2_mat = $GLOBALS['start_time']->diff($runner->splits[1])->format('%H:%I:%S'); $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>"; $matposter = "<td>$tid_1_mat</td><td>$tid_2_mat</td>";
} }
$tid_maal = ""; else {
if ($runner->splits[2] != false) { $mini_num++;
$tid_maal = $GLOBALS['start_time']->diff($runner->splits[2])->format('%H:%I:%S'); }
}
if ($runner->course == "Kadaverløpet") { if ($runner->course == "Kadaverløpet") {
$kadaver_table .= "<tr><td>". $i+1 .".</td><td>$runner->name</td>$matposter<td>$tid_maal</td></tr>\n"; $kadaver_table .= "<tr><td>". $kadaver_num .".</td><td>$runner->name</td>$matposter<td>$tid_maal</td>$sprekk</tr>\n";
} }
elseif ($runner->course == "Minikadaver'n") { elseif ($runner->course == "Minikadaver'n") {
$minikadaver_table .= "<tr><td>". $i+1 .".</td><td>$runner->name</td><td>$tid_maal</td></tr>\n"; $minikadaver_table .= "<tr><td>". "" .".</td><td>$runner->name</td><td>$tid_maal</td></tr>\n";
} }
} }
$kadaver_table .= "</tbody></table>"; $kadaver_table .= "</tbody></table>";
$minikadaver_table .= "</tbody></table>"; $minikadaver_table .= "</tbody></table>";
echo($kadaver_table); echo($kadaver_table);
echo("<h2>Minikadaver'n</h2>");
echo($minikadaver_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);
}
} }