Merge branch 'Enzo'

lib/common_widget/container/list/volumes_list.dart

@@ -26,7 +26,7 @@ class VolumesList extends StatelessWidget {
             width: media.width * 0.03,
           ),
           ContainerStatsActivities(
-              "${Convertisseur.secondeIntoMinute(volume["durationActiviy"]).toStringAsFixed(2)} m",
+              "${Convertisseur.secondeIntoMinute(volume["durationActiviy"]).toStringAsFixed(0)} min",
               "Temps Total",
               Icons.timer),
           SizedBox(

lib/common_widget/container/workout_row/workout_row.dart

@@ -27,32 +27,33 @@ class WorkoutRow extends StatelessWidget {
                 fit: BoxFit.cover,
               ),
             ),
-
-           const SizedBox(width: 15,),
+            const SizedBox(
+              width: 15,
+            ),
             Expanded(
                 child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
+              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                  Text(
+                Text(
                   wObj["name"].toString(),
                   style: TextStyle(
                       color: TColor.black,
                       fontSize: 15,
                       fontWeight: FontWeight.bold),
                 ),
-
                 Text(
-                  "${ wObj["value"].toString()}",
+                  wObj["value"].toString(),
                   style: TextStyle(
-                      color: TColor.gray,
-                      fontSize: 12,),
+                    color: TColor.gray,
+                    fontSize: 12,
+                  ),
+                ),
+                const SizedBox(
+                  height: 4,
                 ),
-
-               const SizedBox(height: 4,),               
               ],
             )),
-
           ],
         ));
   }
-}
+}

lib/common_widget/container/workout_row/workout_row_walking.dart

