Grisu/PunkteSystem-KSP
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Adding close button to the edit and add pages' (#2) from dev into main

Browse Source 
Reviewed-on: #2
This commit was merged in pull request #2.
This commit is contained in:
Grisu
2022-09-18 17:11:41 +00:00
parent 506982f1b1 55e51a8214
commit ca6549280f
12 changed files with 148 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/public/add_entry.php
View File

@@ -5,30 +5,32 @@
$user_data = check_login($con); $user_data = check_login($con);
if($_SERVER['REQUEST_METHOD'] == "POST") { if($_SERVER['REQUEST_METHOD'] == "POST") {
$points = sanitize_input($_POST['points']); if(isset($_POST['save'])){
$minutes = sanitize_input($_POST['minutes']); $points = sanitize_input($_POST['points']);
$seconds = sanitize_input($_POST['seconds']); $minutes = sanitize_input($_POST['minutes']);
$miliseconds = sanitize_input($_POST['miliseconds']); $seconds = sanitize_input($_POST['seconds']);
$s_id = sanitize_input($_GET['station']); $miliseconds = sanitize_input($_POST['miliseconds']);
$m_id = sanitize_input($_POST['team']); $s_id = sanitize_input($_GET['station']);
$m_id = sanitize_input($_POST['team']);
if($minutes == 0 && $seconds == 0 && $miliseconds == 0){ if($minutes == 0 && $seconds == 0 && $miliseconds == 0){
$time = null; $time = null;
} else { } else {
if ($minutes < 10) { if ($minutes < 10) {
$minutes = "0" . $minutes; $minutes = "0" . $minutes;
} }
if ($seconds < 10) { if ($seconds < 10) {
$seconds = "0" . $seconds; $seconds = "0" . $seconds;
} }
if ($miliseconds < 10) { if ($miliseconds < 10) {
$miliseconds = "0" . $miliseconds; $miliseconds = "0" . $miliseconds;
}
$time = "00:" . $minutes . ":" . $seconds . "." . $miliseconds;
} }
$time = "00:" . $minutes . ":" . $seconds . "." . $miliseconds; write_points($con, $s_id, $m_id, $points, $time);
} }
write_points($con, $s_id, $m_id, $points, $time);
header("Location: statistik.php"); header("Location: statistik.php");
die; die;
} }
@@ -71,7 +73,8 @@
</div> </div>
</div> </div>
<div> <div>
<input id="button" type="submit" value="Eintragen" class="btn-confirm"/> <input id="button" type="submit" value="Eintragen" class="btn-confirm" name="save"/>
<input id="close" type="submit" value="Schließen" class="btn-confirm" name="close">
</div> </div>
</form> </form>
</div> </div>

15
app/public/add_station.php
View File

@@ -5,9 +5,11 @@
$user_data = check_login($con); $user_data = check_login($con);
if($_SERVER['REQUEST_METHOD'] == "POST") { if($_SERVER['REQUEST_METHOD'] == "POST") {
$station_name = sanitize_input($_POST['station_name']); if(isset($_POST['save'])){
$station_pos = sanitize_input($_POST['station_pos']); $station_name = sanitize_input($_POST['station_name']);
write_station($con, $station_name, $station_pos); $station_pos = sanitize_input($_POST['station_pos']);
write_station($con, $station_name, $station_pos);
}
header("Location: stationen.php"); header("Location: stationen.php");
die; die;
} }
@@ -23,16 +25,17 @@
<div class="form_div"> <div class="form_div">
<form method="post"> <form method="post">
<div class="txt_field"> <div class="txt_field">
<input id="station_name" type="text" name="station_name" required/> <input class="input_field" id="station_name" type="text" name="station_name" required/>
<span></span> <span></span>
<label for="station_name">Name</label> <label for="station_name">Name</label>
</div> </div>
<div class="txt_field"> <div class="txt_field">
<input id="station_pos" type="text" name="station_pos" required/> <input class="input_field" id="station_pos" type="text" name="station_pos" required/>
<span></span> <span></span>
<label for="station_pos">Standort</label> <label for="station_pos">Standort</label>
</div> </div>
<input id="button" type="submit" value="Hinzufügen" class="btn-confirm"/> <input id="button" type="submit" value="Hinzufügen" class="btn-confirm" name="save"/>
<a href="stationen.php" class="btn-close">Schließen</a>
</form> </form>
</div> </div>
</div> </div>

11
app/public/add_team.php
View File

