Compare commits

..

8 Commits

Author SHA1 Message Date
4614cd330c Update README.md 2025-09-22 08:48:54 +00:00
7d8760febb Update htdocs/index.php 2025-09-11 08:39:05 +00:00
940426e45c Testo del copyright 2025-09-11 10:35:01 +02:00
78eb485ef7 Link al codice sorgente 2025-09-11 08:21:45 +00:00
060f05247a Altra piccola modifica 2025-09-11 07:58:53 +00:00
e5fb838445 piccola modifica 2025-09-11 07:31:02 +00:00
72ca358139 bruh 2025-09-11 07:18:25 +00:00
0a3de8a846 Merge pull request 'Push to stable' (#1) from dev into stable
Reviewed-on: #1
2025-09-11 07:17:41 +00:00
7 changed files with 42 additions and 180 deletions

View File

@@ -1,6 +1,3 @@
## 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 # Orario Scuola
Una piattaforma web per visualizzare gli orari scolastici delle classi, degli insegnanti e dei vari laboratori (se presenti) Una piattaforma web per visualizzare gli orari scolastici delle classi, degli insegnanti e dei vari laboratori (se presenti)

View File

@@ -47,44 +47,7 @@ if (isset($_GET['delete'])) {
<input type="text" name="room" placeholder="Laboratorio (opzionale)"> <input type="text" name="room" placeholder="Laboratorio (opzionale)">
<button type="submit">Aggiungi</button> <button type="submit">Aggiungi</button>
</form> </form>
<?php
// 1. Aggiornamento dati
if(isset($_POST['update'])){
$id = intval($_POST['id']);
$name = $conn->real_escape_string($_POST['name']);
$teacher = $conn->real_escape_string($_POST['teacher']);
$room = $conn->real_escape_string($_POST['room']);
$conn->query("UPDATE subjects
SET name='$name', teacher='$teacher', room='$room'
WHERE id=$id");
}
// 2. Mostrare il form se edit richiesto
if(isset($_GET['edit'])){
$id = intval($_GET['edit']);
$res = $conn->query("SELECT * FROM subjects WHERE id=$id");
if($res->num_rows > 0){
$subject = $res->fetch_assoc();
?>
<h3>Modifica materia</h3>
<form method="post" action="subjects.php">
<input type="hidden" name="id" value="<?php echo $subject['id']; ?>">
<label>Materia:</label>
<input type="text" name="name" value="<?php echo htmlspecialchars($subject['name']); ?>"><br>
<label>Docente:</label>
<input type="text" name="teacher" value="<?php echo htmlspecialchars($subject['teacher']); ?>"><br>
<label>Aula:</label>
<input type="text" name="room" value="<?php echo htmlspecialchars($subject['room']); ?>"><br>
<button type="submit" name="update">Salva modifiche</button>
</form>
<?php
}
}
?>
<table> <table>
<tr> <tr>
<th>ID</th> <th>ID</th>
@@ -101,10 +64,7 @@ if(isset($_GET['edit'])){
<td>{$row['name']}</td> <td>{$row['name']}</td>
<td>{$row['teacher']}</td> <td>{$row['teacher']}</td>
<td>{$row['room']}</td> <td>{$row['room']}</td>
<td> <td><a href='subjects.php?delete={$row['id']}' class='delete-link'>Elimina</a></td>
<a href='subjects.php?edit={$row['id']}' class='edit-link'>Modifica</a> |
<a href='subjects.php?delete={$row['id']}' class='delete-link'>Elimina</a>
</td>
</tr>"; </tr>";
} }
?> ?>

View File

@@ -106,115 +106,62 @@ td:hover {
td { padding-left: 50%; } td { padding-left: 50%; }
} }
*/ */
/* --- tuoi stili desktop (questi restano uguali) --- */
table {
border-collapse: collapse;
width: 100%;
max-width: 1000px;
margin: 0 auto;
background: #fff;
border-radius: 10px;
overflow: hidden;
box-shadow: 0 2px 8px rgba(0,0,0,0.1);
}
th, td {
border: 1px solid #ccc;
text-align: center;
padding: 10px;
vertical-align: top;
}
th {
background-color: #e0e0e0;
font-weight: bold;
}
td {
transition: background-color 0.2s;
}
td:hover {
background-color: #f7f7f7;
}
.subject {
font-weight: bold;
color: #1f618d;
}
.teacher {
font-size: 0.9em;
color: #2c3e50;
}
.room {
font-size: 0.8em;
color: #666;
}
/* --- qui sostituisci con la versione migliorata --- */
@media (max-width: 768px) { @media (max-width: 768px) {
table { table, thead, tbody, th, td, tr {
box-shadow: none; display: block;
border-radius: 0; width: 100%;
} }
tr { tr {
margin-bottom: 20px; margin-bottom: 15px;
background: #fff; padding: 0;
border-radius: 8px; border-bottom: 2px solid #ddd;
box-shadow: 0 2px 6px rgba(0,0,0,0.08); }
overflow: hidden;
padding: 10px; th {
display: none;
} }
td { td {
padding: 8px 8px 8px 50%; position: relative;
padding-left: 50%;
text-align: left;
border: none; border: none;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
font-size: 0.9em; min-height: 50px; /* ensures consistent vertical spacing */
box-sizing: border-box;
} }
td::before { td::before {
position: absolute; position: absolute;
top: 10px; top: 10px;
left: 10px; left: 10px;
color: #1f618d; width: 40%;
font-size: 0.85em; font-weight: bold;
text-transform: uppercase; white-space: nowrap;
letter-spacing: 0.5px;
content: attr(data-label); content: attr(data-label);
} }
td > .subject { /* make content stack nicely */
font-weight: 600; td > .subject,
font-size: 1em; td > .teacher,
margin-bottom: 2px;
}
td > .teacher {
font-size: 0.85em;
color: #555;
}
td > .room { td > .room {
font-size: 0.75em; display: block;
color: #888; margin: 2px 0;
} }
td:last-child { td:last-child {
border-bottom: none; border-bottom: 0;
} }
} }
/* Extra small screens */
@media (max-width: 480px) { @media (max-width: 480px) {
td { td {
padding-left: 45%; padding-left: 55%;
} }
td::before { td::before {
width: 40%; width: 45%;
font-size: 0.8em;
} }
} }

View File

@@ -11,8 +11,8 @@ $hours = [
6 => "Sesta ora<br>12:50 - 13:50" 6 => "Sesta ora<br>12:50 - 13:50"
]; ];
if ($teacher == "No Lezione" || $teacher == "sconosciuto") { if ($teacher == "No Lezione" || $teacher == "sconosciuto") {
header("Location: index.php"); header("Location: index.php");
exit; exit;
} }
else if (!isset($_GET['teacher'])) { else if (!isset($_GET['teacher'])) {
header("Location: index.php"); header("Location: index.php");
@@ -23,6 +23,7 @@ $teacher = $conn->real_escape_string($_GET['teacher']);
$res = $conn->query("SELECT DISTINCT teacher FROM subjects WHERE teacher = '$teacher' LIMIT 1"); $res = $conn->query("SELECT DISTINCT teacher FROM subjects WHERE teacher = '$teacher' LIMIT 1");
if ($res->num_rows === 0) { if ($res->num_rows === 0) {
// Insegnante non trovato
header("Location: index.php"); header("Location: index.php");
exit; exit;
} }

View File

@@ -66,6 +66,6 @@ while($row = $res->fetch_assoc()){
?> ?>
</div> </div>
<p style="text-align: center;">Copyright (C) 2025 EmmeV. - Released under <a href="https://git.vichingo455.freeddns.org/emmev-code/orario/src/branch/stable/LICENSE.txt" target="_blank">GNU AGPL 3.0 License</a>.</p> <p style="text-align: center;">Copyright (C) 2025 EmmeV. - Released under GNU AGPL 3.0 License.</p>
</body> </body>
</html> </html>

View File

@@ -60,31 +60,11 @@ if ($res->num_rows === 0) {
WHERE subjects.room='". $conn->real_escape_string($room) ."' WHERE subjects.room='". $conn->real_escape_string($room) ."'
AND timetable.day='$d' AND timetable.hour=$hnum AND timetable.day='$d' AND timetable.hour=$hnum
"); ");
if($row = $q->fetch_assoc()){
if($q->num_rows > 0){
$subject = null;
$entries = [];
while($row = $q->fetch_assoc()){
// salvo materia (prendo la prima, di solito è la stessa per tutti)
if($subject === null) {
$subject = $row['subject_name'];
}
// accumulo classi + docente
$entries[] = $row['class_name'] . " (" . $row['teacher'] . ")";
}
// unisci le classi con " e " se sono 2, altrimenti virgole + "e" finale
if(count($entries) > 1){
$last = array_pop($entries);
$entries_list = implode(", ", $entries) . " e " . $last;
} else {
$entries_list = $entries[0];
}
echo "<td data-label='$d'> echo "<td data-label='$d'>
<div class='subject'>$subject</div> <div class='subject'>{$row['subject_name']}</div>
<div class='room'>$entries_list</div> <div class='teacher'>{$row['teacher']}</div>
<div class='room'>{$row['class_name']}</div>
</td>"; </td>";
} else { } else {
echo "<td data-label='$d'></td>"; echo "<td data-label='$d'></td>";
@@ -94,6 +74,6 @@ if ($res->num_rows === 0) {
} }
?> ?>
</table> </table>
<p style="text-align: center;">Copyright (C) 2025 EmmeV. All rights reserved.</p> <p style="text-align: center;">Copyright (C) 2025 EmmeV. - Released under <a href="https://git.vichingo455.freeddns.org/emmev-code/orario/src/branch/stable/LICENSE.txt" target="_blank">GNU AGPL 3.0 License</a>.</p>
</body> </body>
</html> </html>

View File

@@ -54,33 +54,10 @@ if ($res->num_rows === 0) {
FROM timetable FROM timetable
LEFT JOIN subjects ON timetable.subject_id = subjects.id LEFT JOIN subjects ON timetable.subject_id = subjects.id
WHERE class_id=$class_id AND day='$d' AND hour=$hnum"); WHERE class_id=$class_id AND day='$d' AND hour=$hnum");
if($row = $q->fetch_assoc()){
if($q->num_rows > 0){ echo "<td data-label='$d'><div class='subject'>{$row['name']}</div>
$row = $q->fetch_assoc(); <div class='teacher'>{$row['teacher']}</div>
$subject = $row['name']; <div class='room'>{$row['room']}</div></td>";
$room = $row['room'];
// metto il primo docente
$teachers = [$row['teacher']];
// aggiungo eventuali altri docenti
while($row = $q->fetch_assoc()){
$teachers[] = $row['teacher'];
}
// se più docenti -> unisci con virgola e "e" finale
if(count($teachers) > 1){
$last = array_pop($teachers);
$teachers_list = implode(", ", $teachers) . " e " . $last;
} else {
$teachers_list = $teachers[0];
}
echo "<td data-label='$d'>
<div class='subject'>$subject</div>
<div class='teacher'>$teachers_list</div>
<div class='room'>$room</div>
</td>";
} else { } else {
echo "<td data-label='$d'></td>"; echo "<td data-label='$d'></td>";
} }