Cadoles/schedule
21
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

affichage utilisateur sur calendrier

Browse Source
This commit is contained in:
Matthieu Lamalle
2020-06-18 10:36:09 +02:00
parent 5643360f9d
commit 00fc14c91b
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/schedule-2.0/src/Controller/EventController.php
View File

@@ -417,6 +417,7 @@ class EventController extends AbstractController
"fulldescription" => ($event instanceof Penalty?"ASTREINTE\n":"").strtoupper($event->getTask()->getDisplayname())."\n\n".$event->getDescription(), "fulldescription" => ($event instanceof Penalty?"ASTREINTE\n":"").strtoupper($event->getTask()->getDisplayname())."\n\n".$event->getDescription(),
"description" => $event->getDescription(), "description" => $event->getDescription(),
"userid" => $event->getUser()->getId(), "userid" => $event->getUser()->getId(),
"username" => $event->getUser()->getUsername(),
"taskid" => $event->getTask()->getId(), "taskid" => $event->getTask()->getId(),
"avatar" => "/".$this->getParameter("appAlias")."/uploads/avatar/".$event->getUser()->getAvatar(), "avatar" => "/".$this->getParameter("appAlias")."/uploads/avatar/".$event->getUser()->getAvatar(),
"estimate" => $event->getTask()->getDuration($event->getEnd())." / ".$event->getTask()->getQuantity(), "estimate" => $event->getTask()->getDuration($event->getEnd())." / ".$event->getTask()->getQuantity(),
@@ -446,6 +447,7 @@ class EventController extends AbstractController
"fulldescription" => "Jour Férié", "fulldescription" => "Jour Férié",
"description" => "Jour Férié", "description" => "Jour Férié",
"userid" => null, "userid" => null,
"username" => "",
"taskid" => null, "taskid" => null,
"avatar" => "/".$this->getParameter("appAlias")."/uploads/avatar/".$this->getUser()->getAvatar(), "avatar" => "/".$this->getParameter("appAlias")."/uploads/avatar/".$this->getUser()->getAvatar(),
"estimate" => "", "estimate" => "",

11
src/schedule-2.0/templates/Event/list.html.twig
View File

@@ -21,17 +21,17 @@
.fc-title { .fc-title {
font-weight: bolder; font-weight: bolder;
font-size: 14px; font-size: 12px;
} }
.eventAvatar { .eventAvatar {
width: 40px; width: 20px;
margin: 0px 5px 0px 0px; margin: 0px 5px 0px 0px;
float: left; float: left;
} }
.eventInfo{ .eventInfo{
margin: -18px 5px 0px 0px; margin: -5px 5px 0px 0px;
clear: both; clear: both;
} }
@@ -215,12 +215,15 @@ $(document).ready(function() {
// Rendu d'un évenement // Rendu d'un évenement
function eventRender(info) { function eventRender(info) {
console.log(info.event.extendedProps);
// Récupération des divers élements du rendu event // Récupération des divers élements du rendu event
var content=$(info.el).children('.fc-content'); var content=$(info.el).children('.fc-content');
var title=$(content).children('.fc-title'); var title=$(content).children('.fc-title');
// Ajouter l'avatar // Ajouter l'avatar
content.prepend("<img src="+info.event.extendedProps.avatar+" class='eventAvatar'>"); content.prepend("<img src="+info.event.extendedProps.avatar+" class='eventAvatar'>");
content.append("<span class='eventUser float-left small'>"+info.event.extendedProps.username+"</span>");
var eventInfo=$(content).children('.eventUser');
// Ajout container // Ajout container
content.append("<span class='eventInfo float-right'></span>"); content.append("<span class='eventInfo float-right'></span>");
@@ -232,7 +235,7 @@ function eventRender(info) {
} }
// Ajout estimation // Ajout estimation
eventInfo.append("<span class='eventEstimate float-right'>"+info.event.extendedProps.estimate+"</span>"); eventInfo.append("<span class='eventEstimate float-right small'>"+info.event.extendedProps.estimate+"</span>");
// Description // Description
content.attr("title",info.event.extendedProps.fulldescription); content.attr("title",info.event.extendedProps.fulldescription);