@@ -75,7 +75,7 @@ class WorkoutRowWalking extends StatelessWidget {
                           ),
                         ),
                         Text(
-                          "Temps : ${Convertisseur.secondeIntoMinute(wObj["time"]).toStringAsFixed(2)} m",
+                          "Temps : ${Convertisseur.secondeIntoMinute(wObj["time"]).toStringAsFixed(0)} minute",
                           style: TextStyle(
                             color: TColor.black,
                             fontSize: 12,

lib/common_widget/stats.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:smartfit_app_mobile/modele/convertisseur.dart';
 import 'package:smartfit_app_mobile/modele/user.dart';
 import 'package:smartfit_app_mobile/common/colo_extension.dart';
 
@@ -19,10 +20,11 @@ class Stats extends StatelessWidget {
         .activityInfo
         .bpmAvg
         .toString();
-    String time = Provider.of<User>(context, listen: false)
-        .managerSelectedActivity
-        .getTimeAllActivitySelected()
-        .toString();
+    String time = Convertisseur.secondeIntoMinute(
+            Provider.of<User>(context, listen: false)
+                .managerSelectedActivity
+                .getTimeAllActivitySelected())
+        .toStringAsFixed(0);
     return Column(
       children: [
         Padding(
@@ -57,7 +59,7 @@ class Stats extends StatelessWidget {
                 iconBackground: const Color(0xff6131AD),
                 time: '+5s',
                 label: 'Time',
-                value: '$time s',
+                value: '$time min',
               ),
               const SizedBox(width: 15),
               InfoStat(

lib/modele/convertisseur.dart

@@ -12,4 +12,8 @@ class Convertisseur {
   static double msIntoKmh(double metreSeconde) {
     return metreSeconde * 3.6;
   }
+
+  static double millisecondeIntoSeconde(double milliseconde) {
+    return (milliseconde / 1000);
+  }
 }

lib/modele/utile/list_activity/list_activity_utile.dart

@@ -90,8 +90,9 @@ class ListActivityUtile {
     String csvString = const ListToCsvConverter().convert(resultData.item2);
     Uint8List byteCSV = Uint8List.fromList(utf8.encode(csvString));
 
+    /* -- Ne pas décomenter sinon web ne marche plus (Utilisé pour déboguer)
     File x = await File("${await _managerFile.localPath}\\what")
-        .writeAsString(csvString);
+        .writeAsString(csvString);*/
 
     Tuple2<bool, String> result = await api.uploadFileByte(
         token,

lib/view/home/prediction_view.dart

@@ -61,11 +61,13 @@ class _PredictionState extends State<Prediction> {
       if (!resultat.item1) return;
       setState(() {
         lastWorkoutArr[0]["value"] =
-            resultat.item2.timeOfActivity.toStringAsFixed(2);
-        lastWorkoutArr[1]["value"] = resultat.item2.bpmAvg.toStringAsFixed(2);
+            "${Convertisseur.secondeIntoMinute(resultat.item2.timeOfActivity).toStringAsFixed(0)} min";
+        lastWorkoutArr[1]["value"] =
+            "${resultat.item2.bpmAvg.toStringAsFixed(2)} bpm";
         lastWorkoutArr[2]["value"] =
-            resultat.item2.vitesseAvg.toStringAsFixed(2);
-        lastWorkoutArr[3]["value"] = resultat.item2.distance.toStringAsFixed(2);
+            "${Convertisseur.msIntoKmh(resultat.item2.vitesseAvg).toStringAsFixed(1)} km/h ";
+        lastWorkoutArr[3]["value"] =
+            "${resultat.item2.distance.toStringAsFixed(2)} m";
       });
     }
 

lib/view/home/stats_activities_view.dart

@@ -3,6 +3,7 @@ import 'package:provider/provider.dart';
 import 'package:smartfit_app_mobile/common_widget/container/container_stats_activities.dart';
 import 'package:smartfit_app_mobile/common_widget/other/entete_home_view.dart';
 import 'package:smartfit_app_mobile/common/colo_extension.dart';
+import 'package:smartfit_app_mobile/modele/convertisseur.dart';
 import 'package:smartfit_app_mobile/modele/manager_selected_activity.dart';
 import 'package:smartfit_app_mobile/modele/user.dart';
 import 'package:smartfit_app_mobile/modele/utile/home_view/data_home_view.dart';
@@ -83,11 +84,11 @@ class _StatAtivities extends State<StatAtivities> {
     double maxSpeed = context
         .watch<User>()
         .managerSelectedActivity
-        .getMaxAltitudeAllActivitySelected();
+        .getMaxSpeedAllActivitySelected();
     double minSpeed = context
         .watch<User>()
         .managerSelectedActivity
-        .getMinAltitudeAllActivitySelected();
+        .getMinSpeedAllActivitySelected();
 
     return Scaffold(
       backgroundColor: TColor.white,
@@ -139,17 +140,23 @@ class _StatAtivities extends State<StatAtivities> {
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
                     ContainerStatsActivities(
-                        "${avgSpeed.toStringAsFixed(2)} m/s", "Moyenne vitesse", Icons.bolt),
+                        "${Convertisseur.msIntoKmh(avgSpeed).toStringAsFixed(0)} km/h",
+                        "Moyenne vitesse",
+                        Icons.bolt),
                     SizedBox(
                       width: media.width * 0.03,
                     ),
                     ContainerStatsActivities(
-                        "$maxSpeed m/s", "Maximum vitesse", Icons.trending_up),
+                        "${Convertisseur.msIntoKmh(maxSpeed).toStringAsFixed(0)} km/h",
+                        "Maximum vitesse",
+                        Icons.trending_up),
                     SizedBox(
                       width: media.width * 0.03,
                     ),
                     ContainerStatsActivities(
-                        "$minSpeed m/s", "Minimum vitesse", Icons.trending_down)
+                        "${Convertisseur.msIntoKmh(minSpeed).toStringAsFixed(0)} km/h",
+                        "Minimum vitesse",
+                        Icons.trending_down)
                   ],
                 ),
                 SizedBox(
@@ -179,7 +186,9 @@ class _StatAtivities extends State<StatAtivities> {
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
                     ContainerStatsActivities(
-                        "${avgAltitude.toStringAsFixed(2)} m", "Moyenne Altitude", Icons.landscape),
+                        "${avgAltitude.toStringAsFixed(2)} m",
+                        "Moyenne Altitude",
+                        Icons.landscape),
                     SizedBox(
                       width: media.width * 0.03,
                     ),
@@ -214,7 +223,9 @@ class _StatAtivities extends State<StatAtivities> {
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
                     ContainerStatsActivities(
-                        "$totalTime s", "Temps Total", Icons.timer),
+                        "${Convertisseur.secondeIntoMinute(totalTime)} min",
+                        "Temps Total",
+                        Icons.timer),
                     SizedBox(
                       width: media.width * 0.03,
                     ),