commit 932f60a2875a71b611d5154bedc124114d3f940a
parent 3874984bdc909c9931c151f7e7ba1d18d25466cd
Author: MoiBaguette <[email protected]>
Date: Sun, 16 Apr 2023 17:51:49 +0200
merge
Diffstat:
6 files changed, 230 insertions(+), 19 deletions(-)
diff --git a/addContract.php b/addContract.php
@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<html lang="nl">
+<head>
+ <title>Add contract</title>
+ <!-- Bootstrap CSS -->
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
+</head>
+<?php
+include "navbar.php";
+include "Connect.php";
+if(!in_array(1, $_SESSION['permissions'])){
+ header('Location: dashboard.php');
+ exit;
+}
+?>
+<body>
+<div class="container">
+ <h1>Add contract</h1>
+
+ <form action="addContract.php" method="post">
+ <div class="mb-3">
+ <label for="subscription">Choose subscription:</label>
+ <select name="subscription" id="subscription">
+ <option value="realtime">Realtime</option>
+ <option value="weekly">Weekly</option>
+ <option value="fortnightly">Fortnightly</option>
+ </select>
+ </div>
+ <div class="mb-3">
+ <label for="customer" class="form-label"><b>Customer ID:</b></label>
+ <input type="text" class="form-control" name="customer" id="customer" placeholder="Customer ID">
+ </div>
+ <div class="mb-3">
+ <label for="start-date" class="form-label"><b>Start Date:</b></label>
+ <input class="form-control me-2" type="text" name="start-date" placeholder="Start date (YYYY-MM-DD)" pattern="\d{4}-\d{2}-\d{2}">
+ </div>
+ <div class="mb-3">
+ <label for="start-date" class="form-label"><b>End Date:</b></label>
+ <input class="form-control me-2" type="text" name="end-date" placeholder="End date (YYYY-MM-DD)" pattern="\d{4}-\d{2}-\d{2}">
+ </div>
+ <label for="token" class="form-label"><b>*token*:</b></label>
+ <div class="form-group">
+ <label for="tariff">Tariff:</label>
+ <a>€</a><input type="number" class="form-control" name="tariff" id="tariff" placeholder="Tariff" style="display: inline-block; width: auto;">
+ </div>
+ <div class="mb-3">
+ <label for="addition" class="form-label"><b>Additional information:</b></label>
+ <input type="text" class="form-control" name="addition" id="addition" placeholder="Additional information" style="height: 200px;">
+ </div>
+ <button type="submit" class="btn btn-primary" name="submit">Voeg toe</button>
+ </form>
+</div>
+<?php
+$connect = new Connect;
+$conn = $connect->getConn();
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+ $errors = array(); // initialize an empty array to store errors
+
+ // Check if voornaam is set and not empty
+ if (isset($_POST['voornaam']) && !empty($_POST['voornaam'])) {
+ $fname = $_POST['voornaam'];
+ } else {
+ $errors[] = "Voornaam is required";
+ }
+
+ // Check if achternaam is set and not empty
+ if (isset($_POST['achternaam']) && !empty($_POST['achternaam'])) {
+ $lname = $_POST['achternaam'];
+ } else {
+ $errors[] = "Achternaam is required";
+ }
+
+ // Check if email is set and not empty
+ if (isset($_POST['email']) && !empty($_POST['email'])) {
+ $email = $_POST['email'];
+ } else {
+ $errors[] = "E-mail is required";
+ }
+
+ // Check if password is set and not empty
+ if (isset($_POST['password']) && !empty($_POST['password'])) {
+ $password = $_POST['password'];
+ } else {
+ $errors[] = "Wachtwoord is required";
+ }
+
+ // Check if permissions is set
+ if (isset($_POST['permissions'])) {
+ $permissions = $_POST['permissions'];
+ } else {
+ $errors[] = "Permissies zijn vereist";
+ }
+
+ // Check if there are any errors
+ if (count($errors) > 0) {
+ // Print out the errors
+ foreach ($errors as $error) {
+ echo $error . "<br>";
+ }
+ } else {
+ // Pass the password through a hashing function
+ $hash = password_hash($password, PASSWORD_DEFAULT);
+
+ // Making a sql statement to add user to the database, preparing it and excuting
+ $sql = "INSERT INTO medewerkers (email, voornaam, achternaam, wachtwoord) VALUES(?, ?, ?, ?)";
+ $stmt= $conn->prepare($sql);
+ $stmt->bind_param("ssss", $email, $fname, $lname, $hash);
+ $stmt->execute();
+
+ //Excecuting a sql statement for all the user permissions
+ foreach($permissions as $perm){
+ $sql = "INSERT INTO medewerkers_permissie (email, permissie_id) VALUES (?, ?);";
+ $stmt= $conn->prepare($sql);
+ $stmt->bind_param("si", $email, $perm);
+ $stmt->execute();
+ }
+ }
+}
+// closing the connection
+mysqli_close($conn);
+?>
+</body>
+</html>
diff --git a/back-up/alteruser.php b/back-up/alteruser.php
@@ -2,7 +2,7 @@
<html lang="nl">
<head>
- <title>User aanpassen</title>
+ <title>Edit user</title>
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
</head>
@@ -16,23 +16,23 @@ if (!in_array(1, $_SESSION['permissions'])) {
<body>
<div class="container">
- <h1>User aanpassen</h1>
+ <h1>Edit user</h1>
<form action="crud_user.php" method="post">
<div class="mb-3">
- <label for="voornaam" class="form-label"><b>Voornaam:</b></label>
- <input type="text" class="form-control" name="voornaam" id="voornaam" placeholder="Voornaam">
+ <label for="voornaam" class="form-label"><b>First Name:</b></label>
+ <input type="text" class="form-control" name="voornaam" id="voornaam" placeholder="First Name">
</div>
<div class="mb-3">
- <label for="achternaam" class="form-label"><b>Achternaam:</b></label>
- <input type="text" class="form-control" name="achternaam" id="achternaam" placeholder="Achternaam">
+ <label for="achternaam" class="form-label"><b>Last Name:</b></label>
+ <input type="text" class="form-control" name="achternaam" id="achternaam" placeholder="Last Name">
</div>
<div class="mb-3">
<label for="email" class="form-label"><b>Email:</b></label>
<input type="text" class="form-control" name="email" id="email" placeholder="Email">
</div>
<div class="mb-3">
- <label for="password" class="form-label"><b>Wachtwoord:</b></label>
+ <label for="password" class="form-label"><b>Password:</b></label>
<input type="password" class="form-control" name="password" id="password" placeholder="******">
</div>
<p>Please select the user permissions:</p>
@@ -50,7 +50,7 @@ if (!in_array(1, $_SESSION['permissions'])) {
value="3">
<label class="form-check-label" for="Wetenschappelijk medewerker">Wetenschappelijk medewerker</label>
</div>
- <button type="submit" class="btn btn-primary" name="submit">Voeg toe</button>
+ <button type="submit" class="btn btn-primary" name="submit">Submit</button>
</form>
</div>
<?php
diff --git a/back-up/crud_user.php b/back-up/crud_user.php
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="nl">
<head>
- <title>User toevoegen</title>
+ <title>Add user</title>
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
</head>
@@ -15,23 +15,23 @@
?>
<body>
<div class="container">
- <h1>User toevoegen</h1>
+ <h1>Add user</h1>
<form action="crud_user.php" method="post">
<div class="mb-3">
- <label for="voornaam" class="form-label"><b>Voornaam:</b></label>
- <input type="text" class="form-control" name="voornaam" id="voornaam" placeholder="Voornaam">
+ <label for="voornaam" class="form-label"><b>First Name:</b></label>
+ <input type="text" class="form-control" name="voornaam" id="voornaam" placeholder="First Name">
</div>
<div class="mb-3">
- <label for="achternaam" class="form-label"><b>Achternaam:</b></label>
- <input type="text" class="form-control" name="achternaam" id="achternaam" placeholder="Achternaam">
+ <label for="achternaam" class="form-label"><b>Last Name:</b></label>
+ <input type="text" class="form-control" name="achternaam" id="achternaam" placeholder="Last Name">
</div>
<div class="mb-3">
<label for="email" class="form-label"><b>Email:</b></label>
<input type="text" class="form-control" name="email" id="email" placeholder="Email">
</div>
<div class="mb-3">
- <label for="password" class="form-label"><b>Wachtwoord:</b></label>
+ <label for="password" class="form-label"><b>Password:</b></label>
<input type="password" class="form-control" name="password" id="password" placeholder="******">
</div>
<p>Please select the user permissions:</p>
@@ -47,7 +47,7 @@
<input type="checkbox" class="form-check-input" id="Wetenschappelijk medewerker" name="permissions[]" value="3">
<label class="form-check-label" for="Wetenschappelijk medewerker">Wetenschappelijk medewerker</label>
</div>
- <button type="submit" class="btn btn-primary" name="submit">Voeg toe</button>
+ <button type="submit" class="btn btn-primary" name="submit">Add</button>
</form>
</div>
<?php
diff --git a/index.php b/index.php
@@ -19,15 +19,17 @@ $router->get('/', function () {
include 'templates/homepage.php';
});
-$router->get('/uitloggen', function () {
- session_destroy();
- include 'templates/login.html';
+$router->get('/addcontract', function () {
+ include 'addContract.php';
});
+<<<<<<< HEAD
$router->get('/login_handler', function () {
include '../login_handler.php';
});
+=======
+>>>>>>> bbaf41e512d1e8a86e7e23e73b4b799c79368e15
$router->get('/login', function () {
include 'templates/login.html';
});
diff --git a/navbar.php b/navbar.php
@@ -72,12 +72,16 @@
</ul>
</li>
<?php } ?>
+ <li class="nav-item">
+ <a class="nav-link" href="/addcontract">Add Subscription</a>
+ </li>
</ul>
<form method="post" action="templates/homepage.php">
<button type="submit" id='logout' class="btn btn-primary">log out</button>
</form>
</div>
</nav>
+
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"></script>
diff --git a/searchdata.php b/searchdata.php
@@ -0,0 +1,80 @@
+<?php
+error_reporting(0);
+
+ include "navbar.php";
+ include "Connect.php";
+?>
+<html>
+ <head>
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
+ </head>
+<body>
+ <form class="d-flex" action="searchdata.php" method="get">
+ <input class="form-control me-2" type="text" name="date-begin" placeholder="Date begin (YYYY-MM-DD)" pattern="\d{4}-\d{2}-\d{2}">
+ <input class="form-control me-2" type="text" name="date-end" placeholder="Date end (YYYY-MM-DD)" pattern="\d{4}-\d{2}-\d{2}">
+ <input class="form-control me-2" type="text" name="station" placeholder="Search" aria-label="Search">
+ <button class="btn btn-outline-success" type="submit">Search</button>
+ </form>
+ <?php
+ $connect = new Connect;
+ $conn = $connect->getConn();
+
+ $sql = "SELECT station_name, date_time, validated, temperature FROM weather_data";
+ if (isset($_GET['date-begin']) && $_GET['date-begin']) {
+ $sql .= " WHERE date_time >= ?";
+ if (isset($_GET['date-end']) && $_GET['date-end']) {
+ $sql .= " AND date_time <= ?";
+ }
+ } elseif (isset($_GET['date-end']) && $_GET['date-end']) {
+ $sql .= " WHERE date_time <= ?";
+ }
+ if (isset($_GET['station']) && $_GET['station']) {
+ $sql .= " WHERE station_name = ?";
+ }
+
+ $dateEnd = ($_GET['date-end']);
+ $dateBegin = ($_GET['date-begin']);
+
+ $stmt = $conn->prepare($sql);
+ if (isset($_GET['date-begin']))
+ $stmt->bind_param('s', $dateBegin);
+ if (isset($_GET['date-end']))
+ $stmt->bind_param('s', $dateEnd);
+ if (isset($_GET['station'])) {
+ $stmt->bind_param('d', $_GET['station']);
+ }
+
+ $stmt->execute();
+
+ $result = $stmt->get_result();
+
+ // verification logic and $_SESSION start
+ if ($result->num_rows > 0) {
+ echo "<table class=\"table table-striped\">
+ <thead>
+ <tr>
+ <th>Station</th>
+ <th>Date</th>
+ <th>Validated</th>
+ <th>Temperature</th>
+ </tr>
+ </thead>
+ <tbody>";
+ while ($row = mysqli_fetch_assoc($result)) {
+ $link = "/searchdata.php?station=" . $row['station_name'];
+ echo "<tr>";
+ echo "<td><a href='" . $link . "'>" . $row['station_name'] . "</a></td>";
+ echo "<td>" . $row['date_time'] . "</td>";
+ echo "<td>" . $row['validated'] . "</td>";
+ echo "<td>" . $row['temperature'] . "</td>";
+ echo "</tr>";
+ }
+ echo "
+ </tbody>
+ </table>";
+ } else {
+ echo "No data found.";
+ }
+ ?>
+</body>
+</html>
+\ No newline at end of file