@@ -5,9 +5,11 @@
$user_data = check_login($con); $user_data = check_login($con);
if($_SERVER['REQUEST_METHOD'] == "POST") { if($_SERVER['REQUEST_METHOD'] == "POST") {
$team_name = sanitize_input($_POST['team_name']); if(isset($_POST['save'])) {
$fire_department = sanitize_input($_POST['fire_department']); $team_name = sanitize_input($_POST['team_name']);
write_team($con, $team_name, $fire_department); $fire_department = sanitize_input($_POST['fire_department']);
write_team($con, $team_name, $fire_department);
}
header("Location: mannschaft.php"); header("Location: mannschaft.php");
die; die;
} }
@@ -37,7 +39,8 @@
<span></span> <span></span>
<label for="fire_department">Feuerwehr</label> <label for="fire_department">Feuerwehr</label>
</div> </div>
<input id="button" type="submit" value="Hinzufügen" class="btn-confirm"/> <input id="button" type="submit" value="Hinzufügen" class="btn-confirm" name="save"/>
<a href="mannschaft.php">Schließen</a>
</form> </form>
</div> </div>
</div> </div>

1
app/public/add_user.php
View File

@@ -64,6 +64,7 @@
</select> </select>
</div> </div>
<input type="submit" value="Hinzufügen" class="btn-confirm"/> <input type="submit" value="Hinzufügen" class="btn-confirm"/>
<a href="manage_user.php">Schließen</a>
</form> </form>
</div> </div>
</div> </div>

4
app/public/css/edit.css
View File

@@ -130,6 +130,10 @@ form .txt_field{
width: 100%; width: 100%;
} }
.btn-close a {
text-decoration: none;
}
.form_div { .form_div {
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;

41
app/public/edit_station.php
View File

@@ -11,25 +11,27 @@
} }
if($_SERVER['REQUEST_METHOD'] == "POST") { if($_SERVER['REQUEST_METHOD'] == "POST") {
$station_id = sanitize_input($_POST['station_id']); if(!isset($_POST['close'])){
$station_name = sanitize_input($_POST['station_name']); $station_id = sanitize_input($_POST['station_id']);
$station_pos = sanitize_input($_POST['station_pos']); $station_name = sanitize_input($_POST['station_name']);
$station_gewertet = sanitize_input($_POST['gewertet']); $station_pos = sanitize_input($_POST['station_pos']);
$station = get_station_all($con, $station_id)->fetch(); $station_gewertet = sanitize_input($_POST['gewertet']);
$s_id = intval($station['s_id']); $station = get_station_all($con, $station_id)->fetch();
$name = strval($station['name']); $s_id = intval($station['s_id']);
$standort = strval($station['standort']); $name = strval($station['name']);
$gewertet = intval($station['gewertet']); $standort = strval($station['standort']);
if($name != $station_name) { $gewertet = intval($station['gewertet']);
update_station_name($con, $s_id, $station_name); if($name != $station_name) {
} update_station_name($con, $s_id, $station_name);
}
if($standort != $station_pos) { if($standort != $station_pos) {
update_station_pos($con, $s_id, $station_pos); update_station_pos($con, $s_id, $station_pos);
} }
if($gewertet != $station_gewertet) { if($gewertet != $station_gewertet) {
update_station_gewertet($con, $s_id, $station_gewertet); update_station_gewertet($con, $s_id, $station_gewertet);
}
} }
header("Location: stationen.php"); header("Location: stationen.php");
die; die;
@@ -61,7 +63,10 @@
</select> </select>
</div> </div>
<input type="hidden" name="station_id" <?php echo "value=\"" . $row ['s_id'] . "\""?>/> <input type="hidden" name="station_id" <?php echo "value=\"" . $row ['s_id'] . "\""?>/>
<input type="submit" value="Speichern" class="btn-confirm"/> <div>
<input type="submit" value="Speichern" class="btn-confirm"/>
<input type="submit" value="Schließen" class="btn-confirm" name="close">
</div>
</form> </form>
</div> </div>
</div> </div>

52
app/public/edit_statistics.php
View File

@@ -10,32 +10,33 @@
} }
if($_SERVER['REQUEST_METHOD'] == 'POST') { if($_SERVER['REQUEST_METHOD'] == 'POST') {
$m_id = intval(sanitize_input($_POST['m_id'])); if(isset($_POST['button'])) {
$s_id = intval(sanitize_input($_POST['s_id'])); $m_id = intval(sanitize_input($_POST['m_id']));
$points = intval(sanitize_input($_POST['points'])); $s_id = intval(sanitize_input($_POST['s_id']));
$minutes = intval(sanitize_input($_POST['minutes'])); $points = intval(sanitize_input($_POST['points']));
$seconds = intval(sanitize_input($_POST['seconds'])); $minutes = intval(sanitize_input($_POST['minutes']));
$millis = intval(sanitize_input($_POST['millis'])); $seconds = intval(sanitize_input($_POST['seconds']));
if (get_points($con, $m_id, $s_id)->fetch()['punkte'] != $points) { $millis = intval(sanitize_input($_POST['millis']));
change_points($con, $m_id, $s_id, $points); if (get_points($con, $m_id, $s_id)->fetch()['punkte'] != $points) {
change_points($con, $m_id, $s_id, $points);
}
if (get_minutes($con, $m_id, $s_id)->fetch()['minutes'] != $minutes || get_seconds($con, $m_id, $s_id)->fetch()['seconds'] != $seconds || get_millis($con, $m_id, $s_id)->fetch()['millis'] != $millis) {
if ($millis < 10) {
$millis = "0" . $millis;
}
if ($minutes < 10) {
$minutes = "0" . $minutes;
}
if ($seconds < 10) {
$seconds = "0" . $seconds;
}
$time = "00:" . $minutes . ":" . $seconds . "." . $millis;
change_time($con, $m_id, $s_id, $time);
}
} }
if (get_minutes($con, $m_id, $s_id)->fetch()['minutes'] != $minutes || get_seconds($con, $m_id, $s_id)->fetch()['seconds'] != $seconds || get_millis($con, $m_id, $s_id)->fetch()['millis'] != $millis) {
if ($millis < 10) {
$millis = "0" . $millis;
}
if ($minutes < 10) {
$minutes = "0" . $minutes;
}
if ($seconds < 10) {
$seconds = "0" . $seconds;
}
$time = "00:" . $minutes . ":" . $seconds . "." . $millis;
change_time($con, $m_id, $s_id, $time);
}
header("Location: statistik.php"); header("Location: statistik.php");
die; die;
} }
@@ -74,6 +75,7 @@
<input type="hidden" name="m_id" value=<?php echo $row['m_id'] ?>/> <input type="hidden" name="m_id" value=<?php echo $row['m_id'] ?>/>
<input type="hidden" name="s_id" value=<?php echo $row['s_id'] ?>/> <input type="hidden" name="s_id" value=<?php echo $row['s_id'] ?>/>
<input name="button" type="submit" value="Speichern" class="btn-confirm"/> <input name="button" type="submit" value="Speichern" class="btn-confirm"/>
<input type="submit" name="close" value="Schließen" class="btn-confirm"/>
</form> </form>
</div> </div>
</div> </div>

