Merge pull request 'Push to stable' (#1) from dev into stable

Reviewed-on: #1
This commit is contained in:
2025-09-11 07:17:41 +00:00
2 changed files with 155 additions and 118 deletions

View File

@@ -1,3 +1,6 @@
## AVVISO IMPORTANTE
Questo è il ramo di SVILUPPO. È inteso per testare le ultime funzionalità e aiutarmi nello sviluppo. La stabilità e il funzionamento del codice non sono garantiti. Usare a proprio rischio e pericolo.
# Orario Scuola
Una piattaforma web per visualizzare gli orari scolastici delle classi, degli insegnanti e dei vari laboratori (se presenti)

View File

@@ -1,32 +1,52 @@
<?php
session_start();
if (!isset($_SESSION['admin'])) { header("Location: login.php"); exit; }
// if (!isset($_SESSION['admin'])) { header("Location: login.php"); exit; }
include("../db.php");
if ($_SERVER["REQUEST_METHOD"] == "POST") {
$class_id = $_POST['class_id'];
$day = $_POST['day'];
$hour = $_POST['hour'];
$subject_id = $_POST['subject_id'];
$conn->query("INSERT INTO timetable (class_id,day,hour,subject_id) VALUES ($class_id,'$day',$hour,$subject_id)");
header("Location: timetable.php"); exit;
}
?>
<?php
include("../db.php"); // o il percorso corretto al tuo DB
// Funzione per eliminare una voce del timetable
function deleteTimetableEntry($conn, $id) {
$id = intval($id); // sicurezza
$conn->query("DELETE FROM timetable WHERE id=$id");
// --- Recupera tutte le materie ---
$subjects = [];
$res = $conn->query("SELECT * FROM subjects ORDER BY name ASC");
while ($r = $res->fetch_assoc()) {
$label = $r['name'];
if (!empty($r['teacher'])) $label .= " ({$r['teacher']})";
if (!empty($r['room'])) $label .= " ({$r['room']})";
$subjects[] = ['id' => $r['id'], 'label' => $label];
}
// Se è stato cliccato il link "Elimina"
if(isset($_GET['delete'])) {
deleteTimetableEntry($conn, $_GET['delete']);
// Dopo l'eliminazione, reindirizza per evitare duplicazioni
header("Location: timetable.php");
// --- Salvataggio orario ---
if ($_SERVER["REQUEST_METHOD"] === "POST" && isset($_POST['class_id']) && isset($_POST['subject'])) {
$class_id = intval($_POST['class_id']);
if ($class_id > 0) {
// Cancella solo l'orario di questa classe
$conn->query("DELETE FROM timetable WHERE class_id=$class_id");
foreach ($_POST['subject'] as $day => $hours) {
foreach ($hours as $hour => $sub_ids) {
foreach ($sub_ids as $subject_id) {
$subject_id = intval($subject_id);
if (!empty($subject_id)) {
$conn->query("INSERT INTO timetable (class_id, day, hour, subject_id)
VALUES ($class_id, '" . $conn->real_escape_string($day) . "', $hour, $subject_id)");
}
}
}
}
header("Location: timetable.php?class_id=$class_id&saved=1");
exit;
}
}
// --- Selezione classe corrente ---
$class_id = isset($_GET['class_id']) ? intval($_GET['class_id']) : 0;
// --- Precaricamento dati orario ---
$preselectedData = [];
if ($class_id > 0) {
$res = $conn->query("SELECT * FROM timetable WHERE class_id=$class_id");
while ($r = $res->fetch_assoc()) {
$preselectedData[$r['day']][$r['hour']][] = $r['subject_id'];
}
}
?>
<!DOCTYPE html>
@@ -35,16 +55,32 @@ if(isset($_GET['delete'])) {
<title>Gestisci Orario</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="style.css">
<style>
.subject-container select { min-width: 120px; }
.subject-container button { cursor: pointer; margin-left: 3px; }
.admin-container { max-width: 95%; margin: auto; background: #fff; padding: 15px; border-radius: 8px; }
table { border-collapse: collapse; width: 100%; overflow-x: auto; display: block; }
th, td { text-align: center; padding: 6px; border: 1px solid #ccc; }
@media (max-width: 768px) {
table { font-size: 14px; }
th, td { padding: 4px; }
}
.saved-message {
margin-top: 15px;
text-align: center;
font-weight: bold;
color: green;
}
</style>
</head>
<body>
<!-- Navbar -->
<div class="navbar">
<div class="navbar">
<div class="logo">Admin Dashboard</div>
<div class="links">
<a href="index.php">Dashboard</a>
<a href="logout.php">Logout</a>
</div>
</div>
</div>
<div class="admin-container">
<h1>Gestisci Orario</h1>
@@ -52,98 +88,96 @@ if(isset($_GET['delete'])) {
<form method="POST" autocomplete="off">
Classe:
<select name="class_id" required>
<option value="" selected disabled>--Scegli un'opzione--</option>
<select name="class_id" required onchange="window.location='timetable.php?class_id='+this.value;">
<option value="" disabled <?= $class_id === 0 ? 'selected' : '' ?>>--Scegli un'opzione--</option>
<?php
$res=$conn->query("SELECT * FROM classes ORDER BY name ASC");
while($r=$res->fetch_assoc())
echo "<option value='{$r['id']}'>{$r['name']}</option>";
?>
</select>
Giorno:
<select name="day" required>
<option value="" selected disabled>--Scegli un'opzione--</option>
<option>Lunedì</option><option>Martedì</option><option>Mercoledì</option>
<option>Giovedì</option><option>Venerdì</option><option>Sabato</option>
</select>
Ora:
<select name="hour" required>
<option value="" selected disabled>--Scegli un'opzione--</option>
<option value="1">1</option><option value="2">2</option><option value="3">3</option>
<option value="4">4</option><option value="5">5</option><option value="6">6</option>
</select>
Materia:
<select name="subject_id" required>
<option value="" selected disabled>--Scegli un'opzione--</option>
<?php
$res = $conn->query("SELECT * FROM subjects ORDER BY name ASC");
while($r = $res->fetch_assoc()) {
$label = $r['name'];
if(!empty($r['teacher'])) {
$label .= " (" . $r['teacher'] . ")";
}
if(!empty($r['room'])) {
$label .= " (" . $r['room'] . ")";
}
echo "<option value='{$r['id']}'>" . htmlspecialchars($label) . "</option>";
$res = $conn->query("SELECT * FROM classes ORDER BY name ASC");
while ($r = $res->fetch_assoc()) {
$selected = ($class_id == $r['id']) ? 'selected' : '';
echo "<option value='{$r['id']}' $selected>{$r['name']}</option>";
}
?>
</select>
<button type="submit">Aggiungi</button>
</form>
<?php
// Recupera tutte le entry del timetable
$res = $conn->query("SELECT timetable.id, classes.name AS class_name, timetable.day, timetable.hour, subjects.name AS subject_name, subjects.teacher as teacher, subjects.room as room
FROM timetable
LEFT JOIN classes ON timetable.class_id = classes.id
LEFT JOIN subjects ON timetable.subject_id = subjects.id
ORDER BY class_name, day, hour");
?>
<h2>Orario Inserito</h2>
<div class="table-container">
<table class="responsive-table" border="1" cellpadding="5" style="border-collapse:collapse; width:100%; max-width:1000px; margin:auto;">
<br><br>
<?php if ($class_id > 0): ?>
<table>
<thead>
<tr>
<th>Classe</th>
<th>Giorno</th>
<th>Ora</th>
<th>Materia</th>
<th>Azione</th>
<th>Lunedì</th>
<th>Martedì</th>
<th>Mercoledì</th>
<th>Giovedì</th>
<th>Venerdì</th>
<th>Sabato</th>
</tr>
<?php while($row = $res->fetch_assoc()): ?>
<tr>
<td data-label="Classe"><span><?php echo htmlspecialchars($row['class_name']); ?></span></td>
<td data-label="Giorno"><span><?php echo htmlspecialchars($row['day']); ?></span></td>
<td data-label="Ora"><span><?php echo htmlspecialchars($row['hour']); ?></span></td>
<td data-label="Materia"><span><?php
echo htmlspecialchars($row['subject_name']);
if(!empty($row['teacher'])) {
echo " (" . htmlspecialchars($row['teacher']) . ")";
</thead>
<tbody>
<?php
$days = ['Lunedì', 'Martedì', 'Mercoledì', 'Giovedì', 'Venerdì', 'Sabato'];
for ($hour = 1; $hour <= 6; $hour++) {
echo "<tr>";
echo "<td>{$hour}ª ora</td>";
foreach ($days as $day) {
$preselected = $preselectedData[$day][$hour] ?? [''];
echo "<td>";
echo "<div class='subject-container' data-day='$day' data-hour='$hour'>";
foreach ($preselected as $subject_id) {
echo "<div class='subject-row' style='display:flex;align-items:center;gap:5px;margin-bottom:3px;'>";
echo "<select name='subject[$day][$hour][]'>";
echo "<option value=''>--</option>";
foreach ($subjects as $s) {
$sel = ($subject_id == $s['id']) ? 'selected' : '';
echo "<option value='{$s['id']}' $sel>" . htmlspecialchars($s['label']) . "</option>";
}
// if(!empty($row['room'])) {
// echo " (" . htmlspecialchars($row['room']) . ")";
// }
?></span></td>
<td data-label="Azione"><span>
<a href="timetable.php?delete=<?php echo $row['id']; ?>"
onclick="return confirm('Sei sicuro di voler eliminare questa voce?');" class='delete-link'>
Elimina
</a>
</span></td>
</tr>
<?php endwhile; ?>
</table>
</div>
<p>
echo "</select>";
echo "<button type='button' class='remove-subject' style='background:#e74c3c;color:white;border:none;border-radius:3px;padding:2px 6px;'></button>";
echo "</div>";
}
echo "<button type='button' class='add-subject' style='background:#28a745;color:white;border:none;border-radius:3px;padding:2px 6px;'>+</button>";
echo "</div>";
echo "</td>";
}
echo "</tr>";
}
?>
</tbody>
</table>
<br>
<button type="submit">Salva orario</button>
<?php endif; ?>
<?php if (isset($_GET['saved'])): ?>
<p class="saved-message">✅ Orario salvato con successo!</p>
<?php endif; ?>
</form>
<p style="text-align: center;">
Nota: Questa pagina si vede meglio da computer desktop. Se sei da computer, puoi ignorare questo messaggio.
</p>
<p style="text-align: center;">Copyright (C) 2025 EmmeV. All rights reserved.</p>
</div>
<script>
document.addEventListener('click', function(e){
if(e.target.classList.contains('add-subject')){
const container = e.target.closest('.subject-container');
const firstRow = container.querySelector('.subject-row');
const clone = firstRow.cloneNode(true);
clone.querySelector('select').value = '';
container.insertBefore(clone, e.target);
}
if(e.target.classList.contains('remove-subject')){
const container = e.target.closest('.subject-container');
const rows = container.querySelectorAll('.subject-row');
if(rows.length > 1){
e.target.closest('.subject-row').remove();
} else {
rows[0].querySelector('select').value = '';
}
}
});
</script>
</body>
</html>