From f34d084cde33bde3cdae84e0aa74f89937fbfa95 Mon Sep 17 00:00:00 2001 From: TheMrNomis Date: Thu, 10 Dec 2015 09:41:42 +0100 Subject: [PATCH 1/9] tabs in hamburger menu --- hamburger.js | 25 ++++++++++++++++++++++--- index.php | 4 ++-- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/hamburger.js b/hamburger.js index 68ce875..e5dd5f4 100755 --- a/hamburger.js +++ b/hamburger.js @@ -3,7 +3,26 @@ var menu = document.getElementById("hamburgerMenu"); var open = false; -button.addEventListener('click', function(){ - menu.style.left = (open)? '-382px' : '0px'; - open = !open; +button.addEventListener('click', function () { + 'use strict'; + menu.style.left = (open) ? '-382px' : '0px'; + open = !open; +}, false); + +var buttonEsir = document.getElementById("ancherESIR"); +var buttonRennes = document.getElementById("ancherRennes"); + +var tab0 = document.getElementById("tab0"); +var tab1 = document.getElementById("tab1"); + +buttonEsir.addEventListener('click', function () { + 'use strict'; + tab1.style.display = 'none'; + tab0.style.display = 'block'; +}, false); + +buttonRennes.addEventListener('click', function () { + 'use strict'; + tab0.style.display = 'none'; + tab1.style.display = 'block'; }, false); diff --git a/index.php b/index.php index 3640132..a92102d 100644 --- a/index.php +++ b/index.php @@ -52,12 +52,12 @@ else @@ -142,63 +107,63 @@ else
- '); - for($date = strtotime('last monday +'.$week.' weeks'); - $date < strtotime('next monday +'.$week.' weeks'); - $date = strtotime('+1 day', $date) - ) + for($week = $weekOffset; $week < $weekOffset + 5; ++$week) { - $events = getEventsByDate($db, $date); + echo(' + '."\n"); - } - ?> + } + ?> - From e681ee5f7d5b0935fad00c2ac237e1fbb746d7f5 Mon Sep 17 00:00:00 2001 From: TheMrNomis Date: Thu, 10 Dec 2015 10:18:42 +0100 Subject: [PATCH 8/9] bugfix with getEventByDate --- databaseOperations.php | 4 ++-- day.php | 6 +++--- index.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/databaseOperations.php b/databaseOperations.php index 565304a..2664f2e 100755 --- a/databaseOperations.php +++ b/databaseOperations.php @@ -164,7 +164,7 @@ function getCategoriesForOneEvent($db, $eventId) /** * @brief queries the database for the events on a certain date * @param $db: the PDO connection to the database - * @param $date: the date to search for + * @param $date: the date to search for (please use strtotime) * @return a list of all the events at the date $date */ function getEventsByDate($db, $date) @@ -172,7 +172,7 @@ function getEventsByDate($db, $date) try { $request = $db->prepare('SELECT * FROM event WHERE (event_dtstart <= :date AND event_dtend >= :date)'); - $request->execute(array('date'=>date("Y-m-d",strtotime($date)))); + $request->execute(array('date'=>date("Y-m-d",$date))); $result = $request->fetchAll(); $request->closeCursor(); return $result; diff --git a/day.php b/day.php index cd10578..e5bf648 100644 --- a/day.php +++ b/day.php @@ -2,7 +2,7 @@ include_once('databaseOperations.php'); $db = connect(); -$date = htmlspecialchars($_GET['date']); +$date = strtotime(htmlspecialchars($_GET['date'])); ?> @@ -21,14 +21,14 @@ $date = htmlspecialchars($_GET['date']);
-

+

\n"; - echo "

".$row['event_title']."

\n"; + echo "

".$row['event_titre']."

\n"; echo "
".date('H:i',strtotime($row['event_dtstart']))." - ".date('H:i',strtotime($row['event_dtend'])).". ".$row['event_localisation']."
\n"; echo "
".$row['event_description'] ."
\n\n
\n"; } diff --git a/index.php b/index.php index 07adb31..00763db 100644 --- a/index.php +++ b/index.php @@ -143,7 +143,7 @@ else '); From 6ee614d3c25d706052a799ad13f43ee0cc74eaca Mon Sep 17 00:00:00 2001 From: TheMrNomis Date: Thu, 10 Dec 2015 10:21:33 +0100 Subject: [PATCH 9/9] bugfix: events not displayed on the first day --- databaseOperations.php | 5 +++-- index.php | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/databaseOperations.php b/databaseOperations.php index 2664f2e..86f8f23 100755 --- a/databaseOperations.php +++ b/databaseOperations.php @@ -171,8 +171,9 @@ function getEventsByDate($db, $date) { try { - $request = $db->prepare('SELECT * FROM event WHERE (event_dtstart <= :date AND event_dtend >= :date)'); - $request->execute(array('date'=>date("Y-m-d",$date))); + $request = $db->prepare('SELECT * FROM event WHERE (event_dtstart <= :date_max AND event_dtend >= :date_min)'); + $request->execute(array('date_max'=>date("Y-m-d 23:59:59",$date), + 'date_min'=>date("Y-m-d 00:00:00",$date))); $result = $request->fetchAll(); $request->closeCursor(); return $result; diff --git a/index.php b/index.php index 00763db..d2ae3dc 100644 --- a/index.php +++ b/index.php @@ -108,7 +108,6 @@ else