From aa7de10a992dfe580fb98f82f6f4c98e6889a273 Mon Sep 17 00:00:00 2001
From: Kevin Monteiro <Kevin.MONTEIRO@etu.uca.fr>
Date: Wed, 10 Jan 2024 14:05:07 +0100
Subject: [PATCH] =?UTF-8?q?R=C3=A9solution=20bug=20page=20Analyse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/app/controller/AthleteController.php  |  1 +
 .../views/Templates/page/activity.html.twig   |  8 ++++---
 .../app/views/Templates/page/friend.html.twig |  2 +-
 .../src/data/core/database/ActivityEntity.php |  2 +-
 .../src/data/core/database/ActivityMapper.php | 24 +++++++++----------
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/Sources/src/app/controller/AthleteController.php b/Sources/src/app/controller/AthleteController.php
index fd4b99b9..94a02b01 100644
--- a/Sources/src/app/controller/AthleteController.php
+++ b/Sources/src/app/controller/AthleteController.php
@@ -207,6 +207,7 @@ class AthleteController extends BaseController
                     'ecartType' => $activity->getStandardDeviation(), 'moyenne' => $activity->getAverage(),
                     'max' => $activity->getMaximum(), 'min' => $activity->getMinimum(), 'temperature' => $activity->getAvrTemperature()];
             }
+            //log::dd($listActivity);
 
             $response = $this->render('./page/activity.html.twig', [
                 'css' => $this->preference->getCookie(),
diff --git a/Sources/src/app/views/Templates/page/activity.html.twig b/Sources/src/app/views/Templates/page/activity.html.twig
index e14809bc..0d74e925 100644
--- a/Sources/src/app/views/Templates/page/activity.html.twig
+++ b/Sources/src/app/views/Templates/page/activity.html.twig
@@ -32,6 +32,7 @@
                         <th>Maximum</th>
                         <th>Minimum</th>
                         <th>Temperature moyenne</th>
+                        <th>Id Source</th>
                         <th></th>
                     </tr>
                     </thead>
@@ -49,6 +50,7 @@
                         <th>Maximum</th>
                         <th>Minimum</th>
                         <th>Temperature moyenne</th>
+                        <th>Id Source</th>
                     </tr><tr></tr>
 
                     </tfoot>
@@ -56,8 +58,8 @@
                     {% for analyze in analyzes %}
                         <tr>
                             <td>{{analyze.date}}</td>
-                            <td>{{analyze.heureDebut}}</td>
-                            <td>{{analyze.heureFin}}</td>
+                            <td>{{analyze.heurededebut}}</td>
+                            <td>{{analyze.heuredefin}}</td>
                             <td>{{analyze.type}}</td>
                             <td>{{analyze.effortRessenti}}</td>
                             <td>{{analyze.variabilite}}</td>
@@ -67,7 +69,7 @@
                             <td>{{analyze.max}} Bpm</td>
                             <td>{{analyze.min}} Bpm</td>
                             <td>{{analyze.temperature}} °C</td>
-                            <td>{{analyze.idactivity}} °C</td>
+                            <td>{{analyze.idactivite}}</td>
                             <td><a href="/analyze?id={{ analyze.idactivity }}">En savoir plus</a></td>
                         </tr>
                     {% endfor %}
diff --git a/Sources/src/app/views/Templates/page/friend.html.twig b/Sources/src/app/views/Templates/page/friend.html.twig
index 03a5e4b7..a9ca2ac1 100755
--- a/Sources/src/app/views/Templates/page/friend.html.twig
+++ b/Sources/src/app/views/Templates/page/friend.html.twig
@@ -43,7 +43,7 @@
                                                 <img src="/assets/img/person/{{ami.img}}.png" width="35px" height="35px" class="image-ronde"></td>
                                                 <td>{{ami.nom}}</td>
                                                 <td>{{ami.prenom}}</td>
-                                                <td>{{ami.status}}</td>
+                                                <td>{{ami.username}}</td>
                                                 <td>
                                                     <div >
                                                     <form method="get" action="/mail">
diff --git a/Sources/src/data/core/database/ActivityEntity.php b/Sources/src/data/core/database/ActivityEntity.php
index be31539a..7f14956e 100644
--- a/Sources/src/data/core/database/ActivityEntity.php
+++ b/Sources/src/data/core/database/ActivityEntity.php
@@ -18,7 +18,7 @@ class ActivityEntity {
     private $temperatureMoyenne;
 
     // Getters
-    public function getIdActivity() :int {
+    public function getIdActivity() {
         return $this->idActivity;
     }
 
diff --git a/Sources/src/data/core/database/ActivityMapper.php b/Sources/src/data/core/database/ActivityMapper.php
index adad8141..ded83195 100644
--- a/Sources/src/data/core/database/ActivityMapper.php
+++ b/Sources/src/data/core/database/ActivityMapper.php
@@ -13,8 +13,8 @@ class ActivityMapper {
         foreach ($data as $activityData) {
             $activity = new ActivityEntity();
 
-            if (isset($activityData['idactivite'])) {
-                $activity->setIdActivity($activityData['idactivite']);
+            if (isset($activityData['idActivite'])) {
+                $activity->setIdActivity($activityData['idActivite']);
             }
 
             if (isset($activityData['type'])) {
@@ -25,16 +25,16 @@ class ActivityMapper {
                 $activity->setDate($activityData['date']);
             }
 
-            if (isset($activityData['heurededebut'])) {
-                $activity->setHeureDebut($activityData['heurededebut']);
+            if (isset($activityData['heureDeDebut'])) {
+                $activity->setHeureDebut($activityData['heureDeDebut']);
             }
 
-            if (isset($activityData['heuredefin'])) {
-                $activity->setHeureFin($activityData['heuredefin']);
+            if (isset($activityData['heureDeFin'])) {
+                $activity->setHeureFin($activityData['heureDeFin']);
             }
 
-            if (isset($activityData['effortressent'])) {
-                $activity->setEffortRessenti($activityData['effortressent']);
+            if (isset($activityData['effortRessent'])) {
+                $activity->setEffortRessenti($activityData['effortRessent']);
             }
 
             if (isset($activityData['variabilite'])) {
@@ -45,8 +45,8 @@ class ActivityMapper {
                 $activity->setVariance($activityData['variance']);
             }
 
-            if (isset($activityData['ecarttype'])) {
-                $activity->setEcartType($activityData['ecarttype']);
+            if (isset($activityData['ecartType'])) {
+                $activity->setEcartType($activityData['ecartType']);
             }
 
             if (isset($activityData['moyenne'])) {
@@ -61,8 +61,8 @@ class ActivityMapper {
                 $activity->setMinimum($activityData['minimum']);
             }
 
-            if (isset($activityData['temperaturemoyenne'])) {
-                $activity->setTemperatureMoyenne($activityData['temperaturemoyenne']);
+            if (isset($activityData['temperatureMoyenne'])) {
+                $activity->setTemperatureMoyenne($activityData['temperatureMoyenne']);
             }
 
             $activityEntities[] = $activity;