coorection de bug
continuous-integration/drone/push Build is passing Details

pull/4/head
Enzo 1 year ago
parent 222a676d73
commit 20dc010762

@ -111,7 +111,7 @@ class _MobileGraphBpmAndSpeedByTime
titlesData: FlTitlesData( titlesData: FlTitlesData(
show: true, show: true,
leftTitles: AxisTitles( leftTitles: AxisTitles(
sideTitles: rightTitles, sideTitles: widget.func.rightTitles,
), ),
topTitles: const AxisTitles(), topTitles: const AxisTitles(),
bottomTitles: AxisTitles( bottomTitles: AxisTitles(

@ -16,7 +16,6 @@ class ManagerFile {
final String _fieldTotalCalorie = "total_calories"; final String _fieldTotalCalorie = "total_calories";
final String _fieldTemperature = "temperature"; final String _fieldTemperature = "temperature";
// -- Getter field // -- Getter field
String get fieldTimeStamp => _fieldTimestamp; String get fieldTimeStamp => _fieldTimestamp;
String get fieldPositionLatitude => _fieldPositionLatitue; String get fieldPositionLatitude => _fieldPositionLatitue;
@ -29,7 +28,6 @@ class ManagerFile {
String get fieldTotalCalories => _fieldTotalCalorie; String get fieldTotalCalories => _fieldTotalCalorie;
String get fieldTemperature => _fieldTemperature; String get fieldTemperature => _fieldTemperature;
List<String> allowedFieldWalking = List.empty(growable: true); List<String> allowedFieldWalking = List.empty(growable: true);
ManagerFile() { ManagerFile() {

@ -41,7 +41,6 @@ class ManagerSelectedActivity {
return true; return true;
} }
bool _notNull(int indexActivitySelected, int ligne, int colonne) { bool _notNull(int indexActivitySelected, int ligne, int colonne) {
if (activitySelected[indexActivitySelected].contentActivity[ligne] if (activitySelected[indexActivitySelected].contentActivity[ligne]
[colonne] == [colonne] ==
@ -139,15 +138,19 @@ class ManagerSelectedActivity {
} }
return somme ~/ nb; return somme ~/ nb;
} }
double getAvgAltitude() { double getAvgAltitude() {
double somme = 0; double somme = 0;
int nb = 0; int nb = 0;
for (int c = 0; c < activitySelected.length; c++) { for (int c = 0; c < activitySelected.length; c++) {
for (int i = 0; i < activitySelected[c].contentActivity.length; i++) { for (int i = 0; i < activitySelected[c].contentActivity.length; i++) {
if (_notNull(c, i, if (_notNull(
activitySelected[c].enteteCSV["Value_${_managerFile.fieldAltitude}"]!)) { c,
i,
activitySelected[c]
.enteteCSV["Value_${_managerFile.fieldAltitude}"]!)) {
somme += activitySelected[c].contentActivity[i][activitySelected[c] somme += activitySelected[c].contentActivity[i][activitySelected[c]
.enteteCSV["Value_${_managerFile.fieldAltitude}"]!] ; .enteteCSV["Value_${_managerFile.fieldAltitude}"]!];
nb++; nb++;
} }
} }
@ -161,8 +164,11 @@ class ManagerSelectedActivity {
int nb = 0; int nb = 0;
for (int c = 0; c < activitySelected.length; c++) { for (int c = 0; c < activitySelected.length; c++) {
for (int i = 0; i < activitySelected[c].contentActivity.length; i++) { for (int i = 0; i < activitySelected[c].contentActivity.length; i++) {
if (_notNull(c, i, if (_notNull(
activitySelected[c].enteteCSV["Value_${_managerFile.fieldTemperature}"]!)) { c,
i,
activitySelected[c]
.enteteCSV["Value_${_managerFile.fieldTemperature}"]!)) {
somme += activitySelected[c].contentActivity[i][activitySelected[c] somme += activitySelected[c].contentActivity[i][activitySelected[c]
.enteteCSV["Value_${_managerFile.fieldTemperature}"]!]; .enteteCSV["Value_${_managerFile.fieldTemperature}"]!];
nb++; nb++;
@ -177,10 +183,15 @@ class ManagerSelectedActivity {
double max = 0; double max = 0;
for (int c = 0; c < activitySelected.length; c++) { for (int c = 0; c < activitySelected.length; c++) {
for (int i = 0; i < activitySelected[c].contentActivity.length; i++) { for (int i = 0; i < activitySelected[c].contentActivity.length; i++) {
if (_notNull(c, i, if (_notNull(
activitySelected[c].enteteCSV["Value_${_managerFile.fieldTemperature}"]!)) { c,
double valueTmp = activitySelected[c].contentActivity[i] i,
[activitySelected[c].enteteCSV["Value_${_managerFile.fieldTemperature}"]!]; activitySelected[c]
.enteteCSV["Value_${_managerFile.fieldTemperature}"]!)) {
double valueTmp = activitySelected[c]
.contentActivity[i][activitySelected[c]
.enteteCSV["Value_${_managerFile.fieldTemperature}"]!]
.toDouble();
if (valueTmp > max) { if (valueTmp > max) {
max = valueTmp; max = valueTmp;
} }
@ -213,10 +224,6 @@ class ManagerSelectedActivity {
return min; return min;
} }
// -------------------------- FIN BPM ---------------------- // // -------------------------- FIN BPM ---------------------- //
// ---------------------- Distance ---------------------- // // ---------------------- Distance ---------------------- //

@ -24,28 +24,37 @@ class _StatAtivities extends State<StatAtivities> {
data = HomeViewUtil().initData(context); data = HomeViewUtil().initData(context);
int maxBpm = context.watch<User>().managerSelectedActivity.getMaxBpm(); int maxBpm = context.watch<User>().managerSelectedActivity.getMaxBpm();
int avgBpm = context.watch<User>().managerSelectedActivity.getAvgBpm(); int avgBpm = context.watch<User>().managerSelectedActivity.getAvgBpm();
double getTotalDistance = context.watch<User>().managerSelectedActivity.getTotalDistance(); double getTotalDistance =
int totalSteps = context.watch<User>().managerSelectedActivity.getTotalSteps(); context.watch<User>().managerSelectedActivity.getTotalDistance();
double totalTime = context.watch<User>().managerSelectedActivity.getTotalTime(); int totalSteps =
int totalCalories = context.watch<User>().managerSelectedActivity.getCalorie(); context.watch<User>().managerSelectedActivity.getTotalSteps();
double avgSpeed = context.watch<User>().managerSelectedActivity.getAvgSpeed(); double totalTime =
double avgAltitude = context.watch<User>().managerSelectedActivity.getAvgAltitude(); context.watch<User>().managerSelectedActivity.getTotalTime();
double avgTemperature = context.watch<User>().managerSelectedActivity.getAvgTemperature(); int totalCalories =
double maxAltitude = context.watch<User>().managerSelectedActivity.getAvgTemperature(); context.watch<User>().managerSelectedActivity.getCalorie();
double maxTemperature = context.watch<User>().managerSelectedActivity.getMaxTemperature(); double avgSpeed =
double maxSpeed = context.watch<User>().managerSelectedActivity.getMaxSpeed(); context.watch<User>().managerSelectedActivity.getAvgSpeed();
double minSpeed = context.watch<User>().managerSelectedActivity.getMinSpeed(); double avgAltitude =
double minAltitude = context.watch<User>().managerSelectedActivity.getMinAltitude(); context.watch<User>().managerSelectedActivity.getAvgAltitude();
double minTemperature = context.watch<User>().managerSelectedActivity.getMinTemperature();
int minBpm = context.watch<User>().managerSelectedActivity.getMinBpm();
print(avgTemperature); double avgTemperature =
print(avgAltitude); context.watch<User>().managerSelectedActivity.getAvgTemperature();
double maxAltitude =
context.watch<User>().managerSelectedActivity.getMaxAltitude();
double maxTemperature =
context.watch<User>().managerSelectedActivity.getMaxTemperature();
double maxSpeed =
context.watch<User>().managerSelectedActivity.getMaxSpeed();
double minSpeed =
context.watch<User>().managerSelectedActivity.getMinSpeed();
double minAltitude =
context.watch<User>().managerSelectedActivity.getMinAltitude();
double minTemperature =
context.watch<User>().managerSelectedActivity.getMinTemperature();
int minBpm = context.watch<User>().managerSelectedActivity.getMinBpm();
return Scaffold( return Scaffold(
backgroundColor: TColor.white, backgroundColor: TColor.white,
@ -73,72 +82,113 @@ class _StatAtivities extends State<StatAtivities> {
SizedBox( SizedBox(
height: media.width * 0.03, height: media.width * 0.03,
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
ContainerStatsActivities("$avgBpm BPM","Moyenne Bpm", Icons.favorite), ContainerStatsActivities(
SizedBox(width: media.width *0.03,), "$avgBpm BPM", "Moyenne Bpm", Icons.favorite),
ContainerStatsActivities("$maxBpm BPM","Maximum Bpm", Icons.trending_up), SizedBox(
SizedBox(width: media.width *0.03,), width: media.width * 0.03,
ContainerStatsActivities("$minBpm BPM","Minimum Bpm", Icons.trending_down) ),
],), ContainerStatsActivities(
"$maxBpm BPM", "Maximum Bpm", Icons.trending_up),
SizedBox(
width: media.width * 0.03,
),
ContainerStatsActivities(
"$minBpm BPM", "Minimum Bpm", Icons.trending_down)
],
),
SizedBox( SizedBox(
height: media.width * 0.03, height: media.width * 0.03,
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
ContainerStatsActivities("$avgSpeed m/s","Moyenne vitesse", Icons.bolt), ContainerStatsActivities(
SizedBox(width: media.width *0.03,), "$avgSpeed m/s", "Moyenne vitesse", Icons.bolt),
ContainerStatsActivities("$maxSpeed m/s","Maximum vitesse", Icons.trending_up), SizedBox(
SizedBox(width: media.width *0.03,), width: media.width * 0.03,
ContainerStatsActivities("$minSpeed m/s","Minimum vitesse", Icons.trending_down) ),
],), 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( SizedBox(
height: media.width * 0.03, height: media.width * 0.03,
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
ContainerStatsActivities("$avgTemperature °C","Moyenne Temperature", Icons.thermostat), ContainerStatsActivities("$avgTemperature °C",
SizedBox(width: media.width *0.03,), "Moyenne Temperature", Icons.thermostat),
ContainerStatsActivities("$maxTemperature °C","Maximum Temperature", Icons.trending_up), SizedBox(
SizedBox(width: media.width *0.03,), width: media.width * 0.03,
ContainerStatsActivities("$minTemperature °C","Minimum Temperature", Icons.trending_down) ),
],), ContainerStatsActivities("$maxTemperature °C",
"Maximum Temperature", Icons.trending_up),
SizedBox(
width: media.width * 0.03,
),
ContainerStatsActivities("$minTemperature °C",
"Minimum Temperature", Icons.trending_down)
],
),
SizedBox( SizedBox(
height: media.width * 0.03, height: media.width * 0.03,
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
ContainerStatsActivities("$avgAltitude m","Moyenne Altitude", Icons.landscape), ContainerStatsActivities(
SizedBox(width: media.width *0.03,), "$avgAltitude m", "Moyenne Altitude", Icons.landscape),
ContainerStatsActivities("$maxAltitude m","Maximum Altitude", Icons.trending_up), SizedBox(
SizedBox(width: media.width *0.03,), width: media.width * 0.03,
ContainerStatsActivities("$minAltitude m","Minimum Altitude", Icons.trending_down) ),
],), ContainerStatsActivities("$maxAltitude m",
"Maximum Altitude", Icons.trending_up),
SizedBox(
width: media.width * 0.03,
),
ContainerStatsActivities("$minAltitude m",
"Minimum Altitude", Icons.trending_down)
],
),
SizedBox( SizedBox(
height: media.width * 0.03, height: media.width * 0.03,
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
ContainerStatsActivities("$getTotalDistance m","Distance Totale", Icons.double_arrow), ContainerStatsActivities("$getTotalDistance m",
SizedBox(width: media.width *0.03,), "Distance Totale", Icons.double_arrow),
ContainerStatsActivities("$totalSteps","Total Pas", Icons.do_not_step_rounded), SizedBox(
],), width: media.width * 0.03,
),
ContainerStatsActivities(
"$totalSteps", "Total Pas", Icons.do_not_step_rounded),
],
),
SizedBox( SizedBox(
height: media.width * 0.03, height: media.width * 0.03,
),Row( ),
Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
ContainerStatsActivities("$totalTime s","Temps Total", Icons.timer), ContainerStatsActivities(
SizedBox(width: media.width *0.03,), "$totalTime s", "Temps Total", Icons.timer),
ContainerStatsActivities("$totalCalories kCal","Calories Dépensées", Icons.local_fire_department), SizedBox(
],), width: media.width * 0.03,
),
ContainerStatsActivities("$totalCalories kCal",
"Calories Dépensées", Icons.local_fire_department),
],
),
SizedBox( SizedBox(
height: media.width * 0.03, height: media.width * 0.03,
), ),

Loading…
Cancel
Save