diff --git a/src/schedule-2.0/src/Controller/EventController.php b/src/schedule-2.0/src/Controller/EventController.php
index bc3b5c1..411ba35 100755
--- a/src/schedule-2.0/src/Controller/EventController.php
+++ b/src/schedule-2.0/src/Controller/EventController.php
@@ -417,6 +417,7 @@ class EventController extends AbstractController
"fulldescription" => ($event instanceof Penalty?"ASTREINTE\n":"").strtoupper($event->getTask()->getDisplayname())."\n\n".$event->getDescription(),
"description" => $event->getDescription(),
"userid" => $event->getUser()->getId(),
+ "username" => $event->getUser()->getUsername(),
"taskid" => $event->getTask()->getId(),
"avatar" => "/".$this->getParameter("appAlias")."/uploads/avatar/".$event->getUser()->getAvatar(),
"estimate" => $event->getTask()->getDuration($event->getEnd())." / ".$event->getTask()->getQuantity(),
@@ -446,6 +447,7 @@ class EventController extends AbstractController
"fulldescription" => "Jour Férié",
"description" => "Jour Férié",
"userid" => null,
+ "username" => "",
"taskid" => null,
"avatar" => "/".$this->getParameter("appAlias")."/uploads/avatar/".$this->getUser()->getAvatar(),
"estimate" => "",
diff --git a/src/schedule-2.0/templates/Event/list.html.twig b/src/schedule-2.0/templates/Event/list.html.twig
index 2599c58..4704c81 100644
--- a/src/schedule-2.0/templates/Event/list.html.twig
+++ b/src/schedule-2.0/templates/Event/list.html.twig
@@ -21,17 +21,17 @@
.fc-title {
font-weight: bolder;
- font-size: 14px;
+ font-size: 12px;
}
.eventAvatar {
- width: 40px;
+ width: 20px;
margin: 0px 5px 0px 0px;
float: left;
}
.eventInfo{
- margin: -18px 5px 0px 0px;
+ margin: -5px 5px 0px 0px;
clear: both;
}
@@ -215,12 +215,15 @@ $(document).ready(function() {
// Rendu d'un évenement
function eventRender(info) {
+ console.log(info.event.extendedProps);
// Récupération des divers élements du rendu event
var content=$(info.el).children('.fc-content');
var title=$(content).children('.fc-title');
// Ajouter l'avatar
content.prepend("
");
+ content.append(""+info.event.extendedProps.username+"");
+ var eventInfo=$(content).children('.eventUser');
// Ajout container
content.append("");
@@ -232,7 +235,7 @@ function eventRender(info) {
}
// Ajout estimation
- eventInfo.append(""+info.event.extendedProps.estimate+"");
+ eventInfo.append(""+info.event.extendedProps.estimate+"");
// Description
content.attr("title",info.event.extendedProps.fulldescription);