diff --git a/Back-end/src/main/java/com/example/starter/QueryDeleteObject.java b/Back-end/src/main/java/com/example/starter/QueryDeleteObject.java index 5be9f59..97d6b5f 100644 --- a/Back-end/src/main/java/com/example/starter/QueryDeleteObject.java +++ b/Back-end/src/main/java/com/example/starter/QueryDeleteObject.java @@ -78,8 +78,8 @@ public class QueryDeleteObject { .put("id", row.getInteger("id")) .put("object_id", row.getInteger("object_id")) .put("requested_by", row.getInteger("requested_by")) - .put("requested_at", row.getLocalDateTime("requested_at").toString()); // si tu as un champ - // de type timestamp + .put("requested_at", row.getLocalDateTime("requested_at").toString()); + jsonArray.add(json); }); diff --git a/Front-end/src/pages/Admin/AdminObjet.jsx b/Front-end/src/pages/Admin/AdminObjet.jsx index 7979acc..422a5fe 100644 --- a/Front-end/src/pages/Admin/AdminObjet.jsx +++ b/Front-end/src/pages/Admin/AdminObjet.jsx @@ -352,7 +352,7 @@ function AdminObjet() { {deleteRequests.map((request) => ( {request.id} - {request.object_id} + Objet n°{request.object_id} {request.requested_by} {request.request_date} diff --git a/Front-end/src/pages/Admin/Dashboard.jsx b/Front-end/src/pages/Admin/Dashboard.jsx index f0f5f1d..8c0d9c7 100644 --- a/Front-end/src/pages/Admin/Dashboard.jsx +++ b/Front-end/src/pages/Admin/Dashboard.jsx @@ -1,4 +1,4 @@ -import React, { useState,useEffect } from "react"; +import React, { useState, useEffect } from "react"; import Sidebar from "./sidebar.jsx"; import { RadioTower, ArrowRight, BadgePlus, Settings } from "lucide-react"; import { API_BASE_URL } from "../../config.js"; @@ -17,11 +17,7 @@ const exportCSV = () => { const csvContent = "\uFEFF" + [headers, ...rows] - .map((row) => - row - .map((val) => `"${val.replace(/"/g, '""')}"`) - .join(",") - ) + .map((row) => row.map((val) => `"${val.replace(/"/g, '""')}"`).join(",")) .join("\n"); const blob = new Blob([csvContent], { @@ -35,19 +31,18 @@ const exportCSV = () => { link.click(); document.body.removeChild(link); }; - const initialWidgets = [ { id: 1, type: "summary" }, { id: 2, type: "users" }, - { id: 3, type: "reporting" }, + { id: 3, type: "reporting" }, { id: 4, type: "adminobjet" }, { id: 5, type: "objects" }, - { id: 6, type: "requestObject" } + { id: 6, type: "requestObject" }, ]; function Dashboard() { - const [users, setUsers] = useState([]) + const [users, setUsers] = useState([]); const [logs, setLogs] = useState([ { @@ -74,38 +69,10 @@ function Dashboard() { axios.get(`${API_BASE_URL}/demandeSuppression`).then((response) => { setRequestDeleteObject(response.data); - }) + }); }, []); - const [adminObjects, setAdminObjects] = useState([ - { - id: 101, - nom: "Objet A", - description: "Description A", - type: "Type A", - localisation: "Localisation A", - proprietaire: "Propriétaire A", - status: "active", - }, - { - id: 102, - nom: "Objet B", - description: "Description B", - type: "Type B", - localisation: "Localisation B", - proprietaire: "Propriétaire B", - status: "inactive", - }, - { - id: 103, - nom: "Objet C", - description: "Description C", - type: "Type C", - localisation: "Localisation C", - proprietaire: "Propriétaire C", - status: "active", - }, - ]); + const [adminObjects, setAdminObjects] = useState([]); const [manageMode, setManageMode] = useState(false); const [widgets, setWidgets] = useState(initialWidgets); @@ -119,7 +86,7 @@ function Dashboard() { const openAddWidgetModal = () => { setShowAddWidgetModal(true); }; - + const handleWidgetSelection = (widgetType) => { const newWidget = { id: Date.now(), type: widgetType }; setWidgets([...widgets, newWidget]); @@ -131,16 +98,22 @@ function Dashboard() {
-

Dashboard

+

Dashboard

-
{widgets.map((widget) => ( @@ -290,30 +263,37 @@ function Dashboard() {
)} - {widget.type ==="requestObject" && ( + {widget.type === "requestObject" && (
-

Requête suppression objets

+

+ Requête suppression objets +

-
-

Générer des rapports d'utilisation :

-
- +
+

+ Générer des rapports d'utilisation : +

+
+ +
-
- )} {widget.type === "reporting" && (
-

Rapports et Statistiques

+

+ Rapports et Statistiques +

-

Générer des rapports d'utilisation :

+

+ Générer des rapports d'utilisation : +

-
+