diff --git a/orga.php b/orga.php
index 6889b07..52b9a62 100644
--- a/orga.php
+++ b/orga.php
@@ -1,29 +1,31 @@
 <h2> Organisation </h2>
 
 <?php
+
 # DEBUG
 # e_ : est
-# r_ : a le droit de
-
 $e_connecte = false;
 $e_modo = true;
 
 $droits  = array('voir', 'voter', 'ajouter', 'proposer', 'annuler', 'supprimer', 'modifier', 'valider');
+$time = time();
 
 class Evenement
 {
-    public $id = 0;
+    private $id = 0;
+    private $creationTime = 0;
+
     public $nom = "Sans nom";
     public $description = "Sans description";
     public $annule = false;
     public $valide = false;
-    public $duree = 120;
+    public $duree = 3600;
+    public $supprime = false;
 
     public $dates = array();
+    public $datesVotes = array();
 
     public function html() {
-        global $droits;
-
         $html = '   <li class="list-group-item">';
 
         # Titre
@@ -31,10 +33,10 @@ class Evenement
         if ($this->annule) {
             $html .= ' <span class="label label-danger">Annulé</span>';
         }
-        if (in_array('annuler', $droits) && !$this->annule) { # TODO
+        if ($this->p_annuler()) {
             $html .= ' <button type="button" class="btn btn-danger"><span class="glyphicon glyphicon glyphicon-remove"></span></button>';
         }
-        if (in_array('supprimer', $droits) && !$this->valide) { # TODO
+        if ($this->p_supprimer()) {
             $html .= ' <button type="button" class="btn btn-danger"><span class="glyphicon glyphicon glyphicon-trash"></span></button>';
         }
         $html .= '</h3>';
@@ -43,7 +45,7 @@ class Evenement
         $html .= '<div class="panel panel-default">';
         $html .= '<div class="panel-heading">';
         $html .= '<h4 class="panel-title">Description';
-        if (in_array('modifier', $droits)) {
+        if ($this->p_modifier()) {
             $html .= ' <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span></button>';
         }
         $html .= '</h4>';
@@ -54,9 +56,12 @@ class Evenement
         $html .= '</p>';
         // $html .= '<hr/>';
         $html .= '<p>';
-        $html .= 'Durée : '.$this->duree.' minutes <br/>';
+        $heures = floor($this->duree/3600);
+        $minutes = floor($this->duree%3600/60);
+        $secondes = floor($this->duree%3600%60);
+        $html .= 'Durée : '.($heures > 0 ? $heures.' heure'.($heures > 1 ? 's' : '').' ' : '').($minutes > 0 ? $minutes.' minute'.($minutes > 1 ? 's' : '').' ' : '').($secondes > 0 ? $secondes.' seconde'.($secondes > 1 ? 's' : '').' ' : '').'<br/>';
         if ($this->valide) {
-            $html .= 'Date : '.date('c', $this->valide).'<br/>';
+            $html .= 'Date : le '.date('j/m/o', $this->valide).' à '.date('H:i', $this->valide).'<br/>';
         }
         $html .= '</p>';
         if ($this->annule) {
@@ -71,18 +76,23 @@ class Evenement
             $html .= '<div class="panel panel-default">';
             $html .= '<div class="panel-heading">';
             $html .= '<h4 class="panel-title">Dates possibles';
-            if (in_array('proposer', $droits)) {
-                $html .= '<button type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span></button>';
+            if ($this->p_proposer()) {
+                $html .= ' <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span></button>';
             }
             $html .= '</h4>';
             $html .= '</div>';
             $html .= '<div class="panel-body">';
-            $html .= '<ul class="list-group">';
+            $html .= '<div class="list-group">';
+            $time = time();
             foreach ($this->dates as $dateIndex => $date) {
-                $html .= '<li class="list-group-item">'.date('c', $date).' (6 <span class="glyphicon glyphicon-user"></span>)</li>';
+                $html .= '<a href="#"class="list-group-item';
+                if ($date < $time) {
+                    $html .= ' disabled';
+                }
+                $html .= '">Le '.date('j/m/o', $date).' à '.date('H:i', $date).' ('.$this->datesVotes[$dateIndex].' <span class="glyphicon glyphicon-user"></span>)</a>';
             }
-            $html .= '</ul>';
-            if (in_array('valider', $droits) && !$this->valide) {
+            $html .= '</div>';
+            if ($this->p_valider()) {
                 $html .= '<p><button type="button" class="btn btn-primary"><span class="glyphicon glyphicon-ok"></span> Valider la date</button></p>';
             }
             $html .= '</div>';
@@ -92,6 +102,107 @@ class Evenement
         $html .= '</li>';
         return $html;
     }
+
+    public function passe() {
+        global $time;
+        if ($this->valide) {
+            return $this->valide+$this->duree < $time;
+        } else {
+            return false;
+        }
+    }
+
+    # p_ : Il est possible de ...
+    function p_annuler() {
+        global $droits;
+        return in_array('annuler', $droits) && !$this->annule && !$this->passe();
+    }
+
+    function p_supprimer() {
+        global $droits;
+        return in_array('supprimer', $droits) && !$this->valide;
+    }
+
+    function p_modifier() {
+        global $droits;
+        return in_array('modifier', $droits);
+    }
+
+    function p_proposer() {
+        global $droits;
+        return in_array('proposer', $droits);
+    }
+
+    function p_valider() {
+        global $droits;
+        return in_array('valider', $droits) && !$this->valide;
+    }
+
+}
+
+# a_ : Récupérer depuis la base de donnée
+function a_evenement() {
+    # DEBUG
+    $test1 = new Evenement;
+    $test1->nom = 'Évènement de test n°1';
+    $test1->valide = time();
+    
+    $test2 = new Evenement;
+    $test2->nom = 'Évènement de test n°2';
+    $test2->valide = time();
+    $test2->annule = true;
+    
+    $test3 = new Evenement;
+    $test3->nom = 'Évènement de test n°3';
+    $test3->dates[] = 1415482197;
+    $test3->datesVotes[] = 42;
+    $test3->dates[] = time();
+    $test3->datesVotes[] = 5;
+    $test3->dates[] = time()+365*24*3600;
+    $test3->datesVotes[] = 1;
+    
+    $test4 = new Evenement;
+    $test4->nom = 'Évènement de test n°4';
+    $test4->dates[] = time();
+    $test4->datesVotes[] = 5;
+    $test4->dates[] = time()+365*24*3600;
+    $test4->datesVotes[] = 1;
+    $test4->dates[] = time();
+    $test4->annule = true;
+
+    $test5 = new Evenement;
+    $test5->nom = 'Évènement de test n°5';
+    $test5->dates[] = time();
+    $test5->datesVotes[] = 0;
+    $test5->supprime = true;
+
+    $test6 = new Evenement;
+    $test6->nom = 'Évènement de test n°6';
+    $test6->valide = 1415452197;
+
+    return array($test1, $test2, $test3, $test4, $test5, $test6);
+}
+
+# Tri des évènements
+$evenements = a_evenement();
+$evenementsPlanifies = array();
+$evenementsAPlanifier = array();
+$evenementsPasses = array();
+
+$time = time();
+
+foreach ($evenements as $evenement) {
+    if (!$evenement->supprime) {
+        if ($evenement->valide) {
+            if ($evenement->passe()) {
+                $evenementsPasses[] = $evenement;
+            } else {
+                $evenementsPlanifies[] = $evenement;
+            }
+        } else {
+            $evenementsAPlanifier[] = $evenement;
+        }
+    }
 }
 
 ?>
@@ -101,17 +212,9 @@ class Evenement
 <h2>Plannifiés <button type="button" class="btn btn-primary"><span class="glyphicon glyphicon-plus"></span></button></h2>
 <ul class="list-group">
 <?
-$test1 = new Evenement;
-$test1->dates[] = time();
-$test1->valide = time();
-echo $test1->html()
-?>
-<?
-$test2 = new Evenement;
-$test2->dates[] = time();
-$test2->valide = time();
-$test2->annule = true;
-echo $test2->html()
+foreach ($evenementsPlanifies as $evenement) {
+    echo $evenement->html();
+}
 ?>
 </ul>
 
@@ -119,19 +222,18 @@ echo $test2->html()
 <h2>À plannifier <button type="button" class="btn btn-primary"><span class="glyphicon glyphicon-plus"></span></button></h2>
 <ul class="list-group">
 <?
-$test3 = new Evenement;
-$test3->dates[] = time();
-echo $test3->html()
-?>
-<?
-$test4 = new Evenement;
-$test4->dates[] = time();
-$test4->annule = true;
-echo $test4->html()
+foreach ($evenementsAPlanifier as $evenement) {
+    echo $evenement->html();
+}
 ?>
 </ul>
 
 
 <h2>Évènements passés</h2>
 <ul class="list-group">
+<?
+foreach ($evenementsPasses as $evenement) {
+    echo $evenement->html();
+}
+?>
 </ul>
\ No newline at end of file
--
libgit2 0.21.2