26
app/public/edit_team.php
View File

@@ -10,19 +10,20 @@
} }
if($_SERVER['REQUEST_METHOD'] == "POST") { if($_SERVER['REQUEST_METHOD'] == "POST") {
$m_id = sanitize_input($_POST['m_id']); if(isset($_POST['save'])) {
$team_name = sanitize_input($_POST['team_name']); $m_id = sanitize_input($_POST['m_id']);
$fire_department = sanitize_input($_POST['fire_department']); $team_name = sanitize_input($_POST['team_name']);
$row = get_team($con, $m_id)->fetch(); $fire_department = sanitize_input($_POST['fire_department']);
$row = get_team($con, $m_id)->fetch();
if($_POST['team_name'] != $row['name']) { if($_POST['team_name'] != $row['name']) {
update_team_name($con, $m_id, $team_name); update_team_name($con, $m_id, $team_name);
}
if($_POST['fire_department'] != $row['feuerwehr']) {
update_team_fire_department($con, $m_id, $fire_department);
}
} }
if($_POST['fire_department'] != $row['feuerwehr']) {
update_team_fire_department($con, $m_id, $fire_department);
}
header("Location: mannschaft.php"); header("Location: mannschaft.php");
die; die;
} }
@@ -52,7 +53,8 @@
<label for="fire_department">Feuerwehr</label> <label for="fire_department">Feuerwehr</label>
</div> </div>
<input type="hidden" name="m_id" <?php echo "value=\"" . $row['m_id'] . "\""?> /> <input type="hidden" name="m_id" <?php echo "value=\"" . $row['m_id'] . "\""?> />
<input type="submit" value="Speichern" class="btn-confirm"/> <input type="submit" value="Speichern" class="btn-confirm" name="save"/>
<input type="submit" nam="close" value="Schließen" class="btn-confirm"/>
</form> </form>
</div> </div>
</div> </div>

56
app/public/edit_user.php
View File

