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

Splitta kadavertabellen og minikadavertabellen

Browse Source
This commit is contained in:
Trygve 2025-10-29 01:01:58 +01:00
parent fdddbbb0ef
commit b30996ceea
4 changed files with 113 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin.php
View File

@ -37,6 +37,11 @@
</menu>
</nav>
<button class="danger" onclick="log_out()">Logg ut</button>
<div class='flex' 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_info" hx-swap="show:none">
<label>
@ -54,9 +59,13 @@
<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);
//liveresult_table($runners);
?>
<script>
function update() {

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>");
}

57
api/table.php
View File

@ -21,7 +21,7 @@ if(isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
}
*/
include("$documentRoot/import_runners.php");
require_once("$documentRoot/import_runners.php");
function registration_table($runners) {
parse_str($_SERVER['QUERY_STRING'], $query);
@ -127,6 +127,55 @@ function liveresult_table($runners) {
<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") {
$kadaver_table .= "<tr><td>". $kadaver_num .".</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>
@ -183,9 +232,8 @@ function liveresult_table($runners) {
$minikadaver_table .= "<tr><td>". "" .".</td><td>$runner->name</td><td>$tid_maal</td></tr>\n";
}
}
$kadaver_table .= "</tbody></table>\n";
$minikadaver_table .= "</tbody></table>";
echo($kadaver_table . $minikadaver_table);
echo($minikadaver_table);
}
@ -202,4 +250,7 @@ if (!isset($query)){
elseif ($query["type"] == "liveresultater") {
liveresult_table($runners);
}
elseif ($query["type"] == "minikadavern") {
minikadadvern_table($runners);
}
}

16
import_runners.php
View File

@ -24,9 +24,7 @@ class Runner
$this->email = $email;
$this->phone = $phone;
$this->is_student = $is_student;
for ($i = 0; $i < $GLOBALS['number_of_controls']; $i++) {
$this->splits[$i] = false;
}
$this->splits = [false, false, false];
}
function set_split($control, $timestamp)
@ -34,14 +32,14 @@ class Runner
$this->splits[$control] = $timestamp;
}
function get_control()
{ for ($i = 0; $i < count($this->splits); $i++) {
if (!is_object($this->splits[$i])) {
return $i-1;
function get_control(){
$control = -1;
for ($i = 0; $i < count($this->splits); $i++) {
if ($this->splits[$i] != false) {
$control++;
}
}
return count($this->splits)-1;
return $control;
}
}