From aa7f5b8f5c9546fa5bd7734a6b0b12d1692530db Mon Sep 17 00:00:00 2001 From: Nicolas CARPi Date: Sun, 15 Dec 2019 19:47:49 +0100 Subject: [PATCH] add item_type color as bg color to scheduler events. Fix #1672 --- src/models/Scheduler.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/models/Scheduler.php b/src/models/Scheduler.php index 79cfeba689..590a88901e 100644 --- a/src/models/Scheduler.php +++ b/src/models/Scheduler.php @@ -77,9 +77,11 @@ public function readAllFromTeam(): array // the title of the event is title + Firstname Lastname of the user who booked it $sql = "SELECT team_events.title, team_events.id, team_events.start, team_events.end, team_events.userid, CONCAT('[', items.title, '] ', team_events.title, ' (', u.firstname, ' ', u.lastname, ')') AS title, - items.title AS item_title + items.title AS item_title, + CONCAT('#', items_types.color) AS color FROM team_events LEFT JOIN items ON team_events.item = items.id + LEFT JOIN items_types ON items.category = items_types.id LEFT JOIN users AS u ON team_events.userid = u.userid WHERE team_events.team = :team"; $req = $this->Db->prepare($sql); @@ -104,9 +106,12 @@ public function read(): array { // the title of the event is title + Firstname Lastname of the user who booked it $sql = "SELECT team_events.*, - CONCAT(team_events.title, ' (', u.firstname, ' ', u.lastname, ') ', COALESCE(experiments.title, '')) AS title + CONCAT(team_events.title, ' (', u.firstname, ' ', u.lastname, ') ', COALESCE(experiments.title, '')) AS title, + CONCAT('#', items_types.color) AS color FROM team_events + LEFT JOIN items ON team_events.item = items.id LEFT JOIN experiments ON (experiments.id = team_events.experiment) + LEFT JOIN items_types ON items.category = items_types.id LEFT JOIN users AS u ON team_events.userid = u.userid WHERE team_events.team = :team AND team_events.item = :item"; $req = $this->Db->prepare($sql);