From 20dc01076211d9fca655496bb8919e64c473d978 Mon Sep 17 00:00:00 2001 From: Enzo Date: Fri, 1 Dec 2023 09:01:45 +0100 Subject: [PATCH] coorection de bug --- .../mobile/mobile_bpm_and_speed_by_time.dart | 2 +- lib/modele/manager_file.dart | 2 - lib/modele/manager_selected_activity.dart | 103 +++++----- lib/view/home/stats_activities_view.dart | 176 +++++++++++------- 4 files changed, 169 insertions(+), 114 deletions(-) diff --git a/lib/common_widget/graph/mobile/mobile_bpm_and_speed_by_time.dart b/lib/common_widget/graph/mobile/mobile_bpm_and_speed_by_time.dart index 50725df..3dc8afc 100644 --- a/lib/common_widget/graph/mobile/mobile_bpm_and_speed_by_time.dart +++ b/lib/common_widget/graph/mobile/mobile_bpm_and_speed_by_time.dart @@ -111,7 +111,7 @@ class _MobileGraphBpmAndSpeedByTime titlesData: FlTitlesData( show: true, leftTitles: AxisTitles( - sideTitles: rightTitles, + sideTitles: widget.func.rightTitles, ), topTitles: const AxisTitles(), bottomTitles: AxisTitles( diff --git a/lib/modele/manager_file.dart b/lib/modele/manager_file.dart index 292f32c..b6f52d6 100644 --- a/lib/modele/manager_file.dart +++ b/lib/modele/manager_file.dart @@ -16,7 +16,6 @@ class ManagerFile { final String _fieldTotalCalorie = "total_calories"; final String _fieldTemperature = "temperature"; - // -- Getter field String get fieldTimeStamp => _fieldTimestamp; String get fieldPositionLatitude => _fieldPositionLatitue; @@ -29,7 +28,6 @@ class ManagerFile { String get fieldTotalCalories => _fieldTotalCalorie; String get fieldTemperature => _fieldTemperature; - List allowedFieldWalking = List.empty(growable: true); ManagerFile() { diff --git a/lib/modele/manager_selected_activity.dart b/lib/modele/manager_selected_activity.dart index 40510e8..bc70d85 100644 --- a/lib/modele/manager_selected_activity.dart +++ b/lib/modele/manager_selected_activity.dart @@ -41,7 +41,6 @@ class ManagerSelectedActivity { return true; } - bool _notNull(int indexActivitySelected, int ligne, int colonne) { if (activitySelected[indexActivitySelected].contentActivity[ligne] [colonne] == @@ -139,48 +138,60 @@ class ManagerSelectedActivity { } return somme ~/ nb; } - double getAvgAltitude() { - 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++; - } + + double getAvgAltitude() { + 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++; } } - double average = somme / nb; - return double.parse(average.toStringAsFixed(2)); + } + double average = somme / nb; + return double.parse(average.toStringAsFixed(2)); } - double getAvgTemperature() { - 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.fieldTemperature}"]!)) { - somme += activitySelected[c].contentActivity[i][activitySelected[c] - .enteteCSV["Value_${_managerFile.fieldTemperature}"]!]; - nb++; - } + double getAvgTemperature() { + 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.fieldTemperature}"]!)) { + somme += activitySelected[c].contentActivity[i][activitySelected[c] + .enteteCSV["Value_${_managerFile.fieldTemperature}"]!]; + nb++; } } - double average = somme / nb; - return double.parse(average.toStringAsFixed(2)); } + double average = somme / nb; + return double.parse(average.toStringAsFixed(2)); + } - double getMaxTemperature() { + double getMaxTemperature() { double 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.fieldTemperature}"]!)) { - double valueTmp = activitySelected[c].contentActivity[i] - [activitySelected[c].enteteCSV["Value_${_managerFile.fieldTemperature}"]!]; + if (_notNull( + c, + i, + activitySelected[c] + .enteteCSV["Value_${_managerFile.fieldTemperature}"]!)) { + double valueTmp = activitySelected[c] + .contentActivity[i][activitySelected[c] + .enteteCSV["Value_${_managerFile.fieldTemperature}"]!] + .toDouble(); if (valueTmp > max) { max = valueTmp; } @@ -213,10 +224,6 @@ class ManagerSelectedActivity { return min; } - - - - // -------------------------- FIN BPM ---------------------- // // ---------------------- Distance ---------------------- // @@ -295,20 +302,20 @@ class ManagerSelectedActivity { // ------------------------- Time ----------------------------- // double getTotalTime() { - int timestampMax = 0; - int timestampMin = 0; + int timestampMax = 0; + int timestampMin = 0; - for (int i = 0; i < activitySelected[0].contentActivity.length; i++) { - if (_notNull( - 0, - i, + for (int i = 0; i < activitySelected[0].contentActivity.length; i++) { + if (_notNull( + 0, + i, + activitySelected[0] + .enteteCSV["Value_${_managerFile.fieldTimeStamp}"]!)) { + timestampMin = activitySelected[0].contentActivity[i][ activitySelected[0] - .enteteCSV["Value_${_managerFile.fieldTimeStamp}"]!)) { - timestampMin = activitySelected[0].contentActivity[i][ - activitySelected[0] - .enteteCSV["Value_${_managerFile.fieldTimeStamp}"]!]; - break; - } + .enteteCSV["Value_${_managerFile.fieldTimeStamp}"]!]; + break; + } } for (int i = activitySelected[0].contentActivity.length - 1; i != 0; i--) { diff --git a/lib/view/home/stats_activities_view.dart b/lib/view/home/stats_activities_view.dart index a9916e2..d52934a 100644 --- a/lib/view/home/stats_activities_view.dart +++ b/lib/view/home/stats_activities_view.dart @@ -22,30 +22,39 @@ class _StatAtivities extends State { Widget build(BuildContext context) { var media = MediaQuery.of(context).size; data = HomeViewUtil().initData(context); - int maxBpm = context.watch().managerSelectedActivity.getMaxBpm(); - int avgBpm = context.watch().managerSelectedActivity.getAvgBpm(); - double getTotalDistance = context.watch().managerSelectedActivity.getTotalDistance(); - int totalSteps = context.watch().managerSelectedActivity.getTotalSteps(); - double totalTime = context.watch().managerSelectedActivity.getTotalTime(); - int totalCalories = context.watch().managerSelectedActivity.getCalorie(); - double avgSpeed = context.watch().managerSelectedActivity.getAvgSpeed(); - double avgAltitude = context.watch().managerSelectedActivity.getAvgAltitude(); - double avgTemperature = context.watch().managerSelectedActivity.getAvgTemperature(); - double maxAltitude = context.watch().managerSelectedActivity.getAvgTemperature(); - double maxTemperature = context.watch().managerSelectedActivity.getMaxTemperature(); - double maxSpeed = context.watch().managerSelectedActivity.getMaxSpeed(); - double minSpeed = context.watch().managerSelectedActivity.getMinSpeed(); - double minAltitude = context.watch().managerSelectedActivity.getMinAltitude(); - double minTemperature = context.watch().managerSelectedActivity.getMinTemperature(); - int minBpm = context.watch().managerSelectedActivity.getMinBpm(); - + int maxBpm = context.watch().managerSelectedActivity.getMaxBpm(); + int avgBpm = context.watch().managerSelectedActivity.getAvgBpm(); + double getTotalDistance = + context.watch().managerSelectedActivity.getTotalDistance(); + int totalSteps = + context.watch().managerSelectedActivity.getTotalSteps(); + double totalTime = + context.watch().managerSelectedActivity.getTotalTime(); + int totalCalories = + context.watch().managerSelectedActivity.getCalorie(); + double avgSpeed = + context.watch().managerSelectedActivity.getAvgSpeed(); + double avgAltitude = + context.watch().managerSelectedActivity.getAvgAltitude(); + double avgTemperature = + context.watch().managerSelectedActivity.getAvgTemperature(); + double maxAltitude = + context.watch().managerSelectedActivity.getMaxAltitude(); - print(avgTemperature); - print(avgAltitude); + double maxTemperature = + context.watch().managerSelectedActivity.getMaxTemperature(); - + double maxSpeed = + context.watch().managerSelectedActivity.getMaxSpeed(); + double minSpeed = + context.watch().managerSelectedActivity.getMinSpeed(); + double minAltitude = + context.watch().managerSelectedActivity.getMinAltitude(); + double minTemperature = + context.watch().managerSelectedActivity.getMinTemperature(); + int minBpm = context.watch().managerSelectedActivity.getMinBpm(); return Scaffold( backgroundColor: TColor.white, @@ -73,73 +82,114 @@ class _StatAtivities extends State { SizedBox( height: media.width * 0.03, ), - Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - ContainerStatsActivities("$avgBpm BPM","Moyenne Bpm", Icons.favorite), - SizedBox(width: media.width *0.03,), - ContainerStatsActivities("$maxBpm BPM","Maximum Bpm", Icons.trending_up), - SizedBox(width: media.width *0.03,), - ContainerStatsActivities("$minBpm BPM","Minimum Bpm", Icons.trending_down) - ],), - SizedBox( + ContainerStatsActivities( + "$avgBpm BPM", "Moyenne Bpm", Icons.favorite), + SizedBox( + width: media.width * 0.03, + ), + ContainerStatsActivities( + "$maxBpm BPM", "Maximum Bpm", Icons.trending_up), + SizedBox( + width: media.width * 0.03, + ), + ContainerStatsActivities( + "$minBpm BPM", "Minimum Bpm", Icons.trending_down) + ], + ), + SizedBox( height: media.width * 0.03, ), Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - ContainerStatsActivities("$avgSpeed m/s","Moyenne vitesse", Icons.bolt), - SizedBox(width: media.width *0.03,), - ContainerStatsActivities("$maxSpeed m/s","Maximum vitesse", Icons.trending_up), - SizedBox(width: media.width *0.03,), - ContainerStatsActivities("$minSpeed m/s","Minimum vitesse", Icons.trending_down) - ],), - SizedBox( + ContainerStatsActivities( + "$avgSpeed m/s", "Moyenne vitesse", Icons.bolt), + SizedBox( + width: media.width * 0.03, + ), + ContainerStatsActivities( + "$maxSpeed m/s", "Maximum vitesse", Icons.trending_up), + SizedBox( + width: media.width * 0.03, + ), + ContainerStatsActivities( + "$minSpeed m/s", "Minimum vitesse", Icons.trending_down) + ], + ), + SizedBox( height: media.width * 0.03, ), - - Row( + Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - ContainerStatsActivities("$avgTemperature °C","Moyenne Temperature", Icons.thermostat), - SizedBox(width: media.width *0.03,), - ContainerStatsActivities("$maxTemperature °C","Maximum Temperature", Icons.trending_up), - SizedBox(width: media.width *0.03,), - ContainerStatsActivities("$minTemperature °C","Minimum Temperature", Icons.trending_down) - ],), - SizedBox( + ContainerStatsActivities("$avgTemperature °C", + "Moyenne Temperature", Icons.thermostat), + SizedBox( + width: media.width * 0.03, + ), + ContainerStatsActivities("$maxTemperature °C", + "Maximum Temperature", Icons.trending_up), + SizedBox( + width: media.width * 0.03, + ), + ContainerStatsActivities("$minTemperature °C", + "Minimum Temperature", Icons.trending_down) + ], + ), + SizedBox( height: media.width * 0.03, ), - Row( + Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - ContainerStatsActivities("$avgAltitude m","Moyenne Altitude", Icons.landscape), - SizedBox(width: media.width *0.03,), - ContainerStatsActivities("$maxAltitude m","Maximum Altitude", Icons.trending_up), - SizedBox(width: media.width *0.03,), - ContainerStatsActivities("$minAltitude m","Minimum Altitude", Icons.trending_down) - ],), - SizedBox( + ContainerStatsActivities( + "$avgAltitude m", "Moyenne Altitude", Icons.landscape), + SizedBox( + width: media.width * 0.03, + ), + ContainerStatsActivities("$maxAltitude m", + "Maximum Altitude", Icons.trending_up), + SizedBox( + width: media.width * 0.03, + ), + ContainerStatsActivities("$minAltitude m", + "Minimum Altitude", Icons.trending_down) + ], + ), + SizedBox( height: media.width * 0.03, ), Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - ContainerStatsActivities("$getTotalDistance m","Distance Totale", Icons.double_arrow), - SizedBox(width: media.width *0.03,), - ContainerStatsActivities("$totalSteps","Total Pas", Icons.do_not_step_rounded), - ],), - SizedBox( + ContainerStatsActivities("$getTotalDistance m", + "Distance Totale", Icons.double_arrow), + SizedBox( + width: media.width * 0.03, + ), + ContainerStatsActivities( + "$totalSteps", "Total Pas", Icons.do_not_step_rounded), + ], + ), + SizedBox( height: media.width * 0.03, - ),Row( + ), + Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - ContainerStatsActivities("$totalTime s","Temps Total", Icons.timer), - SizedBox(width: media.width *0.03,), - ContainerStatsActivities("$totalCalories kCal","Calories Dépensées", Icons.local_fire_department), - ],), - SizedBox( + ContainerStatsActivities( + "$totalTime s", "Temps Total", Icons.timer), + SizedBox( + width: media.width * 0.03, + ), + ContainerStatsActivities("$totalCalories kCal", + "Calories Dépensées", Icons.local_fire_department), + ], + ), + SizedBox( height: media.width * 0.03, ), ],