Added save and display of logged events in dashboard

FlorianLeChat · Jun 30, 2023 · c2b0c30 · c2b0c30
1 parent 3fc027e
commit c2b0c30
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/assets/styles/desktop/dashboard.scss b/assets/styles/desktop/dashboard.scss
@@ -252,9 +252,9 @@ main
 		ul
 		{
 			// Liste détaillée.
-			height: 10rem;
 			padding: 0.25rem;
 			overflow: auto;
+			max-height: 13rem;
 
 			li
 			{

diff --git a/src/Controller/ActionsController.php b/src/Controller/ActionsController.php
@@ -6,6 +6,7 @@
 namespace App\Controller;
 
 use App\Entity\User;
+use App\Entity\Event;
 use App\Entity\Server;
 use App\Service\ServerManager;
 use Doctrine\ORM\EntityManagerInterface;
@@ -220,6 +221,14 @@ public function action(Request $request): Response
 				}
 			}
 
+			// On enregistre l'action réalisée dans les événements journalisés.
+			$event = new Event();
+			$event->setServer($server);
+			$event->setDate(new \DateTime());
+			$event->setAction($action);
+
+			$this->entityManager->getRepository(Event::class)->save($event, true);
+
 			// On envoie par la suite la réponse au client.
 			return new Response(
 				$this->translator->trans("global.action_success"),

diff --git a/src/Controller/DashboardController.php b/src/Controller/DashboardController.php
@@ -6,6 +6,7 @@
 namespace App\Controller;
 
 use App\Entity\User;
+use App\Entity\Event;
 use App\Entity\Server;
 use App\Service\ServerManager;
 use Doctrine\ORM\EntityManagerInterface;
@@ -47,6 +48,7 @@ public function index(Request $request): Response
 		//  l'action de l'utilisateur.
 		/** @var User */
 		$user = $this->getUser();
+		$cacheId = intval($request->getSession()->get("serverId", 0));
 		$serverId = intval($request->request->get("id", 0));
 		$repository = $this->entityManager->getRepository(Server::class);
 
@@ -130,7 +132,7 @@ public function index(Request $request): Response
 		return $this->render("dashboard.html.twig", [
 
 			// Récupération de l'historique des actions et commandes.
-			"dashboard_logs" => [],
+			"dashboard_logs" => $this->entityManager->getRepository(Event::class)->findBy(["server" => $cacheId], ["id" => "DESC"], 3),
 
 			// Liste des serveurs depuis la base de données.
 			"dashboard_servers" => $repository->findBy(["client" => $user->getId()])

diff --git a/src/Entity/Contact.php b/src/Entity/Contact.php
@@ -19,7 +19,7 @@ class Contact
 	private ?int $id = null;
 
 	#[ORM\Column(type: Types::DATETIME_MUTABLE)]
-	private ?\DateTimeInterface $timestamp = null;
+	private ?\DateTimeInterface $date = null;
 
 	#[ORM\Column(length: 100)]
 	#[Assert\Email]
@@ -47,14 +47,14 @@ public function getId(): ?int
 		return $this->id;
 	}
 
-	public function getTimestamp(): ?\DateTimeInterface
+	public function getDate(): ?\DateTimeInterface
 	{
-		return $this->timestamp;
+		return $this->date;
 	}
 
-	public function setTimestamp(\DateTimeInterface $timestamp): self
+	public function setDate(\DateTimeInterface $date): self
 	{
-		$this->timestamp = $timestamp;
+		$this->date = $date;
 
 		return $this;
 	}

diff --git a/templates/dashboard.html.twig b/templates/dashboard.html.twig
@@ -152,13 +152,13 @@
 			{% for logs in dashboard_logs %}
 				<li>
 					{# Icône représentative de la tâche #}
-					<i class="bi bi-check-square-fill" data-type="{{ logs["action_type"] }}"></i>
+					<i class="bi bi-check-square-fill" data-type="{{ logs.action }}"></i>
 
 					{# Heure de l'actionnement #}
-					<span>{{ logs["timestamp"]|date("H:m:s (d/m)") }}</span>
+					<span>{{ logs.date|date("H:m:s (d/m)") }}</span>
 
 					{# Titre de l'action #}
-					<em>{{ t("global_" ~ logs["action_type"] ~ "_title")|trans|default(logs["action_type"]|capitalize) }}</em>
+					<em>{{ t("global." ~ logs.action)|trans|default(logs.action|capitalize) }}</em>
 				</li>
 			{% endfor %}
 		</ul>