Merge remote-tracking branch 'refs/remotes/origin/master'

server-api/api.js

@@ -352,7 +352,7 @@ app.get('/Event/:iduser', (req, res) => {
 
     const iduser = req.params.iduser;
 
-    let sql = 'SELECT * FROM events e where e.iduserreceive = ?';
+    let sql = 'SELECT e.date,e.starttime,e.endtime,e.comment FROM events e where e.iduserreceive = ?';
 
     db.query(sql,[iduser], (err, result) => {
         if (err) throw err;

src/pages/Analyse.js

@@ -132,7 +132,6 @@ const Analyse = () => {
 
     for(let i = 0; i < lineDatas.length; i++)
     {
-        console.log(lineDatas);
         dataH.labels[i] = lineDatas[i].month +"/" +lineDatas[i].year;
         dataH.datasets[0].data[i] = lineDatas[i].total;
     }

src/pages/Calendrier.js

@@ -32,41 +32,37 @@ const localizer = dateFnsLocalizer({
 function Calendrier(){
 
     const [contacts, setContacts] = useState([]);
-    const [events, setEvents] = useState([]);
     const [selectedContact, setSelectedContact] = useState(1);
+    const [allEvents, setAllEvents] = useState([]);
 
-useEffect(() =>{
-    const apiString = '/Contact/' + Session.get("idUser");
-    api.get(apiString).then((response) => {
-        setContacts(response.data);
-        console.log("response.data",response.data);
+    useEffect(() =>{
+        const apiString = '/Contact/' + Session.get("idUser");
+        api.get(apiString).then((response) => {
+            setContacts(response.data);
         setSelectedContact(response.data[0].idcontact)
-    });
-
-    const apiStringEvent = '/Event/' + Session.get("idUser");
-    api.get(apiStringEvent).then((response) => {
-        setEvents(response.data);
-    });
+        });
 
-    events.forEach(event => {
-        const newEvent = { title: event.comment, start: new Date(event.date+" "+event.starttime), end: new Date(event.date+" "+event.endtime) };
-        setAllEvents([...allEvents, newEvent]);
-        console.log("here");
-    });
-}, []);
+        const apiStringEvent = '/Event/' + Session.get("idUser");
+        api.get(apiStringEvent).then((response) => {
+            setAllEvents([]);
+            response.data.forEach(event => {
+                const newEvent = { title: event.comment, start: new Date(event.date+" "+event.starttime), end: new Date(event.date+" "+event.endtime) };
+                setAllEvents(allEvents => [...allEvents, newEvent]);
+            });
+        });
 
+    }, []);
 
     const [theme, setTheme] = useState("light");    
     if (localStorage.getItem('theme') && localStorage.getItem("theme") !== '' && localStorage.getItem("theme") !== theme) {
         setTheme(localStorage.getItem("theme"))
     }
+
     const [titre, setTitre] = useState("");
     const [jour , setJour] = useState(new Date());
     const [heureDebut, setHeureDebut] = useState(new Date());
     const [heureFin, setHeureFin] = useState(new Date());
 
-    const [allEvents, setAllEvents] = useState(events);
-
     function handleAddEvent() {
         const newEvent = { title: titre, start: new Date(jour+" "+heureDebut), end: new Date(jour+" "+heureFin) };
         const newEventBD = { date: jour,starttime: heureDebut,endtime: heureFin,comment: titre, idusersend: Session.get("idUser"),iduserreceive: Session.get("idUser"), idcontact: selectedContact};