@@ -11,36 +11,37 @@
} }
if($_SERVER['REQUEST_METHOD'] == "POST") { if($_SERVER['REQUEST_METHOD'] == "POST") {
$id = sanitize_input($_POST['id']); if(isset($_POST['save'])){
$user = get_user($con, $id)->fetch(); $id = sanitize_input($_POST['id']);
$user_group = sanitize_input($_POST['user_group']); $user = get_user($con, $id)->fetch();
$user_name = sanitize_input($_POST['user_name']); $user_group = sanitize_input($_POST['user_group']);
$bind_station = sanitize_input($_POST['bind_station']); $user_name = sanitize_input($_POST['user_name']);
$password = sanitize_input($_POST['password']); $bind_station = sanitize_input($_POST['bind_station']);
$password = sanitize_input($_POST['password']);
if($user['user_name'] != $user_name) { if($user['user_name'] != $user_name) {
change_user_name($con, $id, $user_name); change_user_name($con, $id, $user_name);
} }
if($user['user_group'] != $user_group) { if($user['user_group'] != $user_group) {
if($user_group == "station") { if($user_group == "station") {
change_user_group($con, $id, $user_group, $bind_station); change_user_group($con, $id, $user_group, $bind_station);
} else { } else {
change_user_group($con, $id, $user_group, NULL); change_user_group($con, $id, $user_group, NULL);
}
}
if($user['s_id'] != $bind_station) {
if ($user_group == "station") {
change_s_id($con, $id, $bind_station);
}
}
if(!empty($password)) {
$phash = generate_password_hash($password, $user['salt']);
change_password($con, $id, $phash);
} }
} }
if($user['s_id'] != $bind_station) {
if ($user_group == "station") {
change_s_id($con, $id, $bind_station);
}
}
if(!empty($password)) {
$phash = generate_password_hash($password, $user['salt']);
change_password($con, $id, $phash);
}
header("Location: manage_user.php"); header("Location: manage_user.php");
die; die;
} }
@@ -84,7 +85,8 @@
</select> </select>
</div> </div>
<input type="hidden" value=<?php echo "\"" . $row['id'] . "\""?> name="id"/> <input type="hidden" value=<?php echo "\"" . $row['id'] . "\""?> name="id"/>
<input type="submit" value="ändern" class="btn-confirm"/> <input type="submit" value="Speichern" class="btn-confirm" name="save"/>
<input type="submit" value="Schließen" class="btn-confirm" name="close"/>
</form> </form>
</div> </div>
</div> </div>

7
app/public/header_footer/header.php
View File

@@ -9,12 +9,13 @@
<link rel="stylesheet" href="css/edit.css"> <link rel="stylesheet" href="css/edit.css">
<script src="js/navbar.js" defer></script> <script src="js/navbar.js" defer></script>
<script src="js/edit_table.js"></script> <script src="js/edit_table.js"></script>
<script src="js/add_entries.js"></script>
</head> </head>
<body> <body>
<header> <header>
<nav class="navbar"> <nav class="navbar">
<div id="logo"> <div id="logo">
Punktesystem-KSP Punktesystem-Kreispokalwettbewerb
</div> </div>
<a href="#" class="toggle-button"> <a href="#" class="toggle-button">
<span class="bar"></span> <span class="bar"></span>
@@ -32,9 +33,9 @@
echo "<li><a href=\"stationen.php\">Stationen</a></li>\n"; echo "<li><a href=\"stationen.php\">Stationen</a></li>\n";
} }
if ($_SESSION['user_group'] == 'statistics') { if ($_SESSION['user_group'] == 'statistics') {
echo "<li><a href=\"statistik.php\">Ergebnisse</a></li>"; echo "<li><a href=\"statistik.php\">Ergebnis</a></li>";
} else { } else {
echo "<li><a href=\"statistik.php\">Ergebnisse eintragen</a></li>"; echo "<li><a href=\"statistik.php\">Ergebnis eintragen</a></li>";
} }
} }
?> ?>

4
app/public/index.php
View File

@@ -11,10 +11,10 @@
<body> <body>
<div class="center"> <div class="center">
<div class="headline"> <div class="headline">
<h1><span>Punktesystem Kreispokalwettbewerb Altdorf</span></h1> <h1><span>Punktesystem Kreispokalwettbewerb</span></h1>
</div> </div>
<div class="home"> <div class="home">
<h2>Gesamtergebniss</h2> <h2>Gesamtergebnis</h2>
</div> </div>
<div class="home-menu-table table-div"> <div class="home-menu-table table-div">
<table id="table"> <table id="table">

4
app/public/login.php
View File

@@ -41,11 +41,11 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="css/login.css"> <link rel="stylesheet" href="css/login.css">
<title>Punktesystem-KSP</title> <title>Punktesystem-KPW</title>
</head> </head>
<body> <body>
<div class="center"> <div class="center">
<h1>PUNKTESYSTEM-KSP</h1> <h1>PUNKTESYSTEM-KPW</h1>
<form method="post"> <form method="post">
<div class="txt_field"> <div class="txt_field">
<input id="user_name" type="text" name="user_name" required/> <input id="user_name" type="text" name="user_name" required/>