HeartDev
/
Web
7
6
Fork 0
Code Issues 26 Pull Requests Packages Projects 3 Releases Wiki Activity

Résolution bug page Analyse

Browse Source
merged_PLE
Kevin MONTEIRO 1 year ago
parent b1839f15ba
commit aa7de10a99
5 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File

1
Sources/src/app/controller/AthleteController.php
Unescape View File

@ -207,6 +207,7 @@ class AthleteController extends BaseController
'ecartType' => $activity->getStandardDeviation(), 'moyenne' => $activity->getAverage(), 'ecartType' => $activity->getStandardDeviation(), 'moyenne' => $activity->getAverage(),
'max' => $activity->getMaximum(), 'min' => $activity->getMinimum(), 'temperature' => $activity->getAvrTemperature()]; 'max' => $activity->getMaximum(), 'min' => $activity->getMinimum(), 'temperature' => $activity->getAvrTemperature()];
} }
//log::dd($listActivity);
$response = $this->render('./page/activity.html.twig', [ $response = $this->render('./page/activity.html.twig', [
'css' => $this->preference->getCookie(), 'css' => $this->preference->getCookie(),

8
Sources/src/app/views/Templates/page/activity.html.twig
Unescape View File

@ -32,6 +32,7 @@
<th>Maximum</th> <th>Maximum</th>
<th>Minimum</th> <th>Minimum</th>
<th>Temperature moyenne</th> <th>Temperature moyenne</th>
<th>Id Source</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
@ -49,6 +50,7 @@
<th>Maximum</th> <th>Maximum</th>
<th>Minimum</th> <th>Minimum</th>
<th>Temperature moyenne</th> <th>Temperature moyenne</th>
<th>Id Source</th>
</tr><tr></tr> </tr><tr></tr>
</tfoot> </tfoot>
@ -56,8 +58,8 @@
{% for analyze in analyzes %} {% for analyze in analyzes %}
<tr> <tr>
<td>{{analyze.date}}</td> <td>{{analyze.date}}</td>
<td>{{analyze.heureDebut}}</td> <td>{{analyze.heurededebut}}</td>
<td>{{analyze.heureFin}}</td> <td>{{analyze.heuredefin}}</td>
<td>{{analyze.type}}</td> <td>{{analyze.type}}</td>
<td>{{analyze.effortRessenti}}</td> <td>{{analyze.effortRessenti}}</td>
<td>{{analyze.variabilite}}</td> <td>{{analyze.variabilite}}</td>
@ -67,7 +69,7 @@
<td>{{analyze.max}} Bpm</td> <td>{{analyze.max}} Bpm</td>
<td>{{analyze.min}} Bpm</td> <td>{{analyze.min}} Bpm</td>
<td>{{analyze.temperature}} °C</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> <td><a href="/analyze?id={{ analyze.idactivity }}">En savoir plus</a></td>
</tr> </tr>
{% endfor %} {% endfor %}

2
Sources/src/app/views/Templates/page/friend.html.twig
Unescape View File

@ -43,7 +43,7 @@
<img src="/assets/img/person/{{ami.img}}.png" width="35px" height="35px" class="image-ronde"></td> <img src="/assets/img/person/{{ami.img}}.png" width="35px" height="35px" class="image-ronde"></td>
<td>{{ami.nom}}</td> <td>{{ami.nom}}</td>
<td>{{ami.prenom}}</td> <td>{{ami.prenom}}</td>
<td>{{ami.status}}</td> <td>{{ami.username}}</td>
<td> <td>
<div > <div >
<form method="get" action="/mail"> <form method="get" action="/mail">

2
Sources/src/data/core/database/ActivityEntity.php
Unescape View File

@ -18,7 +18,7 @@ class ActivityEntity {
private $temperatureMoyenne; private $temperatureMoyenne;
// Getters // Getters
public function getIdActivity() :int { public function getIdActivity() {
return $this->idActivity; return $this->idActivity;
} }

24
Sources/src/data/core/database/ActivityMapper.php
Unescape View File

@ -13,8 +13,8 @@ class ActivityMapper {
foreach ($data as $activityData) { foreach ($data as $activityData) {
$activity = new ActivityEntity(); $activity = new ActivityEntity();
if (isset($activityData['idactivite'])) { if (isset($activityData['idActivite'])) {
$activity->setIdActivity($activityData['idactivite']); $activity->setIdActivity($activityData['idActivite']);
} }
if (isset($activityData['type'])) { if (isset($activityData['type'])) {
@ -25,16 +25,16 @@ class ActivityMapper {
$activity->setDate($activityData['date']); $activity->setDate($activityData['date']);
} }
if (isset($activityData['heurededebut'])) { if (isset($activityData['heureDeDebut'])) {
$activity->setHeureDebut($activityData['heurededebut']); $activity->setHeureDebut($activityData['heureDeDebut']);
} }
if (isset($activityData['heuredefin'])) { if (isset($activityData['heureDeFin'])) {
$activity->setHeureFin($activityData['heuredefin']); $activity->setHeureFin($activityData['heureDeFin']);
} }
if (isset($activityData['effortressent'])) { if (isset($activityData['effortRessent'])) {
$activity->setEffortRessenti($activityData['effortressent']); $activity->setEffortRessenti($activityData['effortRessent']);
} }
if (isset($activityData['variabilite'])) { if (isset($activityData['variabilite'])) {
@ -45,8 +45,8 @@ class ActivityMapper {
$activity->setVariance($activityData['variance']); $activity->setVariance($activityData['variance']);
} }
if (isset($activityData['ecarttype'])) { if (isset($activityData['ecartType'])) {
$activity->setEcartType($activityData['ecarttype']); $activity->setEcartType($activityData['ecartType']);
} }
if (isset($activityData['moyenne'])) { if (isset($activityData['moyenne'])) {
@ -61,8 +61,8 @@ class ActivityMapper {
$activity->setMinimum($activityData['minimum']); $activity->setMinimum($activityData['minimum']);
} }
if (isset($activityData['temperaturemoyenne'])) { if (isset($activityData['temperatureMoyenne'])) {
$activity->setTemperatureMoyenne($activityData['temperaturemoyenne']); $activity->setTemperatureMoyenne($activityData['temperatureMoyenne']);
} }
$activityEntities[] = $activity; $activityEntities[] = $activity;

Write Preview
Loading…
Cancel
Save