diff --git a/Stub/compte.txt b/Stub/compte.txt
index d440232..485db0c 100644
--- a/Stub/compte.txt
+++ b/Stub/compte.txt
@@ -4,4 +4,4 @@ enzo@gmail.com
 
 toto
 toto@gmail.com
-1234
\ No newline at end of file
+toto
\ No newline at end of file
diff --git a/lib/common_widget/info.dart b/lib/common_widget/info.dart
index c82720b..ac0ff16 100644
--- a/lib/common_widget/info.dart
+++ b/lib/common_widget/info.dart
@@ -9,7 +9,8 @@ class Info extends StatelessWidget {
   Widget build(BuildContext context) {
     String distance = Provider.of<User>(context, listen: false)
         .listActivity[0]
-        .getTotalDistance();
+        .getTotalDistance()
+        .toString();
 
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceAround,
diff --git a/lib/common_widget/stats.dart b/lib/common_widget/stats.dart
index 1591d68..ec551fa 100644
--- a/lib/common_widget/stats.dart
+++ b/lib/common_widget/stats.dart
@@ -10,15 +10,16 @@ class Stats extends StatelessWidget {
   Widget build(BuildContext context) {
     String calories = Provider.of<User>(context, listen: false)
         .listActivity[0]
-        .getTotalCalorie();
+        .getCalorie()
+        .toString();
     String heartrate = Provider.of<User>(context, listen: false)
         .listActivity[0]
         .getAvgBpm()
         .toString();
     String time = Provider.of<User>(context, listen: false)
         .listActivity[0]
-        .getTotalTime();
-
+        .getTotalTime()
+        .toString();
     return Column(
       children: [
         Padding(
@@ -32,7 +33,7 @@ class Stats extends StatelessWidget {
                   fontWeight: FontWeight.w800,
                 ),
               ),
-              SizedBox(width: 8),
+              const SizedBox(width: 8),
               Icon(
                 Icons.pie_chart_rounded,
                 size: 15,
@@ -49,31 +50,31 @@ class Stats extends StatelessWidget {
               const SizedBox(width: 15),
               InfoStat(
                 icon: Icons.timer,
-                iconColor: Color.fromARGB(255, 255, 255, 255),
-                iconBackground: Color(0xff6131AD),
+                iconColor: const Color.fromARGB(255, 255, 255, 255),
+                iconBackground: const Color(0xff6131AD),
                 time: '+5s',
                 label: 'Time',
-                value: time + ' s',
+                value: '$time s',
               ),
-              SizedBox(width: 15),
+              const SizedBox(width: 15),
               InfoStat(
                 icon: Icons.favorite_outline,
-                iconColor: Color.fromARGB(255, 255, 255, 255),
-                iconBackground: Color(0xff6131AD),
+                iconColor: const Color.fromARGB(255, 255, 255, 255),
+                iconBackground: const Color(0xff6131AD),
                 time: '+5s',
                 label: 'Heart Rate',
-                value: heartrate + " BPM",
+                value: "$heartrate BPM",
               ),
-              SizedBox(width: 15),
+              const SizedBox(width: 15),
               InfoStat(
                 icon: Icons.bolt,
-                iconColor: Color.fromARGB(255, 255, 255, 255),
-                iconBackground: Color(0xff6131AD),
+                iconColor: const Color.fromARGB(255, 255, 255, 255),
+                iconBackground: const Color(0xff6131AD),
                 time: '+5s',
                 label: 'Energy',
-                value: calories + " kCal",
+                value: "$calories kCal",
               ),
-              SizedBox(width: 30),
+              const SizedBox(width: 30),
             ],
           ),
         )
diff --git a/lib/common_widget/steps.dart b/lib/common_widget/steps.dart
index 5bee49f..bbf770f 100644
--- a/lib/common_widget/steps.dart
+++ b/lib/common_widget/steps.dart
@@ -9,7 +9,9 @@ class Steps extends StatelessWidget {
   Widget build(BuildContext context) {
     String steps = Provider.of<User>(context, listen: false)
         .listActivity[0]
-        .getTotalSteps();
+        .getTotalSteps()
+        .toString();
+
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 20),
       child: Column(
diff --git a/lib/main.dart b/lib/main.dart
index 9452bdc..f6fbeb2 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -2,7 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:smartfit_app_mobile/modele/user.dart';
 import 'package:smartfit_app_mobile/common/colo_extension.dart';
+import 'package:smartfit_app_mobile/modele/utile/signup_user.dart';
+import 'package:smartfit_app_mobile/view/login/login_view.dart';
 import 'package:smartfit_app_mobile/view/login/signup_view.dart';
+import 'package:smartfit_app_mobile/view/test/page_test.dart';
 
 void main() {
   runApp(ChangeNotifierProvider(
diff --git a/lib/modele/activity.dart b/lib/modele/activity.dart
index fba97fd..7bb5e17 100644
--- a/lib/modele/activity.dart
+++ b/lib/modele/activity.dart
@@ -1,6 +1,7 @@
 import 'package:fl_chart/fl_chart.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:smartfit_app_mobile/common_widget/graph/graph.dart';
+import 'package:smartfit_app_mobile/modele/manager_file.dart';
 
 class ActivityOfUser {
   // A afficher
@@ -10,14 +11,20 @@ class ActivityOfUser {
   late String _nameFile;
   // ------------ //
   late String _imageName;
-  late List<dynamic> _contentActivity;
-  late int _dataSession;
+  late List<List<dynamic>> _contentActivity;
+  Map<String, int> enteteCSV = {};
+
+  // ManagerFile for the field
+  final ManagerFile _managerFile = ManagerFile();
 
   // -- Getter/Setter -- //
-  List<dynamic> get contentActivity => _contentActivity;
-  set contentActivity(List<dynamic> content) {
+  List<List<dynamic>> get contentActivity => _contentActivity;
+  set contentActivity(List<List<dynamic>> content) {
     _contentActivity = content;
-    _dataSession = getDataSession();
+    for (int i = 0; i < content.first.length; i++) {
+      enteteCSV.addAll({content.first[i]: i});
+    }
+    _contentActivity.removeAt(0);
   }
 
   String get fileUuid => _fileUuid;
@@ -39,268 +46,257 @@ class ActivityOfUser {
     }
   }
 
-  // ----- Retourne l'indice de la ligne qui contient les données de la session -- //
-  int getDataSession() {
-    for (int i = _contentActivity.length - 1; i != 0; i--) {
-      if (_contentActivity[i][0] == "Data" &&
-          _contentActivity[i][2] == "session") {
-        return i;
-      }
+// -- func utile -- //
+  bool notNull(int ligne, int colonne) {
+    if (_contentActivity[ligne][colonne] == "null") {
+      return false;
     }
-    return 0;
+    return true;
   }
 
-  // -----------------  BPM ------------------ //
-  List<FlSpot> getHeartRateWithTime() {
+// ----------------- X WithTime ------------ //
+
+  List<FlSpot> getXWithTime(String field) {
     List<FlSpot> result = List.empty(growable: true);
-    int firtTimeStamp = 0;
-
-    for (List<dynamic> ligne in _contentActivity) {
-      if (ligne[0] == "Data") {
-        if (ligne.length >= 10 && ligne[9] == "heart_rate") {
-          if (firtTimeStamp == 0) {
-            firtTimeStamp = ligne[4];
-          }
-          //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[10]]);
-          result.add(
-              FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[10].toDouble()));
-        } else if (ligne.length >= 16 && ligne[15] == "heart_rate") {
-          if (firtTimeStamp == 0) {
-            firtTimeStamp = ligne[4];
-          }
-          //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[17]]);
-          result.add(
-              FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[16].toDouble()));
+
+    int firstTimestamp = 0;
+
+    for (int i = 0; i < contentActivity.length; i++) {
+      if (notNull(i, enteteCSV["Value_$field"]!)) {
+        if (firstTimestamp == 0) {
+          firstTimestamp = contentActivity[i]
+              [enteteCSV["Value_${_managerFile.fieldTimeStamp}"]!];
         }
+        result.add(FlSpot(
+            (((contentActivity[i][enteteCSV[
+                            "Value_${_managerFile.fieldTimeStamp}"]!]) -
+                        firstTimestamp) ~/
+                    100)
+                .toDouble(),
+            contentActivity[i][enteteCSV["Value_$field"]!].toDouble()));
       }
     }
     return result;
   }
 
+// -----------------  BPM ------------------ //
+
+  // Retourne le BPM Max (Fichier CSV)
   int getMaxBpm() {
-    for (int i = 0; i < _contentActivity[_dataSession].length; i++) {
-      if (_contentActivity[_dataSession][i] == "max_heart_rate") {
-        return _contentActivity[_dataSession][i + 1];
+    int max = 0;
+    for (int i = 0; i < contentActivity.length; i++) {
+      if (notNull(i, enteteCSV["Value_${_managerFile.fielBPM}"]!)) {
+        int valueTmp =
+            contentActivity[i][enteteCSV["Value_${_managerFile.fielBPM}"]!];
+        if (valueTmp > max) {
+          max = valueTmp;
+        }
       }
     }
-    return 0;
+    return max;
   }
 
+// Retourne le BPM Min (Fichier CSV)
   int getMinBpm() {
-    for (int i = 0; i < _contentActivity[_dataSession].length; i++) {
-      if (_contentActivity[_dataSession][i] == "min_heart_rate") {
-        return _contentActivity[_dataSession][i + 1];
+    int min = 300;
+    for (int i = 0; i < contentActivity.length; i++) {
+      if (notNull(i, enteteCSV["Value_${_managerFile.fielBPM}"]!)) {
+        int valueTmp =
+            contentActivity[i][enteteCSV["Value_${_managerFile.fielBPM}"]!];
+        if (valueTmp < min) {
+          min = valueTmp;
+        }
       }
     }
-    return 0;
+    return min;
   }
 
+  // Retourne le BPM avg (Fichier CSV)
   int getAvgBpm() {
-    for (int i = 0; i < _contentActivity[_dataSession].length; i++) {
-      if (_contentActivity[_dataSession][i] == "avg_heart_rate") {
-        return _contentActivity[_dataSession][i + 1];
+    int somme = 0;
+    int nb = 0;
+    for (int i = 0; i < contentActivity.length; i++) {
+      if (notNull(i, enteteCSV["Value_${_managerFile.fielBPM}"]!)) {
+        somme += contentActivity[i][enteteCSV["Value_${_managerFile.fielBPM}"]!]
+            as int;
+        nb++;
       }
     }
-    return 0;
+    return somme ~/ nb;
   }
+
   // -------------------------- FIN BPM ---------------------- //
 
   // ---------------------- Distance ---------------------- //
-  List<FlSpot> getDistanceWithTime() {
-    List<FlSpot> result = List.empty(growable: true);
-    int firtTimeStamp = 0;
 
-    for (List<dynamic> ligne in _contentActivity) {
-      if (ligne.length >= 8 && ligne[0] == "Data" && ligne[6] == "distance") {
-        if (firtTimeStamp == 0) {
-          firtTimeStamp = ligne[4];
+  double getTotalDistance() {
+    double max = 0;
+    for (int i = contentActivity.length - 1; i != 0; i--) {
+      if (notNull(i, enteteCSV["Value_${_managerFile.fieldDistance}"]!)) {
+        double valueTmp = contentActivity[i]
+                [enteteCSV["Value_${_managerFile.fieldDistance}"]!]
+            .toDouble();
+        if (valueTmp > max) {
+          max = valueTmp;
         }
-        //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[7].toInt()]);
-        result
-            .add(FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[7].toDouble()));
       }
     }
-    return result;
-  }
-
-  String getTotalDistance() {
-    for (int i = 0; i < _contentActivity[_dataSession].length; i++) {
-      if (_contentActivity[_dataSession][i] == "total_distance") {
-        return _contentActivity[_dataSession][i + 1].toString();
-      }
-    }
-    return "null";
+    return max;
   }
 
   // ---------------------- FIN Distance ---------------------- //
 
   // ---------------------- Calories ---------------------- //
-  List<FlSpot> getCalories() {
-    List<FlSpot> result = List.empty(growable: true);
-    int firtTimeStamp = 0;
-    for (List<dynamic> ligne in _contentActivity) {
-      if (ligne.length >= 39 &&
-          ligne[0] == "Data" &&
-          ligne[39] == "total_calories") {
-        if (firtTimeStamp == 0) {
-          firtTimeStamp = ligne[4];
-        }
-        //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[7].toInt()]);
-        result.add(
-            FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[40].toDouble()));
+  int getCalorie() {
+    for (int i = contentActivity.length - 1; i != 0; i--) {
+      if (notNull(i, enteteCSV["Value_${_managerFile.fieldTotalCalories}"]!)) {
+        return contentActivity[i]
+            [enteteCSV["Value_${_managerFile.fieldTotalCalories}"]!] as int;
       }
     }
-    return result;
-  }
-
-  String getTotalCalorie() {
-    for (int i = 0; i < _contentActivity[_dataSession].length; i++) {
-      if (_contentActivity[_dataSession][i] == "total_calories") {
-        return _contentActivity[_dataSession][i + 1].toString();
-      }
-    }
-    return "null";
+    return 0;
   }
 
   // ---------------------- FIN Calories ---------------------- //
 
   // ---------------------- Step ------------------------------//
-  String getTotalSteps() {
-    for (int i = 0; i < _contentActivity[_dataSession].length; i++) {
-      if (_contentActivity[_dataSession][i] == "total_strides") {
-        return _contentActivity[_dataSession][i + 1].toString();
+
+  int getTotalSteps() {
+    for (int i = contentActivity.length - 1; i != 0; i--) {
+      if (notNull(i, enteteCSV["Value_${_managerFile.fieldTotalStep}"]!)) {
+        return contentActivity[i]
+                [enteteCSV["Value_${_managerFile.fieldTotalStep}"]!]
+            .toInt();
       }
     }
-    return "null";
+    return 0;
   }
   // ----------------------- FIN Step ------------------------ //
 
   // ------------------------- Time ----------------------------- //
-  String getTotalTime() {
-    for (int i = 0; i < _contentActivity[_dataSession].length; i++) {
-      if (_contentActivity[_dataSession][i] == "total_elapsed_time") {
-        return _contentActivity[_dataSession][i + 1].toString();
+
+  int getTotalTime() {
+    for (int i = contentActivity.length - 1; i != 0; i--) {
+      if (notNull(i, enteteCSV["Value_${_managerFile.fieldTimeStamp}"]!)) {
+        return contentActivity[i]
+            [enteteCSV["Value_${_managerFile.fieldTimeStamp}"]!];
       }
     }
-    return "null";
+    return 0;
   }
   // ---------------------------- FIN time -------------------- //
 
   // ---------------------------------------- Altitude -------------------- //
-  List<FlSpot> getAltitudeWithTime() {
-    List<FlSpot> result = List.empty(growable: true);
-    int firtTimeStamp = 0;
-
-    for (List<dynamic> ligne in _contentActivity) {
-      if (ligne.length >= 14 && ligne[0] == "Data" && ligne[12] == "altitude") {
-        if (firtTimeStamp == 0) {
-          firtTimeStamp = ligne[4];
-        }
-        //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[13].toInt()]);
-        result.add(
-            FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[13].toDouble()));
-      }
-    }
-    return result;
-  }
 
+  // --- Fichier CSV --- //
   double getMaxAltitude() {
-    for (int i = 4; i < _contentActivity[_dataSession].length; i++) {
-      if (_contentActivity[_dataSession][i] == "max_altitude") {
-        return _contentActivity[_dataSession][i + 1];
+    double max = 0;
+    for (int i = 0; i < contentActivity.length; i++) {
+      if (notNull(i, enteteCSV["Value_${_managerFile.fieldAltitude}"]!)) {
+        double valueTmp = contentActivity[i]
+                [enteteCSV["Value_${_managerFile.fieldAltitude}"]!]
+            .toDouble();
+        if (valueTmp > max) {
+          max = valueTmp;
+        }
       }
     }
-    return 0.0;
+    return max;
   }
 
+  // --- Fichier CSV --- //
   double getMinAltitude() {
-    for (int i = 4; i < _contentActivity[_dataSession].length; i++) {
-      if (_contentActivity[_dataSession][i] == "min_altitude") {
-        return _contentActivity[_dataSession][i + 1];
+    double min = 5000;
+    for (int i = 0; i < contentActivity.length; i++) {
+      if (notNull(i, enteteCSV["Value_${_managerFile.fieldAltitude}"]!)) {
+        double valueTmp = contentActivity[i]
+                [enteteCSV["Value_${_managerFile.fieldAltitude}"]!]
+            .toDouble();
+        if (valueTmp < min) {
+          min = valueTmp;
+        }
       }
     }
-    return 0.0;
+    return min;
   }
+
   // -------------------------- FIN altitude ---------------------- //
 
   // -------------------------- Speed  ---------------------- //
 
-  List<FlSpot> getSpeedWithTime() {
-    List<FlSpot> result = List.empty(growable: true);
-    int firtTimeStamp = 0;
-
-    for (List<dynamic> ligne in _contentActivity) {
-      if (ligne[0] == "Data" && ligne[1] == 1) {
-        if (firtTimeStamp == 0) {
-          firtTimeStamp = ligne[4];
-        }
-        result.add(
-            FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[19].toDouble()));
-      }
-      if (ligne[0] == "Data" && ligne[1] == 2) {
-        if (firtTimeStamp == 0) {
-          firtTimeStamp = ligne[4];
-        }
-        result.add(
-            FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[25].toDouble()));
-      }
-    }
-    return result;
-  }
-
+  // -- CSV -- //
   List<DataPoint> getSpeedWithTimeActivity() {
     List<DataPoint> result = List.empty(growable: true);
-    int firtTimeStamp = 0;
-
-    for (List<dynamic> ligne in _contentActivity) {
-      if (ligne[0] == "Data" && ligne[1] == 1) {
-        if (firtTimeStamp == 0) {
-          firtTimeStamp = ligne[4];
+    int firstTimestamp = 0;
+
+    for (int i = 0; i < contentActivity.length; i++) {
+      if (notNull(i, enteteCSV["Value_${_managerFile.fieldTimeStamp}"]!) &&
+          notNull(i, enteteCSV["Value_${_managerFile.fieldSpeed}"]!)) {
+        if (firstTimestamp == 0) {
+          firstTimestamp = contentActivity[i]
+              [enteteCSV["Value_${_managerFile.fieldTimeStamp}"]!];
         }
         result.add(DataPoint(
-          ((ligne[4] - firtTimeStamp) / 100),
-          ligne[19].toDouble(),
-        ));
-      }
-      if (ligne[0] == "Data" && ligne[1] == 2) {
-        if (firtTimeStamp == 0) {
-          firtTimeStamp = ligne[4];
-        }
-        result.add(DataPoint(
-            ((ligne[4] - firtTimeStamp) / 100), ligne[25].toDouble()));
+            (((contentActivity[i][enteteCSV[
+                            "Value_${_managerFile.fieldTimeStamp}"]!]) -
+                        firstTimestamp) ~/
+                    100)
+                .toDouble(),
+            contentActivity[i][enteteCSV["Value_${_managerFile.fieldSpeed}"]!]
+                .toDouble()));
       }
     }
     return result;
   }
 
+  // Retourne la Speed Max (Fichier CSV)
   double getMaxSpeed() {
-    for (int i = 4; i < _contentActivity[_dataSession].length; i++) {
-      if (_contentActivity[_dataSession][i] == "max_speed") {
-        return _contentActivity[_dataSession][i + 1];
+    double max = 0.00;
+    for (int i = 0; i < contentActivity.length; i++) {
+      if (notNull(i, enteteCSV["Value_${_managerFile.fieldSpeed}"]!)) {
+        double valueTmp = contentActivity[i]
+                [enteteCSV["Value_${_managerFile.fieldSpeed}"]!]
+            .toDouble();
+        if (valueTmp > max) {
+          max = valueTmp;
+        }
       }
     }
-    return 0.0;
+    return max;
   }
 
+  // Retourne avg Max (Fichier CSV)
   double getAvgSpeed() {
-    for (int i = 4; i < _contentActivity[_dataSession].length; i++) {
-      if (_contentActivity[_dataSession][i] == "avg_speed") {
-        return _contentActivity[_dataSession][i + 1];
+    double somme = 0;
+    int nb = 0;
+    for (int i = 0; i < contentActivity.length; i++) {
+      if (notNull(i, enteteCSV["Value_${_managerFile.fieldSpeed}"]!)) {
+        somme +=
+            contentActivity[i][enteteCSV["Value_${_managerFile.fieldSpeed}"]!];
+        nb++;
       }
     }
-    return 0.0;
+    return somme / nb;
   }
 
   // -------------------------- FIN Speed  ---------------------- //
 
   // -------------------------- Localisation ------------------- //
 
+  // Retourne les positions (Fichier CSV)
   List<LatLng> getPosition() {
     List<LatLng> list = List.empty(growable: true);
 
-    for (List<dynamic> ligne in _contentActivity) {
-      if (ligne[0] == "Data" && ligne[6] == "position_lat") {
-        list.add(LatLng(ligne[7], ligne[10]));
+    for (int i = 0; i < contentActivity.length; i++) {
+      if (notNull(
+              i, enteteCSV["Value_${_managerFile.fieldPositionLatitude}"]!) &&
+          notNull(
+              i, enteteCSV["Value_${_managerFile.fieldPositionLongitude}"]!)) {
+        list.add(LatLng(
+            contentActivity[i]
+                [enteteCSV["Value_${_managerFile.fieldPositionLatitude}"]!],
+            contentActivity[i]
+                [enteteCSV["Value_${_managerFile.fieldPositionLongitude}"]!]));
       }
     }
     return list;
diff --git a/lib/modele/api/request_api.dart b/lib/modele/api/request_api.dart
index a8ce3c9..b10b3cc 100644
--- a/lib/modele/api/request_api.dart
+++ b/lib/modele/api/request_api.dart
@@ -37,7 +37,8 @@ class RequestApi extends IDataStrategy {
 
   @override
   Future<Tuple2<bool, String>> deleteFile(String token, String fileUuid) async {
-    final response = await http.delete(Uri.parse('$urlApi/user/files'),
+    final response = await http.delete(
+        Uri.parse('$urlApi/user/files/$fileUuid'),
         headers: <String, String>{'Authorization': token});
 
     if (response.statusCode == 200) {
@@ -146,6 +147,7 @@ class RequestApi extends IDataStrategy {
     }
   }
 
+  // -- Priviligié uploadFileByte -- //
   @override
   Future<Tuple2<bool, String>> uploadFile(String token, File file) async {
     String filename = file.path.split('/').last;
diff --git a/lib/modele/manager_file.dart b/lib/modele/manager_file.dart
index a9ee7d2..512c7e4 100644
--- a/lib/modele/manager_file.dart
+++ b/lib/modele/manager_file.dart
@@ -1,11 +1,120 @@
 import 'dart:convert';
-import 'dart:io';
 import 'dart:typed_data';
 import 'package:csv/csv.dart';
 import 'package:fit_tool/fit_tool.dart';
 import 'package:path_provider/path_provider.dart';
 
 class ManagerFile {
+  // -- Field
+  final String _fieldTimestamp = "timestamp";
+  final String _fieldPositionLatitue = "position_lat";
+  final String _fieldPositionLongitude = "position_long";
+  final String _fieldDistance = "distance";
+  final String _fieldBPM = "heart_rate";
+  final String _fieldSpeed = "speed";
+  final String _fieldAltitude = "altitude";
+  final String _fieldTotalStep = "total_strides";
+  final String _fieldTotalCalorie = "total_calories";
+  // -- Getter field
+  String get fieldTimeStamp => _fieldTimestamp;
+  String get fieldPositionLatitude => _fieldPositionLatitue;
+  String get fieldPositionLongitude => _fieldPositionLongitude;
+  String get fieldDistance => _fieldDistance;
+  String get fielBPM => _fieldBPM;
+  String get fieldSpeed => _fieldSpeed;
+  String get fieldAltitude => _fieldAltitude;
+  String get fieldTotalStep => _fieldTotalStep;
+  String get fieldTotalCalories => _fieldTotalCalorie;
+
+  List<String> allowedFieldWalking = List.empty(growable: true);
+
+  ManagerFile() {
+    allowedFieldWalking = [
+      _fieldTimestamp,
+      _fieldPositionLatitue,
+      _fieldPositionLongitude,
+      _fieldDistance,
+      _fieldBPM,
+      _fieldSpeed,
+      _fieldAltitude,
+      _fieldTotalStep,
+      _fieldTotalCalorie
+    ];
+  }
+
+  List<List<String>> convertBytesFitFileIntoCSVList(Uint8List bytes) {
+    FitFile fitFile = FitFile.fromBytes(bytes);
+
+    // ----------- Lire le fit et extarire les données qu'on choisi ----------- //
+    List<Map<String, Map<String, String>>> dataResult =
+        List.empty(growable: true);
+
+    for (Record element in fitFile.records) {
+      List listeField = element.toRow();
+      Map<String, Map<String, String>> ligneDataResult = {};
+      bool skip = true;
+
+      if (listeField[0] != "Data") {
+        continue;
+      }
+
+      for (int i = 0; i < listeField.length;) {
+        if (allowedFieldWalking.contains(listeField[i])) {
+          Map<String, String> tmp = {};
+          tmp["Value"] = listeField[i + 1].toString();
+          tmp["Unite"] = listeField[i + 2].toString();
+          ligneDataResult[listeField[i]] = tmp;
+          i += 2;
+          skip = false;
+        }
+        i += 1;
+      }
+      if (!skip) {
+        dataResult.add(ligneDataResult);
+      }
+    }
+    // -------- FIN ---------- //
+
+    // ------- Création du csv ----- //
+    // --- Création de l'entête -- //
+    List<String> enteteCSV = [];
+    for (String field in allowedFieldWalking) {
+      enteteCSV.add("Value_$field");
+      enteteCSV.add("Unite_$field");
+    }
+
+    List<List<String>> csvData = List.empty(growable: true);
+    //
+    for (Map<String, Map<String, String>> ligne in dataResult) {
+      List<String> tmpLigne = List.empty(growable: true);
+      for (String field in allowedFieldWalking) {
+        if (!ligne.containsKey(field)) {
+          tmpLigne.add("null");
+          tmpLigne.add("null");
+        } else {
+          tmpLigne.add(ligne[field]!["Value"]!);
+          tmpLigne.add(ligne[field]!["Unite"]!);
+        }
+      }
+      csvData.add(tmpLigne);
+    }
+    csvData.insert(0, enteteCSV);
+    // ------- FIN --------------- //
+    return csvData;
+  }
+
+  // -- Read the byte of file CSV -- //
+  List<List<dynamic>> convertByteIntoCSV(Uint8List bytes) {
+    return const CsvToListConverter().convert(utf8.decode(bytes));
+  }
+
+  // ------------- Get The path of application --- //
+  Future<String> get localPath async {
+    final directory = await getApplicationDocumentsDirectory();
+    return directory.path;
+  }
+
+  /*
   // ----- Read csv File ------- //
   Future<List<dynamic>> readCSVFile(String path) async {
     if (File(path).exists() == false) return List.empty();
@@ -16,7 +125,7 @@ class ManagerFile {
         .toList();
     return fields;
   }
-
+  
   // ----- Read a file FIT  --- //
   Future<List<dynamic>> readFitFile(String path) async {
     if (File(path).existsSync() == false) return List.empty();
@@ -37,23 +146,35 @@ class ManagerFile {
   List<dynamic> readFitFileWeb(Uint8List bytes) {
     final fitFile = FitFile.fromBytes(bytes);
     return fitFile.toRows();
-  }
-
-  // ------------- Get The path of application --- //
-  Future<String> get localPath async {
-    final directory = await getApplicationDocumentsDirectory();
-    return directory.path;
-  }
+  }*/
 
+  /*
   // --- A modifier si utilisé --- //
-  Future<bool> writeFile(String nameFileWithExtension, File file) async {
+  Future<bool> saveFileLocal(String nameFileWithExtension, String path) async {
+    /*
     final outFile = File("${await localPath}\\Files\\$nameFileWithExtension");
     if (outFile.existsSync() == false) {
       outFile.createSync(recursive: true);
     }
     await outFile.writeAsString(await file.readAsString());
-    return true;
-  }
+    return true;*/
+  }*/
+  /*
+  // -- Check si le fichier existe localement -- //
+  Future<bool> fileExist(String filname) async {
+    Directory directory = Directory("${await localPath}\\Files\\");
+    if (!directory.existsSync()) {
+      print("Le dossier n'existe pas !");
+      return false;
+    }
+    List<FileSystemEntity> files = directory.listSync();
+    for (FileSystemEntity file in files) {
+      if (file.path.split("\\").last == filname) {
+        return true;
+      }
+    }
+    return false;
+  }*/
 
   // --- Ligne utile --- //
   //final csv = const ListToCsvConverter().convert(fitFile.toRows());
diff --git a/lib/modele/user.dart b/lib/modele/user.dart
index c067711..ce294d8 100644
--- a/lib/modele/user.dart
+++ b/lib/modele/user.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:smartfit_app_mobile/modele/activity.dart';
-import 'package:smartfit_app_mobile/modele/utile/list_activity.dart/list_activity_utile.dart';
+import 'package:smartfit_app_mobile/modele/utile/list_activity/list_activity_utile.dart';
 
 class User extends ChangeNotifier {
   String username = "VOID";
@@ -23,16 +23,4 @@ class User extends ChangeNotifier {
     listActivity.insert(index, activity);
     notifyListeners();
   }
-
-  void insertActivityTopMobile(ActivityOfUser activity, BuildContext context) {
-    listActivity.insert(0, activity);
-    ListActivityUtile().getContentOnTheFirstFileMobile(context);
-    notifyListeners();
-  }
-
-  void insertActivityTopWeb(ActivityOfUser activity, BuildContext context) {
-    listActivity.insert(0, activity);
-    ListActivityUtile().getContentOnTheFirstFileWeb(context);
-    notifyListeners();
-  }
 }
diff --git a/lib/modele/utile/home_view/home_view_util.dart b/lib/modele/utile/home_view/home_view_util.dart
index f6591d5..c909b31 100644
--- a/lib/modele/utile/home_view/home_view_util.dart
+++ b/lib/modele/utile/home_view/home_view_util.dart
@@ -2,16 +2,23 @@ import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:smartfit_app_mobile/modele/activity.dart';
+import 'package:smartfit_app_mobile/modele/manager_file.dart';
 import 'package:smartfit_app_mobile/modele/user.dart';
 import 'package:smartfit_app_mobile/modele/utile/home_view/data_home_view.dart';
 
 class HomeViewUtil {
   DataHomeView initData(BuildContext context) {
-    ActivityOfUser activity = Provider.of<User>(context).listActivity[0];
+    ManagerFile _managerFile = ManagerFile();
 
-    List<FlSpot> bpmSecondes = activity.getHeartRateWithTime();
-    List<FlSpot> vitesseSecondes = activity.getSpeedWithTime();
-    List<FlSpot> altitudeSeconde = activity.getAltitudeWithTime();
+    ActivityOfUser activity = Provider.of<User>(context).listActivity[0];
+    //List<FlSpot> bpmSecondes = activity.getHeartRateWithTime();
+    List<FlSpot> bpmSecondes = activity.getXWithTime(_managerFile.fielBPM);
+    //List<FlSpot> vitesseSecondes = activity.getSpeedWithTime();
+    List<FlSpot> vitesseSecondes =
+        activity.getXWithTime(_managerFile.fieldSpeed);
+    //List<FlSpot> altitudeSeconde = activity.getAltitudeWithTime();
+    List<FlSpot> altitudeSeconde =
+        activity.getXWithTime(_managerFile.fieldAltitude);
 
     List<FlSpot> bpmSecondes2 = List.from(bpmSecondes);
 
diff --git a/lib/modele/utile/list_activity.dart/list_activity_utile.dart b/lib/modele/utile/list_activity.dart/list_activity_utile.dart
deleted file mode 100644
index 23da587..0000000
--- a/lib/modele/utile/list_activity.dart/list_activity_utile.dart
+++ /dev/null
@@ -1,44 +0,0 @@
-import 'dart:io';
-
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:smartfit_app_mobile/modele/api/i_data_strategy.dart';
-import 'package:smartfit_app_mobile/modele/api/request_api.dart';
-import 'package:smartfit_app_mobile/modele/manager_file.dart';
-import 'package:smartfit_app_mobile/modele/user.dart';
-import 'package:tuple/tuple.dart';
-
-class ListActivityUtile {
-  final IDataStrategy _strategy = RequestApi();
-  final ManagerFile _managerFile = ManagerFile();
-
-  Future<void> getContentOnTheFirstFileMobile(BuildContext context) async {
-    Tuple2 result = await _strategy.getFile(
-        Provider.of<User>(context, listen: false).token,
-        Provider.of<User>(context, listen: false).listActivity[0].fileUuid);
-    if (result.item1 == false) {
-      //Erreur
-      //print(result);
-      return;
-    }
-    File file = File(
-        "${await _managerFile.localPath}/${Provider.of<User>(context, listen: false).listActivity[0].nameFile}");
-    await file.create();
-    await file.writeAsBytes(result.item2);
-    Provider.of<User>(context, listen: false).listActivity[0].contentActivity =
-        await _managerFile.readFitFileWhithFile(file);
-  }
-
-  Future<void> getContentOnTheFirstFileWeb(BuildContext context) async {
-    User user = Provider.of<User>(context, listen: false);
-    Tuple2 result =
-        await _strategy.getFile(user.token, user.listActivity[0].fileUuid);
-    if (result.item1 == false) {
-      //Erreur
-      //print(result);
-      return;
-    }
-    Provider.of<User>(context, listen: false).listActivity[0].contentActivity =
-        await _managerFile.readFitFileWeb(result.item2);
-  }
-}
diff --git a/lib/modele/utile/list_activity/list_activity_utile.dart b/lib/modele/utile/list_activity/list_activity_utile.dart
new file mode 100644
index 0000000..0ee8bae
--- /dev/null
+++ b/lib/modele/utile/list_activity/list_activity_utile.dart
@@ -0,0 +1,74 @@
+import 'dart:convert';
+import 'dart:typed_data';
+import 'package:csv/csv.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:smartfit_app_mobile/modele/activity.dart';
+import 'package:smartfit_app_mobile/modele/api/i_data_strategy.dart';
+import 'package:smartfit_app_mobile/modele/api/request_api.dart';
+import 'package:smartfit_app_mobile/modele/manager_file.dart';
+import 'package:smartfit_app_mobile/modele/user.dart';
+import 'package:tuple/tuple.dart';
+
+class ListActivityUtile {
+  final IDataStrategy _strategy = RequestApi();
+  final ManagerFile _managerFile = ManagerFile();
+
+  Future<Tuple2<bool, String>> getContentActivity(BuildContext context) async {
+    Tuple2 result = await _strategy.getFile(
+        Provider.of<User>(context, listen: false).token,
+        Provider.of<User>(context, listen: false).listActivity[0].fileUuid);
+    if (result.item1 == false) {
+      return Tuple2(result.item1, result.item2);
+    }
+    Provider.of<User>(context, listen: false).listActivity[0].contentActivity =
+        List.from(_managerFile.convertByteIntoCSV(result.item2));
+    return const Tuple2(true, "Yeah");
+  }
+
+  Future<Tuple2<bool, String>> getFiles(
+      String token, BuildContext context) async {
+    bool notZero = false;
+    Tuple2 result = await _strategy
+        .getFiles(Provider.of<User>(context, listen: false).token);
+    if (result.item1 == false) {
+      return Tuple2(result.item1, result.item2);
+    }
+
+    for (Map<String, dynamic> element in result.item2) {
+      if (!notZero) {
+        Provider.of<User>(context, listen: false).listActivity.clear();
+        notZero = true;
+      }
+      Provider.of<User>(context, listen: false).addActivity(ActivityOfUser(
+          element["creation_date"].toString(),
+          element["category"].toString(),
+          element["uuid"].toString(),
+          element["filename"].toString()));
+    }
+
+    if (notZero) {
+      await getContentActivity(context);
+    }
+    return const Tuple2(true, "Yeah");
+  }
+
+  Future<Tuple2<bool, String>> addFile(
+      Uint8List bytes, String filename, String token) async {
+    // -- Transormer le fit en CSV
+    List<List<String>> csv = _managerFile.convertBytesFitFileIntoCSVList(bytes);
+    String csvString = const ListToCsvConverter().convert(csv);
+    Uint8List byteCSV = Uint8List.fromList(utf8.encode(csvString));
+    // --- Save Local
+    // --- Api
+    String categoryActivity = filename.split("_").first.toLowerCase();
+    String dateActivity = filename.split("_")[1].split("T").first;
+
+    Tuple2<bool, String> result = await _strategy.uploadFileByte(
+        token, byteCSV, filename, categoryActivity, dateActivity);
+    if (result.item1 == false) {
+      return Tuple2(false, result.item2);
+    }
+    return const Tuple2(true, "Yeah");
+  }
+}
diff --git a/lib/view/activity/mobile/mobile_list_activity.dart b/lib/view/activity/mobile/mobile_list_activity.dart
index 91987cc..3a978e7 100644
--- a/lib/view/activity/mobile/mobile_list_activity.dart
+++ b/lib/view/activity/mobile/mobile_list_activity.dart
@@ -1,5 +1,8 @@
+import 'dart:convert';
 import 'dart:io';
+import 'dart:typed_data';
 
+import 'package:csv/csv.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -7,9 +10,10 @@ import 'package:smartfit_app_mobile/common/colo_extension.dart';
 import 'package:smartfit_app_mobile/modele/activity.dart';
 import 'package:smartfit_app_mobile/modele/api/i_data_strategy.dart';
 import 'package:smartfit_app_mobile/modele/api/request_api.dart';
+import 'package:smartfit_app_mobile/modele/manager_file.dart';
 import 'package:smartfit_app_mobile/modele/user.dart';
 import 'package:smartfit_app_mobile/common_widget/container/workout_row.dart';
-import 'package:smartfit_app_mobile/modele/utile/list_activity.dart/list_activity_utile.dart';
+import 'package:smartfit_app_mobile/modele/utile/list_activity/list_activity_utile.dart';
 import 'package:tuple/tuple.dart';
 
 class MobileListActivity extends StatefulWidget {
@@ -21,8 +25,9 @@ class MobileListActivity extends StatefulWidget {
 
 class _MobileListActivity extends State<MobileListActivity> {
   FilePickerResult? result;
-  final IDataStrategy strategy = RequestApi();
+  final IDataStrategy _strategy = RequestApi();
   final ListActivityUtile _utile = ListActivityUtile();
+  final ManagerFile _managerFile = ManagerFile();
   int firstActivityIndex = 0;
 
   /*
@@ -47,36 +52,29 @@ class _MobileListActivity extends State<MobileListActivity> {
     }
   }*/
 
-  void addFile(String path) async {
-    Tuple2<bool, String> result = await strategy.uploadFile(
-        Provider.of<User>(context, listen: false).token, File(path));
-    if (result.item1 == false) {
-      // Afficher msg d'erreur
-      print("Upload - ${result.item2}");
-      return;
+  Future<bool> deleteFileOnBDD(String token, String fileUuid) async {
+    Tuple2<bool, String> result = await _strategy.deleteFile(token, fileUuid);
+    if (!result.item1) {
+      print(fileUuid);
+      print("msg d'erreur");
+      print(result.item2);
+      return false;
     }
-    getFiles();
+    return true;
   }
 
-  void getFiles() async {
-    Tuple2 result = await strategy
-        .getFiles(Provider.of<User>(context, listen: false).token);
-    if (result.item1 == false) {
-      print("GetFiles - ${result.item2}");
-      // Afficher une message d'erreur
+  void addFileMobile(String path, String token, String filename) async {
+    Tuple2<bool, String> resultAdd =
+        await _utile.addFile(await File(path).readAsBytes(), filename, token);
+    if (!resultAdd.item1) {
+      //print("Message error");
       return;
     }
-    Provider.of<User>(context, listen: false).listActivity.clear();
-
-    for (Map<String, dynamic> element in result.item2) {
-      Provider.of<User>(context, listen: false).addActivity(ActivityOfUser(
-          element["creation_date"].toString(),
-          element["category"].toString(),
-          element["uuid"].toString(),
-          element["filename"].toString()));
+    Tuple2<bool, String> resultGet = await _utile.getFiles(token, context);
+    if (!resultGet.item1) {
+      //print("Message error");
+      return;
     }
-    await _utile.getContentOnTheFirstFileMobile(context);
-    return;
   }
 
   @override
@@ -104,7 +102,9 @@ class _MobileListActivity extends State<MobileListActivity> {
                           fontWeight: FontWeight.w700),
                     ),
                     TextButton(
-                        onPressed: getFiles,
+                        onPressed: () => _utile.getFiles(
+                            Provider.of<User>(context, listen: false).token,
+                            context),
                         child: Text("Get activity",
                             style: TextStyle(
                                 color: TColor.gray,
@@ -115,7 +115,10 @@ class _MobileListActivity extends State<MobileListActivity> {
                         FilePickerResult? result =
                             await FilePicker.platform.pickFiles();
                         if (result != null) {
-                          addFile(result.files.single.path!);
+                          addFileMobile(
+                              result.files.single.path!,
+                              Provider.of<User>(context, listen: false).token,
+                              result.files.single.name);
                         } else {
                           print("Picker");
                           // msg d'erreur
@@ -178,16 +181,21 @@ class _MobileListActivity extends State<MobileListActivity> {
                               },
                               child: WorkoutRow(
                                 wObj: activityMap,
-                                onDelete: () {
-                                  Provider.of<User>(context, listen: false)
-                                      .removeActivity(activityObj);
+                                onDelete: () async {
+                                  if (await deleteFileOnBDD(
+                                      Provider.of<User>(context, listen: false)
+                                          .token,
+                                      activityObj.fileUuid)) {
+                                    Provider.of<User>(context, listen: false)
+                                        .removeActivity(activityObj);
+                                  }
                                 },
                                 onClick: () {
                                   Provider.of<User>(context, listen: false)
                                       .removeActivity(activityObj);
                                   Provider.of<User>(context, listen: false)
-                                      .insertActivityTopMobile(
-                                          activityObj, context);
+                                      .insertActivity(0, activityObj);
+                                  _utile.getContentActivity(context);
                                 },
                                 isFirstActivity: isFirstActivity,
                               ),
diff --git a/lib/view/activity/web/web_list_activity.dart b/lib/view/activity/web/web_list_activity.dart
index 14731ff..8577f5a 100644
--- a/lib/view/activity/web/web_list_activity.dart
+++ b/lib/view/activity/web/web_list_activity.dart
@@ -1,6 +1,7 @@
+import 'dart:io';
 import 'dart:typed_data';
 import 'package:flutter/material.dart';
-import 'package:smartfit_app_mobile/modele/utile/list_activity.dart/list_activity_utile.dart';
+import 'package:smartfit_app_mobile/modele/utile/list_activity/list_activity_utile.dart';
 import 'package:tuple/tuple.dart';
 import 'package:universal_html/html.dart' as html;
 
@@ -9,7 +10,6 @@ import 'package:provider/provider.dart';
 import 'package:smartfit_app_mobile/common/colo_extension.dart';
 import 'package:smartfit_app_mobile/modele/api/i_data_strategy.dart';
 import 'package:smartfit_app_mobile/modele/api/request_api.dart';
-import 'package:smartfit_app_mobile/modele/activity.dart';
 import 'package:smartfit_app_mobile/modele/user.dart';
 import 'package:smartfit_app_mobile/common_widget/container/workout_row.dart';
 
@@ -25,6 +25,8 @@ class _WebListActivityState extends State<WebListActivity> {
   IDataStrategy strategy = RequestApi();
   final ListActivityUtile _utile = ListActivityUtile();
   int firstActivityIndex = 0;
+  final IDataStrategy _strategy = RequestApi();
+
   /*
   void readFile(html.File file) async {
     ManagerFile x = ManagerFile();
@@ -44,60 +46,42 @@ class _WebListActivityState extends State<WebListActivity> {
     });
   }*/
 
-  void addFile(html.File file) async {
+  Future<bool> deleteFileOnBDD(String token, String fileUuid) async {
+    Tuple2<bool, String> result = await _strategy.deleteFile(token, fileUuid);
+    if (!result.item1) {
+      //print(fileUuid);
+      //print("msg d'erreur");
+      //print(result.item2);
+      return false;
+    }
+    return true;
+  }
+
+  void addFileWeb(html.File file, String token) async {
     final reader = html.FileReader();
     reader.readAsArrayBuffer(file);
+
     reader.onLoadEnd.listen((event) async {
       if (reader.readyState == html.FileReader.DONE) {
+        print("donne");
         Uint8List bytes = reader.result as Uint8List;
-
-        String filename = file.name;
-        String categoryActivity = filename.split("_").first.toLowerCase();
-        String dateActivity = filename.split("_")[1].split("T").first;
-
-        Tuple2<bool, String> result = await strategy.uploadFileByte(
-            Provider.of<User>(context, listen: false).token,
-            bytes,
-            filename,
-            categoryActivity,
-            dateActivity);
-
-        if (result.item1 == false) {
-          // Afficher msg d'erreur
-          print("Upload - ${result.item2}");
+        Tuple2<bool, String> resultAdd =
+            await _utile.addFile(bytes, file.name, token);
+        if (!resultAdd.item1) {
+          return;
+        }
+        Tuple2<bool, String> resultGet = await _utile.getFiles(token, context);
+        if (!resultGet.item1) {
+          //print("MessageError");
           return;
         }
-        getFiles();
       }
     });
   }
 
-  // -- On doit garder cet fonction dans la page pour pouvoir afficher les msg -- //
-  void getFiles() async {
-    Tuple2 result = await strategy
-        .getFiles(Provider.of<User>(context, listen: false).token);
-    if (result.item1 == false) {
-      print("GetFiles - ${result.item2}");
-      // Afficher une message d'erreur
-      return;
-    }
-    Provider.of<User>(context, listen: false).listActivity.clear();
-
-    for (Map<String, dynamic> element in result.item2) {
-      Provider.of<User>(context, listen: false).addActivity(ActivityOfUser(
-          element["creation_date"].toString(),
-          element["category"].toString(),
-          element["uuid"].toString(),
-          element["filename"].toString()));
-    }
-    await _utile.getContentOnTheFirstFileWeb(context);
-    return;
-  }
-
   @override
   Widget build(BuildContext context) {
     var media = MediaQuery.of(context).size;
-    print("tttt");
     return Scaffold(
       backgroundColor: TColor.white,
       body: SingleChildScrollView(
@@ -119,7 +103,9 @@ class _WebListActivityState extends State<WebListActivity> {
                           fontWeight: FontWeight.w700),
                     ),
                     TextButton(
-                        onPressed: getFiles,
+                        onPressed: () => _utile.getFiles(
+                            Provider.of<User>(context, listen: false).token,
+                            context),
                         child: Text("Get activity",
                             style: TextStyle(
                                 color: TColor.gray,
@@ -134,7 +120,10 @@ class _WebListActivityState extends State<WebListActivity> {
                         uploadInput.onChange.listen((e) {
                           final files = uploadInput.files;
                           if (files != null && files.isNotEmpty) {
-                            addFile(files[0]); // Lecture du fichier sélectionné
+                            addFileWeb(
+                                files[0],
+                                Provider.of<User>(context, listen: false)
+                                    .token); // Lecture du fichier sélectionné
                           }
                         });
                       },
@@ -194,16 +183,21 @@ class _WebListActivityState extends State<WebListActivity> {
                               },
                               child: WorkoutRow(
                                 wObj: activityMap,
-                                onDelete: () {
-                                  Provider.of<User>(context, listen: false)
-                                      .removeActivity(activityObj);
+                                onDelete: () async {
+                                  if (await deleteFileOnBDD(
+                                      Provider.of<User>(context, listen: false)
+                                          .token,
+                                      activityObj.fileUuid)) {
+                                    Provider.of<User>(context, listen: false)
+                                        .removeActivity(activityObj);
+                                  }
                                 },
                                 onClick: () {
                                   Provider.of<User>(context, listen: false)
                                       .removeActivity(activityObj);
                                   Provider.of<User>(context, listen: false)
-                                      .insertActivityTopWeb(
-                                          activityObj, context);
+                                      .insertActivity(0, activityObj);
+                                  _utile.getContentActivity(context);
                                 },
                                 isFirstActivity: isFirstActivity,
                               ),
diff --git a/lib/view/home/mobile/mobile_homeview.dart b/lib/view/home/mobile/mobile_homeview.dart
index b051c31..e5a79ab 100644
--- a/lib/view/home/mobile/mobile_homeview.dart
+++ b/lib/view/home/mobile/mobile_homeview.dart
@@ -28,6 +28,7 @@ class _MobileHomeView extends State<MobileHomeView> {
     int maxBpm = context.watch<User>().listActivity[0].getMaxBpm();
     int minBpm = context.watch<User>().listActivity[0].getMinBpm();
     int avgBpm = context.watch<User>().listActivity[0].getAvgBpm();
+
     // -- Altitude -- //
     double minAltitude = context.watch<User>().listActivity[0].getMinAltitude();
     double maxAltitude = context.watch<User>().listActivity[0].getMaxAltitude();
@@ -35,7 +36,6 @@ class _MobileHomeView extends State<MobileHomeView> {
     // -- Speed -- //
     double maxSpeed = context.watch<User>().listActivity[0].getMaxSpeed();
     double avgSpeed = context.watch<User>().listActivity[0].getAvgSpeed();
-
     data = HomeViewUtil().initData(context);
 
     return Scaffold(
diff --git a/lib/view/page_test.dart b/lib/view/page_test.dart
deleted file mode 100644
index e0a2ee4..0000000
--- a/lib/view/page_test.dart
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
-import 'dart:convert';
-import 'package:crypto/crypto.dart';
-import 'package:csv/csv.dart';
-import 'package:flutter/material.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:file_picker/file_picker.dart';
-import 'dart:io';
-
-import 'package:smartfit_app_mobile/modele/api/i_data_strategy.dart';
-import 'package:smartfit_app_mobile/modele/api/request_api.dart';
-import 'package:smartfit_app_mobile/modele/manager_file.dart';
-import 'package:tuple/tuple.dart';
-
-// ----------- File --------------- //
-
-// Dossier de l'application
-Future<String> get _localPath async {
-  final directory = await getApplicationDocumentsDirectory();
-  return directory.path;
-}
-
-// Uri du fichier
-Future<File> get _localFile async {
-  final path = await _localPath;
-  return File('$path/counter.txt');
-}
-
-Future<File> writeCounter(int counter) async {
-  final file = await _localFile;
-  // Write the file
-  return file.writeAsString('$counter');
-}
-
-Future<int> readCounter() async {
-  try {
-    final file = await _localFile;
-
-    // Read the file
-    final contents = await file.readAsString();
-
-    return int.parse(contents);
-  } catch (e) {
-    // If encountering an error, return 0
-    return 0;
-  }
-}
-
-String getPlatforme() {
-  if (kIsWeb) {
-    return "Web";
-  }
-  if (Platform.isAndroid) {
-    return "Android";
-  }
-  if (Platform.isWindows) {
-    return "Windows";
-  }
-  if (Platform.isMacOS) {
-    return "MacOS";
-  }
-  return "Null";
-}
-
-// File picker
-
-// ------------------------------------------------- //
-
-class TestPage extends StatefulWidget {
-  const TestPage({Key? key}) : super(key: key);
-
-  @override
-  State<TestPage> createState() => _TestPage();
-}
-
-class _TestPage extends State<TestPage> {
-  // Lire un fichier avec picker
-  FilePickerResult? result;
-  IDataStrategy strategy = RequestApi();
-  String platforme = getPlatforme();
-
-  //late File x = File(file.path);
-  Future<void> readFile() async {
-    ManagerFile x = ManagerFile();
-    PlatformFile t = result!.files.single;
-    String? y = t.path;
-    if (t.path == null) {
-      print("t");
-    } else {
-      List<dynamic> result = await x.readFitFile(y!);
-
-      //print(x.getDistanceWithTime(ActivityOfUser(result)));
-      //print(x.getDistance(ActivityOfUser(result)));
-      //print(x.getAltitudeWithTime(ActivityOfUser(result)));
-      //print(x.getSpeedWithTime(ActivityOfUser(result)));
-      final csv = const ListToCsvConverter().convert(result.cast<List?>());
-      File f = File(await x.localPath + "/fit2.csv");
-      f.createSync();
-      await f.writeAsString(csv);
-    }
-  }
-
-  Future<void> createUser() async {
-    String mds = "1234";
-    var byte = utf8.encode(mds);
-    var digest = sha256.convert(byte);
-    print(digest.toString());
-    print("Appel");
-    Tuple2<bool, String> res =
-        await strategy.postUser("toto@gmail.com", digest.toString(), "toto");
-    print(res.item1);
-    print(res.item2);
-  }
-
-  Future<void> login() async {
-    String mds = "1234";
-    var byte = utf8.encode(mds);
-    var digest = sha256.convert(byte);
-    print(digest.toString());
-    print("Appel");
-    Tuple2<bool, String> res =
-        await strategy.connexion("1234", digest.toString());
-    print(res.item1);
-    print(res.item2);
-  }
-
-  Future<void> deleteUser() async {
-    String token =
-        "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1dWlkIjoiYjA3OThmMjAtN2ZiMy0xMWVlLWJhZmQtMDI0MjBhNWEwMDFmIiwiZXhwIjoxNzA0ODgyNDI3fQ.2_bnvEC7_pwchielF3Kpu9fFtXDv_KabdOU8T07UnWI";
-    print("Appel");
-    Tuple2<bool, String> res = await strategy.deleteUser(token);
-    print(res.item1);
-    print(res.item2);
-  }
-
-  Future<void> getFiles() async {
-    String token =
-        "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1dWlkIjoiOGJiNDdmMDAtODJkNi0xMWVlLTkzMTMtMDI0MjBhNWEwMDFmIiwiZXhwIjoxNzA1MjI4MTUyfQ.9ADC65f2rNI_llytvhA6tX0NM9_O3-2RlwPXqV0yYcI";
-    print("Appel");
-    Tuple2 res = await strategy.getFiles(token);
-    print(res.item1);
-    print(res.item2);
-  }
-
-  Future<void> modifAttribut() async {
-    String nameAtt = "username";
-    String newValue = "toto2";
-    String token =
-        "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1dWlkIjoiOGUyYWVmMTItN2ZiNC0xMWVlLWJhZmQtMDI0MjBhNWEwMDFmIiwiZXhwIjoxNzA0ODgzMDM4fQ.umN7LmUDbKUOeIToLcsOUIioQ7u4wsReHggRDB68VPQ";
-    print("Appel");
-    Tuple2 res = await strategy.modifAttribut(token, nameAtt, newValue);
-    print(res.item1);
-    print(res.item2);
-  }
-
-  Future<void> uploadFile() async {
-    PlatformFile t = result!.files.single;
-    String token =
-        "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1dWlkIjoiOGJiNDdmMDAtODJkNi0xMWVlLTkzMTMtMDI0MjBhNWEwMDFmIiwiZXhwIjoxNzA1MjI4MTUyfQ.9ADC65f2rNI_llytvhA6tX0NM9_O3-2RlwPXqV0yYcI";
-    String? lol = t.path!;
-    print("Appel");
-    Tuple2 res = await strategy.uploadFile(token, File(lol));
-    print(res.item1);
-    print(res.item2);
-  }
-
-  Future<void> getOneFile() async {
-    String ui = "fc6e234c-7fc6-11ee-bafd-02420a5a001f";
-    String token =
-        "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1dWlkIjoiOGUyYWVmMTItN2ZiNC0xMWVlLWJhZmQtMDI0MjBhNWEwMDFmIiwiZXhwIjoxNzA0ODgzOTE3fQ.TUdrGEo7A0auQlUfO5RQm874QWuGXFBSKbJ8qTGPF2M";
-    print("Appel");
-    Tuple2 res = await strategy.getFile(token, ui);
-    print(res.item1);
-    print(res.item2);
-
-    ManagerFile x = ManagerFile();
-    File file = File("${await x.localPath}/Walking_2023-11-08T10_57_28.fit");
-    await file.create();
-    await file.writeAsBytes(res.item2);
-    print(await x.localPath);
-    print("Save");
-
-    print(await x
-        .readFitFile("${await x.localPath}/Walking_2023-11-08T10_57_28.fit"));
-  }
-
-  Future<void> getInfoUser() async {
-    String token =
-        "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1dWlkIjoiOGUyYWVmMTItN2ZiNC0xMWVlLWJhZmQtMDI0MjBhNWEwMDFmIiwiZXhwIjoxNzA0ODgzOTE3fQ.TUdrGEo7A0auQlUfO5RQm874QWuGXFBSKbJ8qTGPF2M";
-    Tuple2 res = await strategy.getInfoUser(token);
-    print(res.item1);
-    print(res.item2);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    User w = context.watch<User>();
-
-    return Scaffold(
-      body: Column(
-        children: [
-          const Text('A random AWESOME idea:'),
-          const Text("User"),
-
-          // ↓ Add this.
-          ElevatedButton(
-            onPressed: () {
-              print('button pressed!');
-            },
-            child: Text('Next'),
-          ),
-          ElevatedButton(
-              onPressed: () async {
-                result = await FilePicker.platform.pickFiles();
-                if (result == null) {
-                  print("No file selected");
-                } else {
-                  for (var element in result!.files) {
-                    print(element.name);
-                  }
-                }
-              },
-              child: const Text("File - ")),
-          ElevatedButton(onPressed: login, child: const Text("Connexion")),
-          ElevatedButton(
-              onPressed: createUser, child: const Text("Create User")),
-          ElevatedButton(
-              onPressed: deleteUser, child: const Text("Delete User")),
-          ElevatedButton(onPressed: readFile, child: const Text("ReadFile")),
-          ElevatedButton(onPressed: getFiles, child: const Text("getFiles")),
-          ElevatedButton(
-              onPressed: modifAttribut, child: const Text("modif attribut")),
-          ElevatedButton(
-              onPressed: uploadFile, child: const Text("Upload File")),
-          ElevatedButton(
-              onPressed: getOneFile, child: const Text("Get One File")),
-          ElevatedButton(
-              onPressed: getInfoUser, child: const Text("Get info User")),
-          Text(platforme),
-          Text(w.email),
-          Text(context.watch<User>().username),
-          Text(Provider.of<User>(context).username)
-        ],
-      ),
-    );
-  }
-}
-
-
-class MyHomePage extends StatefulWidget {
-  const MyHomePage({super.key, required this.title});
-
-  // This widget is the home page of your application. It is stateful, meaning
-  // that it has a State object (defined below) that contains fields that affect
-  // how it looks.
-
-  // This class is the configuration for the state. It holds the values (in this
-  // case the title) provided by the parent (in this case the App widget) and
-  // used by the build method of the State. Fields in a Widget subclass are
-  // always marked "final".
-
-  final String title;
-
-  @override
-  State<MyHomePage> createState() => _MyHomePageState();
-}
-
-class _MyHomePageState extends State<MyHomePage> {
-  int _counter = 0;
-
-  void _incrementCounter() {
-    setState(() {
-      // This call to setState tells the Flutter framework that something has
-      // changed in this State, which causes it to rerun the build method below
-      // so that the display can reflect the updated values. If we changed
-      // _counter without calling setState(), then the build method would not be
-      // called again, and so nothing would appear to happen.
-      _counter++;
-    });
-  }
-
-  void _updateText(String text) {
-    setState(() {
-      test = text;
-    });
-  }
-
-  IDataStrategy tmp = RequestApi();
-  //late Future<String> val = tmp.GetFile("x", "x");
-  late Future<String> val = tmp.test();
-  final TextEditingController _controller = TextEditingController();
-  String test = "Null";
-
-  @override
-  Widget build(BuildContext context) {
-    // This method is rerun every time setState is called, for instance as done
-    // by the _incrementCounter method above.
-    //
-    // The Flutter framework has been optimized to make rerunning build methods
-    // fast, so that you can just rebuild anything that needs updating rather
-    // than having to individually change instances of widgets.
-    return Scaffold(
-      appBar: AppBar(
-        // TRY THIS: Try changing the color here to a specific color (to
-        // Colors.amber, perhaps?) and trigger a hot reload to see the AppBar
-        // change color while the other colors stay the same.
-        backgroundColor: Theme.of(context).colorScheme.inversePrimary,
-        // Here we take the value from the MyHomePage object that was created by
-        // the App.build method, and use it to set our appbar title.
-        title: Text(widget.title),
-      ),
-
-      body: Center(
-        // Center is a layout widget. It takes a single child and positions it
-        // in the middle of the parent.
-        child: Column(
-          // Column is also a layout widget. It takes a list of children and
-          // arranges them vertically. By default, it sizes itself to fit its
-          // children horizontally, and tries to be as tall as its parent.
-          //
-          // Column has various properties to control how it sizes itself and
-          // how it positions its children. Here we use mainAxisAlignment to
-          // center the children vertically; the main axis here is the vertical
-          // axis because Columns are vertical (the cross axis would be
-          // horizontal).
-          //
-          // TRY THIS: Invoke "debug painting" (choose the "Toggle Debug Paint"
-          // action in the IDE, or press "p" in the console), to see the
-          // wireframe for each widget.
-
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            const Text('TEST'),
-            Text(
-              '$_counter',
-              style: Theme.of(context).textTheme.headlineMedium,
-            ),
-            FutureBuilder<String>(
-              future: val,
-              builder: (context, snapshot) {
-                if (snapshot.connectionState == ConnectionState.done) {
-                  if (snapshot.hasData) {
-                    return Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: <Widget>[Text(snapshot.data!)],
-                    );
-                  }
-                } else {
-                  return const Text("FAIL");
-                }
-              },
-            )
-          ],
-        ),
-      ),
-      floatingActionButton: FloatingActionButton(
-        onPressed: _incrementCounter,
-        tooltip: 'Increment',
-        child: const Icon(Icons.add),
-      ), // This trailing comma makes auto-formatting nicer for build methods.
-      body: Container(
-        alignment: Alignment.center,
-        padding: const EdgeInsets.all(8),
-        child: FutureBuilder<String>(
-          future: val,
-          builder: (context, snapshot) {
-            if (snapshot.connectionState == ConnectionState.done) {
-              if (snapshot.hasData) {
-                return Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: <Widget>[
-                    Text(snapshot.data!),
-                    Text(test),
-                    TextField(
-                      controller: _controller,
-                      decoration: const InputDecoration(
-                        hintText: 'Enter Title',
-                      ),
-                    ),
-                    ElevatedButton(
-                      onPressed: () {
-                        _updateText(_controller.text);
-                      },
-                      child: const Text('Update Data'),
-                    ),
-                    ElevatedButton(
-                        onPressed: () {
-                          Navigator.of(context).push(MaterialPageRoute(
-                              builder: (context) => const TestPage()));
-                        },
-                        child: const Text("Changer de page"))
-                  ],
-                );
-              } else if (snapshot.hasError) {
-                return Text('${snapshot.error}');
-              }
-            }
-
-            return const CircularProgressIndicator();
-          },
-        ),
-      ),
-    );
-  }
-}
-*/
\ No newline at end of file
diff --git a/lib/view/test/page_test.dart b/lib/view/test/page_test.dart
index d1e7cfb..86aed19 100644
--- a/lib/view/test/page_test.dart
+++ b/lib/view/test/page_test.dart
@@ -1,6 +1,8 @@
-/*import 'dart:convert';
+import 'dart:convert';
 
 import 'package:crypto/crypto.dart';
+import 'package:csv/csv.dart';
+import 'package:fit_tool/fit_tool.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter/material.dart';
 import 'package:path_provider/path_provider.dart';
@@ -79,6 +81,7 @@ class _TestPage extends State<TestPage> {
   FilePickerResult? result;
   IDataStrategy strategy = RequestApi();
   String platforme = getPlatforme();
+  final ManagerFile _managerFile = ManagerFile();
 
   //late File x = File(file.path);
   Future<void> readFile() async {
@@ -88,13 +91,96 @@ class _TestPage extends State<TestPage> {
     if (t.path == null) {
       print("t");
     } else {
-      List<dynamic> result = await x.readFitFile(y!);
-      print("test11");
-      print(result);
-      print("test22");
-      print(ActivityOfUser(result).getHeartRateWithTime());
-      print("test33");
-      Provider.of<User>(context, listen: false).addActivity(ActivityOfUser(result));
+      File file = File(y!);
+      final content = await file.readAsBytes();
+      FitFile fitFile = FitFile.fromBytes(content);
+      //print(fitFile.toRows());
+      print("--------------");
+      print("--------------");
+      print("--------------");
+
+      print("${await _managerFile.localPath}\\test.csv");
+      final outFile = File("${await _managerFile.localPath}\\test.csv");
+      //final csv = const ListToCsvConverter().convert(fitFile.toRows());
+      //await outFile.writeAsString(csv);
+
+      // ----------- Lire le fit et extarire les données qu'on choisi ----------- //
+      List<Record> liste = fitFile.records;
+      List<String> allowedField = [
+        "timestamp",
+        "position_lat",
+        "position_long",
+        "distance"
+      ];
+      List<Map<String, Map<String, String>>> dataResult =
+          List.empty(growable: true);
+
+      for (Record element in liste) {
+        List listeField = element.toRow();
+        Map<String, Map<String, String>> ligneDataResult = {};
+        bool skip = true;
+
+        if (listeField[0] != "Data") {
+          continue;
+        }
+
+        for (int i = 0; i < listeField.length;) {
+          if (allowedField.contains(listeField[i])) {
+            Map<String, String> tmp = {};
+            tmp["Value"] = listeField[i + 1].toString();
+            tmp["Unite"] = listeField[i + 2].toString();
+            ligneDataResult[listeField[i]] = tmp;
+            i += 2;
+            skip = false;
+          }
+          i += 1;
+        }
+        if (!skip) {
+          dataResult.add(ligneDataResult);
+        }
+      }
+      /*
+      for (var x in dataResult) {
+        print(x["timestamp"]!["Value"]);
+      }*/
+      // -------------------------------- Fin ------------------------- //
+      // ------- Création du csv ----- //
+      // --- Création de l'entête -- //
+      List<String> enteteCSV = [];
+      for (String field in allowedField) {
+        enteteCSV.add("Value_$field");
+        enteteCSV.add("Unite_$field");
+      }
+
+      List<List<String>> csvData = List.empty(growable: true);
+      //
+      for (Map<String, Map<String, String>> ligne in dataResult) {
+        List<String> tmpLigne = List.empty(growable: true);
+        for (String field in allowedField) {
+          if (!ligne.containsKey(field)) {
+            tmpLigne.add("null");
+            tmpLigne.add("null");
+          } else {
+            tmpLigne.add(ligne[field]!["Value"]!);
+            tmpLigne.add(ligne[field]!["Unite"]!);
+          }
+        }
+        csvData.add(tmpLigne);
+      }
+      csvData.insert(0, enteteCSV);
+
+      final csv = const ListToCsvConverter().convert(csvData);
+      await outFile.writeAsString(csv);
+
+      // ------- FIN --------------- //
+
+      //List<dynamic> result = await x.readFitFile(y!);
+      //print("test11");
+      //print(result);
+      //print("test22");
+      //print(ActivityOfUser(result).getHeartRateWithTime());
+      //print("test33");
+      //Provider.of<User>(context, listen: false).addActivity(ActivityOfUser(result));
       //print(x.getDistanceWithTime(ActivityOfUser(result)));
       //print(x.getDistance(ActivityOfUser(result)));
       //print(x.getAltitudeWithTime(ActivityOfUser(result)));
@@ -182,8 +268,8 @@ class _TestPage extends State<TestPage> {
     print(await x.localPath);
     print("Save");
 
-    print(await x
-        .readFitFile("${await x.localPath}/Walking_2023-11-08T10_57_28.fit"));
+    //print(await x
+    //    .readFitFile("${await x.localPath}/Walking_2023-11-08T10_57_28.fit"));
   }
 
   Future<void> getInfoUser() async {
@@ -194,6 +280,10 @@ class _TestPage extends State<TestPage> {
     print(res.item2);
   }
 
+  void lunch() async {
+    //print(await _managerFile.fileExist("lol"));
+  }
+
   @override
   Widget build(BuildContext context) {
     User w = context.watch<User>();
@@ -218,7 +308,7 @@ class _TestPage extends State<TestPage> {
                   print("No file selected");
                 } else {
                   for (var element in result!.files) {
-                    print(element.name);
+                    readFile();
                   }
                 }
               },
@@ -228,8 +318,7 @@ class _TestPage extends State<TestPage> {
               onPressed: createUser, child: const Text("Create User")),
           ElevatedButton(
               onPressed: deleteUser, child: const Text("Delete User")),
-          ElevatedButton(
-              onPressed: readFile, child: const Text("ReadFile")),
+          ElevatedButton(onPressed: () {}, child: const Text("ReadFile")),
           ElevatedButton(onPressed: getFiles, child: const Text("getFiles")),
           ElevatedButton(
               onPressed: modifAttribut, child: const Text("modif attribut")),
@@ -242,7 +331,9 @@ class _TestPage extends State<TestPage> {
           Text(platforme),
           Text(w.email),
           Text(context.watch<User>().username),
-          Text(Provider.of<User>(context).username)
+          Text(Provider.of<User>(context).username),
+          const Text("-----------------------------"),
+          ElevatedButton(onPressed: lunch, child: const Text("Lunch !!")),
         ],
       ),
     );
@@ -410,6 +501,4 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 <<<<<<<< HEAD:lib/view/test/page_test.dart
 }*/
-========
-}
-*/
+