ajout type DateTime

lib/modele/activity_info/activity_info.dart

@@ -7,7 +7,7 @@ class ActivityInfo {
   ActivityInfo();
 
   // -- Time -- // Ne pas calculer (Ligne session)
-  String startTime = "2000-01-01";
+  DateTime startTime = DateTime.now();
   double timeOfActivity = 0.0;
 
   // ----------- BPM ------------ //
@@ -118,7 +118,7 @@ class ActivityInfo {
       return;
     }
     // -- Ligne session -- //
-    startTime = map["startTime"];
+    startTime = DateTime.parse(map["startTime"]);
     timeOfActivity = map["timeOfActivity"].toDouble();
     // -- BPM -- //
     bpmAvg = map["bpmAvg"];
@@ -148,7 +148,7 @@ class ActivityInfo {
       'altitudeMin': altitudeMin,
       'altitudeAvg': altitudeAvg,
       // Ligne session
-      'startTime': startTime,
+      'startTime': startTime.toString(),
       'timeOfActivity': timeOfActivity,
     };
     return jsonEncode(jsonMap);

lib/modele/api/i_data_strategy.dart

@@ -25,7 +25,7 @@ abstract class IDataStrategy {
       Uint8List contentFile,
       String nameFile,
       String category,
-      String date,
+      DateTime date,
       ActivityInfo activityInfo);
 
   // Get one file by id

lib/modele/api/request_api.dart

@@ -192,7 +192,7 @@ class RequestApi implements IDataStrategy {
       Uint8List contentFile,
       String nameFile,
       String category,
-      String date,
+      DateTime date,
       ActivityInfo activityInfo) async {
     final uri = Uri.parse('$urlApi/user/files');
     Map<String, String> headers = {'Authorization': token};
@@ -206,7 +206,7 @@ class RequestApi implements IDataStrategy {
     request.files.add(httpImage);
     request.headers.addAll(headers);
     request.fields["SmartFit_Category"] = category;
-    request.fields["SmartFit_Date"] = date;
+    request.fields["SmartFit_Date"] = date.toString();
     request.fields["info"] = activityInfo.toJson();
 
     final response = await request.send();

lib/modele/manager_file.dart

@@ -140,8 +140,8 @@ class ManagerFile {
 
     // ------ Remplir info avec la ligne session --------- //
     info.startTime = DateTime.fromMillisecondsSinceEpoch(
-            int.parse(_getXfromListe(_startTime, ligneSession)))
-        .toIso8601String();
+        int.parse(_getXfromListe(_startTime, ligneSession)));
+
     info.timeOfActivity =
         double.parse(_getXfromListe(_timeActivity, ligneSession));
     // ----------------------------------------------------- //

lib/modele/manager_selected_activity.dart

@@ -79,27 +79,9 @@ class ManagerSelectedActivity {
     return result;
   }
 
-// -----------------  BPM ------------------ //
-  /*
-  // Retourne le BPM Max (Fichier CSV)
-  int getMaxBpm() {
-    int max = 0;
-    for (int c = 0; c < activitySelected.length; c++) {
-      for (int i = 0; i < activitySelected[c].contentActivity.length; i++) {
-        if (_notNull(c, i,
-            activitySelected[c].enteteCSV["Value_${_managerFile.fielBPM}"]!)) {
-          int valueTmp = activitySelected[c].contentActivity[i]
-              [activitySelected[c].enteteCSV["Value_${_managerFile.fielBPM}"]!];
-          if (valueTmp > max) {
-            max = valueTmp;
-          }
-        }
-      }
-    }
-
-    return max;
-  }*/
+//-------------------------------------------------------------------------------------------//
 
+// -----------------  BPM ------------------ //
   int getBpmMaxAllActivitieSelected() {
     int max = 0;
     for (ActivityOfUser activityOfUser in activitySelected) {
@@ -119,64 +101,47 @@ class ManagerSelectedActivity {
     }
     return min;
   }
-  /*
-// Retourne le BPM Min (Fichier CSV)
-  int getMinBpm() {
-    int min = 300;
 
-    for (int c = 0; c < activitySelected.length; c++) {
-      for (int i = 0; i < activitySelected[c].contentActivity.length; i++) {
-        if (_notNull(c, i,
-            activitySelected[c].enteteCSV["Value_${_managerFile.fielBPM}"]!)) {
-          int valueTmp = activitySelected[c].contentActivity[i]
-              [activitySelected[c].enteteCSV["Value_${_managerFile.fielBPM}"]!];
-          if (valueTmp < min) {
-            min = valueTmp;
-          }
-        }
+  int getBpmAvgAllActivitieSelected() {
+    int somme = 0;
+    for (ActivityOfUser activityOfUser in activitySelected) {
+      somme += activityOfUser.activityInfo.bpmAvg;
+    }
+    return somme ~/ activitySelected.length;
+  }
+
+  // ------------------ Fin BPM ------------------- //
+  // ------------------ Altitude ------------------ //
+  double getMaxAltitudeAllActivitySelected() {
+    double max = 0.0;
+    for (ActivityOfUser activityOfUser in activitySelected) {
+      if (activityOfUser.activityInfo.altitudeMax > max) {
+        max = activityOfUser.activityInfo.altitudeMax;
       }
     }
-    return min;
+    return max;
   }
-  
 
-  // Retourne le BPM avg (Fichier CSV)
-  int getAvgBpm() {
-    int somme = 0;
-    int nb = 0;
-    for (int c = 0; c < activitySelected.length; c++) {
-      for (int i = 0; i < activitySelected[c].contentActivity.length; i++) {
-        if (_notNull(c, i,
-            activitySelected[c].enteteCSV["Value_${_managerFile.fielBPM}"]!)) {
-          somme += activitySelected[c].contentActivity[i][activitySelected[c]
-              .enteteCSV["Value_${_managerFile.fielBPM}"]!] as int;
-          nb++;
-        }
+  double getMinAltitudeAllActivitySelected() {
+    double min = 0.0;
+    for (ActivityOfUser activityOfUser in activitySelected) {
+      if (activityOfUser.activityInfo.altitudeMax < min) {
+        min = activityOfUser.activityInfo.altitudeMin;
       }
     }
-    return somme ~/ nb;
-  }*/
-  /*
-  double getAvgAltitude() {
+    return min;
+  }
+
+  double getAvgAltitudeAllActivitySelected() {
     double somme = 0;
-    int nb = 0;
-    for (int c = 0; c < activitySelected.length; c++) {
-      for (int i = 0; i < activitySelected[c].contentActivity.length; i++) {
-        if (_notNull(
-            c,
-            i,
-            activitySelected[c]
-                .enteteCSV["Value_${_managerFile.fieldAltitude}"]!)) {
-          somme += activitySelected[c].contentActivity[i][activitySelected[c]
-              .enteteCSV["Value_${_managerFile.fieldAltitude}"]!];
-          nb++;
-        }
-      }
+    for (ActivityOfUser activityOfUser in activitySelected) {
+      somme += activityOfUser.activityInfo.altitudeAvg;
     }
-    double average = somme / nb;
-    return double.parse(average.toStringAsFixed(2));
-  }*/
+    return somme / activitySelected.length;
+  }
+  // ------------------ Fin Altitude ------------------- //
 
+  // ----
   double getAvgTemperature() {
     double somme = 0;
     int nb = 0;
@@ -376,26 +341,6 @@ class ManagerSelectedActivity {
     }
     return max;
   }*/
-
-  double getMaxAltitudeAllActivitySelected() {
-    double max = 0.0;
-    for (ActivityOfUser activityOfUser in activitySelected) {
-      if (activityOfUser.activityInfo.altitudeMax > max) {
-        max = activityOfUser.activityInfo.altitudeMax;
-      }
-    }
-    return max;
-  }
-
-  double getMinAltitudeAllActivitySelected() {
-    double min = 0.0;
-    for (ActivityOfUser activityOfUser in activitySelected) {
-      if (activityOfUser.activityInfo.altitudeMax < min) {
-        min = activityOfUser.activityInfo.altitudeMin;
-      }
-    }
-    return min;
-  }
   /*
   // --- Fichier CSV --- //
   double getMinAltitude() {

lib/modele/utile/list_activity/list_activity_utile.dart

@@ -58,10 +58,6 @@ class ListActivityUtile {
           element["uuid"].toString(),
           element["filename"].toString()));
     }
-    /*
-    if (notZero) {
-      await getContentActivity(context);
-    }*/
     return const Tuple2(true, "Yeah");
   }
 

lib/view/home/stats_activities_view.dart

@@ -29,14 +29,16 @@ class _StatAtivities extends State<StatAtivities> {
     // -- BPM -- //
     int maxBpm = managerSelectedActivity.getBpmMaxAllActivitieSelected();
     int minBpm = managerSelectedActivity.getBpmMinAllActivitieSelected();
-    int avgBpm = (minBpm + maxBpm) ~/ 2;
+    int avgBpm = managerSelectedActivity.getBpmAvgAllActivitieSelected();
     // -- Altitude -- //
     double maxAltitude =
         managerSelectedActivity.getMaxAltitudeAllActivitySelected();
     double minAltitude =
         managerSelectedActivity.getMinAltitudeAllActivitySelected();
-    double avgAltitude = (minAltitude + maxAltitude) / 2;
+    double avgAltitude =
+        managerSelectedActivity.getAvgAltitudeAllActivitySelected();
 
+    // ------
     double getTotalDistance =
         context.watch<User>().managerSelectedActivity.getTotalDistance();
     int totalSteps =