From b87f487a89d63174d6999f4388bd5be96bf4c53b Mon Sep 17 00:00:00 2001 From: Tutur33 Date: Fri, 1 Dec 2023 19:36:18 +0100 Subject: [PATCH] Finish calendar --- Activity_PHP/calendar/calendar.php | 40 +++++++++++++++++++------ Activity_PHP/calendar/data.json | 48 ++++++++++++++++++++++++++++++ Activity_PHP/calendar/style.css | 31 ++++++++++++++----- 3 files changed, 103 insertions(+), 16 deletions(-) create mode 100644 Activity_PHP/calendar/data.json diff --git a/Activity_PHP/calendar/calendar.php b/Activity_PHP/calendar/calendar.php index e71fd87..2b1e98c 100644 --- a/Activity_PHP/calendar/calendar.php +++ b/Activity_PHP/calendar/calendar.php @@ -18,6 +18,9 @@ $months = [ ]; $monthName = $months[$month]; + +$data = json_decode(file_get_contents('data.json'), true); + ?> @@ -37,14 +40,19 @@ $monthName = $months[$month]; - Monday - Tuesday - Wednesday - Thursday - Friday - Saturday - Sunday + Monday + Tuesday + Wednesday + Thursday + Friday + Saturday + Sunday + $nbr"); + echo("$nbr"); + + $date_table = $nbr."-".$month ; + foreach ($data['dates'] as $date) { + if ($date['date'] === $date_table) { + echo "
" . $date['name']; + } + } foreach ($_COOKIE as $nom_cookie => $valeur_cookie) { $cut = explode("-", $nom_cookie); @@ -102,7 +117,14 @@ $monthName = $months[$month]; } $today = (date("j") == $nbr and date("n") == $month and date("Y") == $year) ? "class='today'" : ""; - echo("$nbr"); + echo("$nbr"); + + $date_table = $nbr."-".$month ; + foreach ($data['dates'] as $date) { + if ($date['date'] === $date_table) { + echo "
" . $date['name']; + } + } foreach ($_COOKIE as $nom_cookie => $valeur_cookie) { $cut = explode("-", $nom_cookie); diff --git a/Activity_PHP/calendar/data.json b/Activity_PHP/calendar/data.json new file mode 100644 index 0000000..d5c285a --- /dev/null +++ b/Activity_PHP/calendar/data.json @@ -0,0 +1,48 @@ +{ + "dates": [ + { + "name": "Nouvel An", + "date": "1-1" + }, + { + "name": "Saint-Valentin", + "date": "14-2" + }, + { + "name": "Journée internationale des femmes", + "date": "8-3" + }, + { + "name": "Poisson d'avril", + "date": "1-4" + }, + { + "name": "Équinoxe de printemps (ou d'automne)", + "date": "21-3" + }, + { + "name": "Fête du Travail", + "date": "1-5" + }, + { + "name": "Noël", + "date": "25-12" + }, + { + "name": "Saint-Sylvestre", + "date": "31-12" + }, + { + "name": "Armistice", + "date": "11-11" + }, + { + "name": "Fête nationale française", + "date": "14-7" + }, + { + "name": "Journée mondiale de l'environnement", + "date": "5-6" + } + ] +} diff --git a/Activity_PHP/calendar/style.css b/Activity_PHP/calendar/style.css index 9a42ae6..db15d51 100644 --- a/Activity_PHP/calendar/style.css +++ b/Activity_PHP/calendar/style.css @@ -2,12 +2,7 @@ table { margin-top: 30px; border-collapse: collapse; width: 100%; -} - -th, td { - border: 1px solid #dddddd; - text-align: left; - padding: 8px; + table-layout:fixed; } th { @@ -83,7 +78,7 @@ a, } main { - max-width: 800px; + max-width: 1000px; margin: 20px auto; padding: 20px; background-color: #fff; @@ -104,4 +99,26 @@ main p { .main-calendar { min-height: 500px; +} + +th, +td { + text-align: center; + width: 100px; + height: 50px; + transition: width 0.3s ease, height 0.3s ease; + cursor: pointer; + border: 1px solid #dddddd; + padding: 8px; +} + +td { + overflow: hidden; + white-space:nowrap; + text-overflow: ellipsis; +} + +.clicked { + height: auto; + white-space:normal; } \ No newline at end of file