ajout type DateTime

pull/4/head
Enzo 2 years ago
parent a4f387e3cd
commit ab34c5884e

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

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

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

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

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

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

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

Loading…
Cancel
Save