diff --git a/lib/common_widget/container/profile/profile_entete.dart b/lib/common_widget/container/profile/profile_entete.dart index 7a73c6b..eb08b6d 100644 --- a/lib/common_widget/container/profile/profile_entete.dart +++ b/lib/common_widget/container/profile/profile_entete.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:smartfit_app_mobile/common/colo_extension.dart'; -import 'package:smartfit_app_mobile/common_widget/button/round_button.dart'; class ProfileEntete extends StatelessWidget { const ProfileEntete(this.username, {super.key}); @@ -45,7 +44,6 @@ class ProfileEntete extends StatelessWidget { ], ), ), - ], ); } diff --git a/lib/modele/manager_selected_activity.dart b/lib/modele/manager_selected_activity.dart index 6aa944a..662923c 100644 --- a/lib/modele/manager_selected_activity.dart +++ b/lib/modele/manager_selected_activity.dart @@ -139,8 +139,27 @@ class ManagerSelectedActivity { } return somme / activitySelected.length; } + // ------------------ Fin Altitude ------------------- // + // ------------------ Denivelé ----------------------- // + + double getTotalDenivelePositifAllActivitySelected() { + double somme = 0; + for (ActivityOfUser activityOfUser in activitySelected) { + somme += activityOfUser.activityInfo.denivelePositif; + } + return somme; + } + + double getTotalDeniveleNegatifAllActivitySelected() { + double somme = 0; + for (ActivityOfUser activityOfUser in activitySelected) { + somme += activityOfUser.activityInfo.denivelePositif; + } + return somme; + } + // ------------------ Fin Denivelé ------------------- // // ------------------ Température -------------------- // int getAvgTemperatureAllActivitySelected() { int somme = 0; diff --git a/lib/modele/user.dart b/lib/modele/user.dart index 59a4b72..a2f3705 100644 --- a/lib/modele/user.dart +++ b/lib/modele/user.dart @@ -52,4 +52,32 @@ class User extends ChangeNotifier { } return totalDevNeg; } + + // ------------ Volume -------------- // + // -------- Last 7 days ----- // + Map getVolumeWhithDuration(Duration timeSoustract) { + List liste = []; + for (ActivityOfUser activityOfUser in listActivity) { + // Si l'activité à commencer après la dateActuelle moins 7 jours + if (activityOfUser.activityInfo.startTime + .isAfter(DateTime.now().subtract(timeSoustract))) { + liste.add(activityOfUser); + } + } + return _getVolume(liste); + } + + Map _getVolume(List listeActivity) { + Map map = {}; + ManagerSelectedActivity managerSelectedActivity = ManagerSelectedActivity(); + managerSelectedActivity.activitySelected = listActivity; + + map["nbActovity"] = managerSelectedActivity.activitySelected.length; + managerSelectedActivity.getTimeAllActivitySelected(); + map["bpmAvg"] = managerSelectedActivity.getBpmAvgAllActivitieSelected(); + map["denivelePositif"] = + managerSelectedActivity.getTotalDenivelePositifAllActivitySelected(); + map["speedAvg"] = managerSelectedActivity.getAvgSpeedAllActivitySelected(); + return map; + } }