From 74661ea421237d4f4422098ce2acbf37577fe54c Mon Sep 17 00:00:00 2001 From: Enzo Date: Mon, 4 Dec 2023 10:48:46 +0100 Subject: [PATCH] =?UTF-8?q?modif=20de=20workout=20row=20et=20pr=C3=A9parat?= =?UTF-8?q?ion=20des=20champs=20de=20l'api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../container/container_stats_activities.dart | 6 ++-- lib/common_widget/container/workout_row.dart | 24 +++++++++++--- lib/modele/activity.dart | 31 +++++++++++-------- .../list_activity/list_activity_utile.dart | 9 +++++- 4 files changed, 47 insertions(+), 23 deletions(-) diff --git a/lib/common_widget/container/container_stats_activities.dart b/lib/common_widget/container/container_stats_activities.dart index dfd5b1c..a595673 100644 --- a/lib/common_widget/container/container_stats_activities.dart +++ b/lib/common_widget/container/container_stats_activities.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; import 'package:responsive_builder/responsive_builder.dart'; -import 'package:smartfit_app_mobile/common/colo_extension.dart'; import 'package:smartfit_app_mobile/common_widget/container/mobile/mobile_container_stats_activities.dart'; import 'package:smartfit_app_mobile/common_widget/container/web/web_container_stats_activities.dart'; -import 'package:smartfit_app_mobile/common_widget/stats.dart'; class ContainerStatsActivities extends StatelessWidget { const ContainerStatsActivities( @@ -20,8 +18,8 @@ class ContainerStatsActivities extends StatelessWidget { @override Widget build(BuildContext context) { return ScreenTypeLayout.builder( - mobile: (_) => MobileContainerStatsActivities(this.value, this.designation, this.icon), - desktop: (_) => WebContainerStatsActivities(this.value, this.designation, this.icon), + mobile: (_) => MobileContainerStatsActivities(value, designation, icon), + desktop: (_) => WebContainerStatsActivities(value, designation, icon), ); } } diff --git a/lib/common_widget/container/workout_row.dart b/lib/common_widget/container/workout_row.dart index 9137ee6..ea2824b 100644 --- a/lib/common_widget/container/workout_row.dart +++ b/lib/common_widget/container/workout_row.dart @@ -25,7 +25,7 @@ class WorkoutRow extends StatelessWidget { decoration: BoxDecoration( border: Border.all( color: isSelected - ? Color.fromARGB(255, 144, 252, 148) + ? const Color.fromARGB(255, 144, 252, 148) : Colors.transparent, width: 2.0, ), @@ -33,12 +33,12 @@ class WorkoutRow extends StatelessWidget { ), child: Material( color: isSelected - ? Color.fromARGB(255, 240, 255, 240) + ? const Color.fromARGB(255, 240, 255, 240) : Colors.transparent, child: InkWell( borderRadius: BorderRadius.circular(10), // Utiliser le même borderRadius - splashColor: Color.fromARGB(255, 42, 94, 44) + splashColor: const Color.fromARGB(255, 42, 94, 44) .withOpacity(0.3), // Couleur du fond au survol onTap: onClick, child: Padding( @@ -60,14 +60,28 @@ class WorkoutRow extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - wObj["categorie"].toString(), + "Type : ${wObj["categorie"].toString()}", style: TextStyle( color: TColor.black, fontSize: 12, ), ), Text( - wObj["date"].toString(), + "Date : ${wObj["date"].toString()}", + style: TextStyle( + color: TColor.black, + fontSize: 12, + ), + ), + Text( + "Temps : ${wObj["time"].toString()}", + style: TextStyle( + color: TColor.black, + fontSize: 12, + ), + ), + Text( + "Dénivelé positif : ${wObj["denivelePositif"].toString()}", style: TextStyle( color: TColor.black, fontSize: 12, diff --git a/lib/modele/activity.dart b/lib/modele/activity.dart index 9a1ec99..ae41f54 100644 --- a/lib/modele/activity.dart +++ b/lib/modele/activity.dart @@ -1,9 +1,12 @@ class ActivityOfUser { // A afficher - late String _categorie; - late String _date; - late String _fileUuid; - late String _nameFile; + final String _categorie; + final String _date; + final String _fileUuid; + final String _nameFile; + final double _timeActivity; + final double _denivelePositif; + final double _deniveleNegatif; // ------------ // late String _imageName; @@ -25,15 +28,10 @@ class ActivityOfUser { _contentActivity.removeAt(0); } - ActivityOfUser( - String date, String categorie, String fileUuid, String nameFile) { - _categorie = categorie; - _date = date; - _fileUuid = fileUuid; - _nameFile = nameFile; - + ActivityOfUser(this._categorie, this._date, this._fileUuid, this._nameFile, + this._timeActivity, this._denivelePositif, this._deniveleNegatif) { // Mettre dans une fonction appart - if (categorie == "Walking") { + if (_categorie == "Walking") { _imageName = "assets/img/workout1.svg"; } else { // Mettre des conditions pour d'autre type d'activité @@ -44,6 +42,13 @@ class ActivityOfUser { // -------------------------- FIN Localisation ---------------------- // Map toMap() { - return {'categorie': _categorie, 'image': _imageName, 'date': _date}; + return { + 'categorie': _categorie, + 'image': _imageName, + 'date': _date, + 'time': _timeActivity, + "denivelePositif": _denivelePositif, + "deniveleNegatif": _deniveleNegatif, + }; } } diff --git a/lib/modele/utile/list_activity/list_activity_utile.dart b/lib/modele/utile/list_activity/list_activity_utile.dart index 41b9b67..06b751f 100644 --- a/lib/modele/utile/list_activity/list_activity_utile.dart +++ b/lib/modele/utile/list_activity/list_activity_utile.dart @@ -54,7 +54,14 @@ class ListActivityUtile { element["creation_date"].toString(), element["category"].toString(), element["uuid"].toString(), - element["filename"].toString())); + element["filename"].toString(), + /* + element["timeActivity"], + element["denivelePositif"], + element["deniveleNegatif"]*/ + 0.0, + 0.0, + 0.0)); } /* if (notZero) {