ESIR
/
KiWi-Calendar
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'master' of github.com:TheMrNomis/KiWi-calendar

master
AmarOk 10 years ago
parent
3b3e4543a8 e5a51b1aa8
commit
b2a856a8a2
5 changed files with 53 additions and 6 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +16
    -2
      categories.js
  2. +1
    -0
      databaseOperations.php
  3. +5
    -0
      index.css
  4. +21
    -4
      index.php
  5. +10
    -0
      updateCategories.php

+ 16
- 2
categories.js View File

@ -4,9 +4,23 @@ var form = document.getElementById("form-categories");
for(var i = 0; i < categories.length; ++i) for(var i = 0; i < categories.length; ++i)
{ {
categories[i].addEventListener('change', function() {
categories[i].addEventListener('change', function(event) {
'use strict'; 'use strict';
form.submit();
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)
{
var evt = events[i];
evt.className = evt.className.replace(' bad_cat','');
if(event.target.checked == false)
evt.className += ' bad_cat';
}
}, false); }, false);
} }


+ 1
- 0
databaseOperations.php View File

@ -191,6 +191,7 @@ function getCategoriesForOneEvent($db, $eventId)
$request->execute(array($eventId)); $request->execute(array($eventId));
$result = $request->fetchAll(); $result = $request->fetchAll();
$request->closeCursor(); $request->closeCursor();
$categories = array();
foreach($result as $oneResult) foreach($result as $oneResult)
$categories[] = $oneResult["cat_id"]; $categories[] = $oneResult["cat_id"];
return $categories; return $categories;


+ 5
- 0
index.css View File

@ -80,6 +80,7 @@ form
input[type="checkbox"] { input[type="checkbox"] {
display:none; display:none;
} }
input[type="checkbox"] + label span { input[type="checkbox"] + label span {
display:inline-block; display:inline-block;
width:19px; width:19px;
@ -252,6 +253,10 @@ input[type="checkbox"]:checked + label span {
text-decoration: none; text-decoration: none;
} }
#calendar .week .day .bad_cat {
display: none;
}
@media only screen and (max-width: 1000px) and (max-height: 500px){ @media only screen and (max-width: 1000px) and (max-height: 500px){
#exMois #exMois


+ 21
- 4
index.php View File

@ -12,6 +12,16 @@ $weekOffset = $_GET['w'];
else else
$weekOffset = 0; $weekOffset = 0;
function categoriesOK($session, $categories)
{
foreach($session as $cat=>$cat_status)
{
if($cat_status && in_array($cat, $categories))
return true;
}
return false;
}
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
@ -78,7 +88,7 @@ $weekOffset = 0;
</form> </form>
<a id="ancherEvent" href="./addEvent.php"> <a id="ancherEvent" href="./addEvent.php">
<div class="Button" id="AddEvent"> <div class="Button" id="AddEvent">
+ Ajouter un Évènement
+ Ajouter un &Eacute;v&egrave;nement
</div> </div>
</a> </a>
</div> </div>
@ -100,7 +110,7 @@ $weekOffset = 0;
$date = strtotime('+1 day', $date) $date = strtotime('+1 day', $date)
) )
{ {
$events = getEventsByDateAndCategories($db, $date, $_SESSION['categorieStatus']);
$events = getEventsByDate($db, $date);
$class = ''; $class = '';
if(date('m', $date) != date('m', $monthDate)) if(date('m', $date) != date('m', $monthDate))
@ -116,14 +126,21 @@ $weekOffset = 0;
<span class="minititle left">'.$days[date("N",$date)].'</span> <span class="minititle left">'.$days[date("N",$date)].'</span>
'.date("d", $date)); '.date("d", $date));
if(date('m', $date) != date('m', $monthDate)) if(date('m', $date) != date('m', $monthDate))
echo('<span class="minititle right">/'.date("m",$date).'</span>');
echo('<span class="minititle right">/'.date("m",$date).'</span>');
echo(' echo('
</h2> </h2>
</a> </a>
<ul>'); <ul>');
foreach($events as $event) foreach($events as $event)
echo('<li class="calendar-link"><a href="./event.php?id='.$event['event_id'].'">'.$event['event_title']."</a></li>");
{
$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('<li class="calendar-link '. $classes .'"><a href="./event.php?id='.$event['event_id'].'">'.$event['event_title']."</a></li>");
}
echo(' echo('
</ul> </ul>
</li>'); </li>');


+ 10
- 0
updateCategories.php View File

@ -0,0 +1,10 @@
<?php
session_start();
if(!isset($_GET['id']) || !isset($_GET['val']))
{
exit;
}
$_SESSION['categorieStatus'][$_GET['id']] = $_GET['val'] == "true";
?>

Write Preview
Loading…
Cancel
Save