modif de workout row et préparation des champs de l'api

pull/4/head
Enzo 1 year ago
parent 9a56419e4a
commit 74661ea421

@ -1,9 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:responsive_builder/responsive_builder.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/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/container/web/web_container_stats_activities.dart';
import 'package:smartfit_app_mobile/common_widget/stats.dart';
class ContainerStatsActivities extends StatelessWidget { class ContainerStatsActivities extends StatelessWidget {
const ContainerStatsActivities( const ContainerStatsActivities(
@ -20,8 +18,8 @@ class ContainerStatsActivities extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ScreenTypeLayout.builder( return ScreenTypeLayout.builder(
mobile: (_) => MobileContainerStatsActivities(this.value, this.designation, this.icon), mobile: (_) => MobileContainerStatsActivities(value, designation, icon),
desktop: (_) => WebContainerStatsActivities(this.value, this.designation, this.icon), desktop: (_) => WebContainerStatsActivities(value, designation, icon),
); );
} }
} }

@ -25,7 +25,7 @@ class WorkoutRow extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: isSelected color: isSelected
? Color.fromARGB(255, 144, 252, 148) ? const Color.fromARGB(255, 144, 252, 148)
: Colors.transparent, : Colors.transparent,
width: 2.0, width: 2.0,
), ),
@ -33,12 +33,12 @@ class WorkoutRow extends StatelessWidget {
), ),
child: Material( child: Material(
color: isSelected color: isSelected
? Color.fromARGB(255, 240, 255, 240) ? const Color.fromARGB(255, 240, 255, 240)
: Colors.transparent, : Colors.transparent,
child: InkWell( child: InkWell(
borderRadius: borderRadius:
BorderRadius.circular(10), // Utiliser le même 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 .withOpacity(0.3), // Couleur du fond au survol
onTap: onClick, onTap: onClick,
child: Padding( child: Padding(
@ -60,14 +60,28 @@ class WorkoutRow extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
wObj["categorie"].toString(), "Type : ${wObj["categorie"].toString()}",
style: TextStyle( style: TextStyle(
color: TColor.black, color: TColor.black,
fontSize: 12, fontSize: 12,
), ),
), ),
Text( 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( style: TextStyle(
color: TColor.black, color: TColor.black,
fontSize: 12, fontSize: 12,

@ -1,9 +1,12 @@
class ActivityOfUser { class ActivityOfUser {
// A afficher // A afficher
late String _categorie; final String _categorie;
late String _date; final String _date;
late String _fileUuid; final String _fileUuid;
late String _nameFile; final String _nameFile;
final double _timeActivity;
final double _denivelePositif;
final double _deniveleNegatif;
// ------------ // // ------------ //
late String _imageName; late String _imageName;
@ -25,15 +28,10 @@ class ActivityOfUser {
_contentActivity.removeAt(0); _contentActivity.removeAt(0);
} }
ActivityOfUser( ActivityOfUser(this._categorie, this._date, this._fileUuid, this._nameFile,
String date, String categorie, String fileUuid, String nameFile) { this._timeActivity, this._denivelePositif, this._deniveleNegatif) {
_categorie = categorie;
_date = date;
_fileUuid = fileUuid;
_nameFile = nameFile;
// Mettre dans une fonction appart // Mettre dans une fonction appart
if (categorie == "Walking") { if (_categorie == "Walking") {
_imageName = "assets/img/workout1.svg"; _imageName = "assets/img/workout1.svg";
} else { } else {
// Mettre des conditions pour d'autre type d'activité // Mettre des conditions pour d'autre type d'activité
@ -44,6 +42,13 @@ class ActivityOfUser {
// -------------------------- FIN Localisation ---------------------- // // -------------------------- FIN Localisation ---------------------- //
Map<String, dynamic> toMap() { Map<String, dynamic> toMap() {
return {'categorie': _categorie, 'image': _imageName, 'date': _date}; return {
'categorie': _categorie,
'image': _imageName,
'date': _date,
'time': _timeActivity,
"denivelePositif": _denivelePositif,
"deniveleNegatif": _deniveleNegatif,
};
} }
} }

@ -54,7 +54,14 @@ class ListActivityUtile {
element["creation_date"].toString(), element["creation_date"].toString(),
element["category"].toString(), element["category"].toString(),
element["uuid"].toString(), element["uuid"].toString(),
element["filename"].toString())); element["filename"].toString(),
/*
element["timeActivity"],
element["denivelePositif"],
element["deniveleNegatif"]*/
0.0,
0.0,
0.0));
} }
/* /*
if (notZero) { if (notZero) {

Loading…
Cancel
Save