Compare commits

..

No commits in common. "master" and "v2.0" have entirely different histories.
master ... v2.0

4 changed files with 10 additions and 13 deletions

BIN
.DS_Store vendored

Binary file not shown.

View File

@ -13,7 +13,7 @@
<body> <body>
<h1>Gestion des congés - Affichage</h1> <h1>Gestion des congés - Affichage</h1>
<h2>Année en cours : <?php echo date('Y'); ?></h2> <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> <br><br>
<?php <?php
$sql = "SELECT * FROM $table"; $sql = "SELECT * FROM $table";
@ -42,10 +42,7 @@ if ($result->num_rows > 0) {
$findate = str_replace('-"', '/', $row["datefin"]); $findate = str_replace('-"', '/', $row["datefin"]);
$datefin = date("d/m/Y", strtotime($findate)); $datefin = date("d/m/Y", strtotime($findate));
$nombrejours = $row["nbjours"]; $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><a href=\"class/class.remove.php?datedebut=" . $row["datedebut"] . "&datefin=" . $row["datefin"]. "\">Supprimer la ligne</a></td></tr>";
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>";
} }
} else { } else {
echo "<tr colspan='4'><td>Pas de résultat</td></tr>"; echo "<tr colspan='4'><td>Pas de résultat</td></tr>";
@ -55,8 +52,8 @@ $conn->close();
</tbody> </tbody>
</table> </table>
<br> <br>
<button onclick="window.location.href='class/class.clearcp.php'" class="button">Supprimer les congés payés</button> <a href="class/class.clearcp.php">Supprimer les congés payés</a>
<button onclick="window.location.href='class/class.clearrtt.php'" class="button">Supprimer les RTT</button> <a href="class/class.clearrtt.php">Supprimer les RTT</a>
<br><br> <br><br>
<?php require('solde.php') ?> <?php require('solde.php') ?>
</body> </body>

View File

@ -38,6 +38,12 @@ require('config.php');
</tr> </tr>
</thead> </thead>
<tbody> <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> <tr>
<td>Congés payés</td> <td>Congés payés</td>
<td><?php echo cumuln1cp($cpparmois); ?> jour(s)</td> <td><?php echo cumuln1cp($cpparmois); ?> jour(s)</td>

View File

@ -1,9 +1,3 @@
button {
padding: 10px 20px;
background-color: blue;
color: white;
!important;
}
table, table,
td { td {
border: 1px solid #333; border: 1px solid #333;