modif

lib/modele/user.dart

@@ -54,7 +54,6 @@ class User extends ChangeNotifier {
   }
 
   // ------------ Volume -------------- //
-  // -------- Last 7 days ----- //
   Map<String, dynamic> getVolumeWhithDuration(Duration timeSoustract) {
     List<ActivityOfUser> liste = [];
     for (ActivityOfUser activityOfUser in listActivity) {
@@ -67,6 +66,10 @@ class User extends ChangeNotifier {
     return _getVolume(liste);
   }
 
+  Map<String, dynamic> getVolumeAllTime() {
+    return _getVolume(listActivity);
+  }
+
   Map<String, dynamic> _getVolume(List<ActivityOfUser> listeActivity) {
     Map<String, dynamic> map = {};
     ManagerSelectedActivity managerSelectedActivity = ManagerSelectedActivity();

lib/view/home/volumes_view.dart

@@ -3,10 +3,8 @@ 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/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';
-import 'package:smartfit_app_mobile/modele/utile/home_view/home_view_util.dart';
 
 class Volumes extends StatefulWidget {
   const Volumes({super.key});
@@ -22,20 +20,15 @@ class _Volumes extends State<Volumes> {
   @override
   Widget build(BuildContext context) {
     var media = MediaQuery.of(context).size;
-    data = HomeViewUtil().initData(context);
+    User user = context.watch<User>();
-    ManagerSelectedActivity managerSelectedActivity =
-        context.watch<User>().managerSelectedActivity;
-
-    // -- BPM -- //
-    int avgBpm = managerSelectedActivity.getBpmAvgAllActivitieSelected();
-
-    // -- Speed -- //
-    String avgSpeed = context
-        .watch<User>()
-        .managerSelectedActivity
-        .getAvgSpeedAllActivitySelected().toStringAsFixed(2);
-
 
+    Map<String, dynamic> volume7Days =
+        user.getVolumeWhithDuration(const Duration(days: 7));
+    Map<String, dynamic> volume1Months =
+        user.getVolumeWhithDuration(const Duration(days: 30));
+    Map<String, dynamic> volume1Year =
+        user.getVolumeWhithDuration(const Duration(days: 366));
+    Map<String, dynamic> volumeAllTime = user.getVolumeAllTime();
 
     return Scaffold(
       backgroundColor: TColor.white,
@@ -65,8 +58,7 @@ class _Volumes extends State<Volumes> {
                 ),
                 SingleChildScrollView(
                   scrollDirection: Axis.horizontal,
-                  child:
+                  child: Row(
-                    Row(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
                       ContainerStatsActivities(
@@ -92,7 +84,8 @@ class _Volumes extends State<Volumes> {
                       ContainerStatsActivities(
                           "?? + m", "Dénivelé Positif", Icons.hiking),
                     ],
-                    ),),
+                  ),
+                ),
                 SizedBox(
                   height: media.width * 0.03,
                 ),
@@ -105,8 +98,7 @@ class _Volumes extends State<Volumes> {
                 ),
                 SingleChildScrollView(
                   scrollDirection: Axis.horizontal,
-                  child:
+                  child: Row(
-                    Row(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
                       ContainerStatsActivities(
@@ -132,7 +124,8 @@ class _Volumes extends State<Volumes> {
                       ContainerStatsActivities(
                           "?? + m", "Dénivelé Positif", Icons.hiking),
                     ],
-                    ),),
+                  ),
+                ),
                 SizedBox(
                   height: media.width * 0.03,
                 ),
@@ -145,8 +138,7 @@ class _Volumes extends State<Volumes> {
                 ),
                 SingleChildScrollView(
                   scrollDirection: Axis.horizontal,
-                  child:
+                  child: Row(
-                    Row(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
                       ContainerStatsActivities(
@@ -172,7 +164,8 @@ class _Volumes extends State<Volumes> {
                       ContainerStatsActivities(
                           "?? + m", "Dénivelé Positif", Icons.hiking),
                     ],
-                    ),),
+                  ),
+                ),
                 SizedBox(
                   height: media.width * 0.03,
                 ),
@@ -185,8 +178,7 @@ class _Volumes extends State<Volumes> {
                 ),
                 SingleChildScrollView(
                   scrollDirection: Axis.horizontal,
-                  child:
+                  child: Row(
-                    Row(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
                       ContainerStatsActivities(
@@ -212,7 +204,8 @@ class _Volumes extends State<Volumes> {
                       ContainerStatsActivities(
                           "?? + m", "Dénivelé Positif", Icons.hiking),
                     ],
-                    ),),
+                  ),
+                ),
                 SizedBox(
                   height: media.width * 0.03,
                 ),