11 changed files with 20 additions and 55 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/README.md
+++ b/README.md
@ -86,7 +86,3 @@ ATTENTION : Pour la saisie du nombre de jour, le séparateur décimal est le poi
 Vous voilà maintenant prêt à utiliser cet utilitaire de gestion des congés !

 Faites-en bon usage ! ;-)
-
-## III. DÉMO 
-
-[Accéder à la démo](https://demo.am-networks.fr/GestionConges-PHP)
--- a/class/class.ajout.php
+++ b/class/class.ajout.php
@ -4,10 +4,11 @@
  <link rel="stylesheet" href="style.css">
  <meta name="viewport" content="width=device-width">
   <?php
-   require('class.sqlconnect.php');
+   require('sqlconnect.php');
   ?>
 </head>
 <?php
+require('sqlconnect.php');

 $datedebut = $_POST['datedebut'];
 $datefin = $_POST['datefin'];
@ -20,7 +21,7 @@ $req = "INSERT INTO $table VALUES ('$datedebut','$datefin','$nbjours','$type');"
 $resultat = $mysqli->query($req);
 if ($resultat) {
 			echo "<p>La saisie a été ajoutée !</p>";
-      header("refresh:2; url=../index.php");
+      header("refresh:2; url=index.php");
 		}else{
 			echo "<p>Erreur</p>";
    };
--- a/class/class.clearcp.php
+++ b/class/class.clearcp.php
@ -1,13 +0,0 @@
-<?php
-require('class.sqlconnect.php');
-$mysqli = new mysqli($servername, $username, $password, $dbname);
-$mysqli->set_charset("utf8");
-$req = "DELETE FROM $table WHERE type = 'cp' ;";
-$resultat = $mysqli->query($req);
-if ($resultat) {
-			echo "<p>Les congés payés ont été supprimés !</p>";
-      header("refresh:2; url=../index.php");
-		}else{
-			echo "<p>Erreur</p>";
-    };
-?>
--- a/class/class.clearrtt.php
+++ b/class/class.clearrtt.php
@ -1,13 +0,0 @@
-<?php
-require('class.sqlconnect.php');
-$mysqli = new mysqli($servername, $username, $password, $dbname);
-$mysqli->set_charset("utf8");
-$req = "DELETE FROM $table WHERE type = 'rtt' ;";
-$resultat = $mysqli->query($req);
-if ($resultat) {
-			echo "<p>Les RTT ont été supprimés !</p>";
-      header("refresh:2; url=../index.php");
-		}else{
-			echo "<p>Erreur</p>";
-    };
-?>
--- a/class/class.functions.php
+++ b/class/class.functions.php
@ -3,7 +3,7 @@
  //require('config.php');

  function soldertt($table, $rttparan, $conn){
-    $resultrtt = mysqli_query($conn, "SELECT SUM(nbjours) AS decomptertt FROM $table WHERE type='RTT'");
+    $resultrtt = mysqli_query($conn, "SELECT SUM(nbjours) AS decomptertt FROM $table WHERE type='RTT' AND datedebut LIKE ");
    $rowrtt = mysqli_fetch_assoc($resultrtt);
    $sumrtt = $rowrtt['decomptertt'];
    $rtt = ($rttparan - $sumrtt);
--- a/class/class.remove.php
+++ b/class/class.remove.php
@ -4,12 +4,12 @@
  <link rel="stylesheet" href="style.css">
  <meta name="viewport" content="width=device-width">
   <?php
-   require('class.sqlconnect.php');
-   //require('config.php');
-   //require('class.functions.php');
+   require('sqlconnect.php');
   ?>
 </head>
 <?php
+require('sqlconnect.php');
+
 $actual_link = $actual_link = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
 $url_components = parse_url($actual_link);
 parse_str($url_components['query'], $params);
@ -22,8 +22,8 @@ $req = "DELETE FROM $table WHERE datedebut = '$datedebut' AND datefin = '$datefi
 $resultat = $mysqli->query($req);
 if ($resultat) {
 			echo "<p>La saisie a été supprimée !</p>";
-      header("refresh:2; url=../index.php");
+      header("refresh:2; url=index.php");
 		}else{
 			echo "<p>Erreur</p>";
-    }
+    };
 ?>
--- a/index.php
+++ b/index.php
@ -13,7 +13,7 @@
 <body>
 <h1>Gestion des congés - Affichage</h1>
 <h2>Année en cours : <?php echo date('Y'); ?></h2>
-<button onclick="window.location.href='saisie.php'" class="button">Saisir des congés</button>
+<a href="saisie.php">Saisir des congés</a>
 <br><br>
 <?php
 $sql = "SELECT * FROM $table";
@ -30,7 +30,7 @@ $result = $conn->query($sql);
      <td><b>Date début</b></td>
      <td><b>Date fin</b></td>
      <td><b>Durée</b></td>
-      <td><b>Nature du congé</b></td>
+      <td><b>Type de congé</b></td>
      <td><b>Suppression</b></td>
    </tr>
 <?php
@ -42,10 +42,7 @@ if ($result->num_rows > 0) {
    $findate = str_replace('-"', '/', $row["datefin"]);
    $datefin = date("d/m/Y", strtotime($findate));
    $nombrejours = $row["nbjours"];
-    $link = 'class/class.remove.php?datedebut=' . $row["datedebut"] . '&datefin=' . $row["datefin"];
-    echo "<tr><td> " . $datedebut. " </td><td> " . $datefin. " </td><td> " . $nombrejours . " jour(s) </td><td> " . $row["type"] . " </td><td><button onclick='window.location.href=" . '"' . $link . '"' . "' class='button'>Supprimer la ligne</button></td></tr>";
-
-
+    echo "<tr><td> " . $datedebut. " </td><td> " . $datefin. " </td><td> " . $nombrejours . " jour(s) </td><td> ". $row["type"]." </td><td><a href=\"class.remove.php?datedebut=" . $row["datedebut"] . "&datefin=" . $row["datefin"]. "\">Supprimer la ligne</a></td></tr>";
  }
 } else {
  echo "<tr colspan='4'><td>Pas de résultat</td></tr>";
@ -54,9 +51,6 @@ $conn->close();
 ?>
 </tbody>
 </table>
-<br>
-<button onclick="window.location.href='class/class.clearcp.php'" class="button">Supprimer les congés payés</button>
-<button onclick="window.location.href='class/class.clearrtt.php'" class="button">Supprimer les RTT</button>
 <br><br>
 <?php require('solde.php') ?>
 </body>
--- a/saisie.php
+++ b/saisie.php
@ -13,7 +13,7 @@
 <body>
  <h1>Gestion des congés - Saisie</h1>
  <a href="index.php">Afficher les congés</a><br><br>
-  <form class="generated-form"  method="POST" action="class/class.ajout.php"  target="_self">
+  <form class="generated-form"  method="POST" action="class.ajout.php"  target="_self">
  <fieldset>
    <legend> Saisie de congés </legend>
    <label for="datedebut">Date de début :</label><br>
@ -22,7 +22,7 @@
    <input type="date" id="datefin" name="datefin"><br>
    <label for="nbjours">Nombre de jours :</label><br>
    <input type="text" id="nbjours" name="nbjours"><br><br>
-    <label for="nbjours">Nature du congé :</label><br>
+    <label for="nbjours">Type de congés :</label><br>
    <select name="type">
         <option value="RTT" stud_name="sre">RTT</option>
         <option value="CP" stud_name="sam">Congé payé</option>
--- a/solde.php
+++ b/solde.php
@ -38,6 +38,12 @@ require('config.php');
        </tr>
  </thead>
  <tbody>
+    <tr>
+      <td>RTT</td>
+
+      <td><?php echo cumuln1rtt($rttparmois); ?> jour(s)</td>
+      <td>Entre en vigueur le : 1er janvier <?php anneeplus(); ?></td>
+    </tr>
    <tr>
      <td>Congés payés</td>
      <td><?php echo cumuln1cp($cpparmois); ?> jour(s)</td>
--- a/style.css
+++ b/style.css
@ -1,9 +1,3 @@
-button {
-    padding: 10px 20px;
-    background-color: blue;
-    color: white;
-    !important;
-}
 table,
 td {
    border: 1px solid #333;