From 066689d26ae88d09db7aa57e789907dbd3b2320e Mon Sep 17 00:00:00 2001 From: TheMrNomis Date: Thu, 21 Apr 2016 09:27:26 +0200 Subject: [PATCH 1/5] caracteres accentues HTML --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 8a48faf..5599e17 100644 --- a/index.php +++ b/index.php @@ -78,7 +78,7 @@ $weekOffset = 0;
- + Ajouter un Évènement + + Ajouter un Évènement
From d4449d619550a014161deb44892c251472bf60a6 Mon Sep 17 00:00:00 2001 From: TheMrNomis Date: Thu, 21 Apr 2016 09:53:08 +0200 Subject: [PATCH 2/5] bugfix undefined var when no categories were found in DB --- databaseOperations.php | 1 + 1 file changed, 1 insertion(+) diff --git a/databaseOperations.php b/databaseOperations.php index 788c514..e9e4ee0 100755 --- a/databaseOperations.php +++ b/databaseOperations.php @@ -191,6 +191,7 @@ function getCategoriesForOneEvent($db, $eventId) $request->execute(array($eventId)); $result = $request->fetchAll(); $request->closeCursor(); + $categories = array(); foreach($result as $oneResult) $categories[] = $oneResult["cat_id"]; return $categories; From 21ed93c8925b933121f1f1bcc9c2d01b7e7f79d2 Mon Sep 17 00:00:00 2001 From: TheMrNomis Date: Thu, 21 Apr 2016 09:53:48 +0200 Subject: [PATCH 3/5] =?UTF-8?q?changement=20de=20la=20m=C3=A9thode=20de=20?= =?UTF-8?q?masquage=20des=20events=20(PHP=20->=20CSS)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.css | 5 +++++ index.php | 23 ++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/index.css b/index.css index c675900..afb2182 100755 --- a/index.css +++ b/index.css @@ -80,6 +80,7 @@ form input[type="checkbox"] { display:none; } + input[type="checkbox"] + label span { display:inline-block; width:19px; @@ -252,6 +253,10 @@ input[type="checkbox"]:checked + label span { text-decoration: none; } +#calendar .week .day .bad_cat { + display: none; +} + @media only screen and (max-width: 1000px) and (max-height: 500px){ #exMois diff --git a/index.php b/index.php index 5599e17..b4003ca 100644 --- a/index.php +++ b/index.php @@ -12,6 +12,16 @@ $weekOffset = $_GET['w']; else $weekOffset = 0; +function categoriesOK($session, $categories) +{ + foreach($session as $cat=>$cat_status) + { + if($cat_status && in_array($cat, $categories)) + return true; + } + return false; +} + ?> @@ -100,7 +110,7 @@ $weekOffset = 0; $date = strtotime('+1 day', $date) ) { - $events = getEventsByDateAndCategories($db, $date, $_SESSION['categorieStatus']); + $events = getEventsByDate($db, $date); $class = ''; if(date('m', $date) != date('m', $monthDate)) @@ -116,14 +126,21 @@ $weekOffset = 0; '.$days[date("N",$date)].' '.date("d", $date)); if(date('m', $date) != date('m', $monthDate)) - echo('/'.date("m",$date).''); + echo('/'.date("m",$date).''); echo('
    '); foreach($events as $event) - echo('
  • '.$event['event_title']."
    • "); + { + $categories = getCategoriesForOneEvent($db, $event['event_id']); + $classes = implode(' ', array_map(function($e){return "event_in_cat_".$e;}, $categories)); + + if(!categoriesOK($_SESSION['categorieStatus'], $categories)) + $classes .= ' bad_cat'; + echo('
  • '.$event['event_title']."
    • "); + } echo('
'); From 50bd36b53b465d0d94e404eea907d170abf1e212 Mon Sep 17 00:00:00 2001 From: TheMrNomis Date: Thu, 21 Apr 2016 10:51:28 +0200 Subject: [PATCH 4/5] changement dynamique des categories (JS) --- categories.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/categories.js b/categories.js index 06e876f..ead8d16 100644 --- a/categories.js +++ b/categories.js @@ -4,9 +4,19 @@ var form = document.getElementById("form-categories"); for(var i = 0; i < categories.length; ++i) { - categories[i].addEventListener('change', function() { + categories[i].addEventListener('change', function(event) { 'use strict'; - form.submit(); + var cat_id = event.target.id.replace('cat_',''); + + var events = document.getElementsByClassName('event_in_cat_'+cat_id); + + for(var i = 0; i < events.length; ++i) + { + var evt = events[i]; + evt.className = evt.className.replace(' bad_cat',''); + if(event.target.checked == false) + evt.className += ' bad_cat'; + } }, false); } From add7f4294a83c69b0aacde68d2fc2fa26337897b Mon Sep 17 00:00:00 2001 From: TheMrNomis Date: Thu, 21 Apr 2016 11:03:58 +0200 Subject: [PATCH 5/5] maj cats via AJAX --- categories.js | 4 ++++ updateCategories.php | 10 ++++++++++ 2 files changed, 14 insertions(+) create mode 100644 updateCategories.php diff --git a/categories.js b/categories.js index ead8d16..3501b71 100644 --- a/categories.js +++ b/categories.js @@ -8,6 +8,10 @@ for(var i = 0; i < categories.length; ++i) 'use strict'; var cat_id = event.target.id.replace('cat_',''); + var xhr = new XMLHttpRequest(); + xhr.open("GET", "updateCategories.php?id="+cat_id+"&val="+event.target.checked); + xhr.send(null); + var events = document.getElementsByClassName('event_in_cat_'+cat_id); for(var i = 0; i < events.length; ++i) diff --git a/updateCategories.php b/updateCategories.php new file mode 100644 index 0000000..608b87b --- /dev/null +++ b/updateCategories.php @@ -0,0 +1,10 @@ +