diff --git a/lib/modele/activity.dart b/lib/modele/activity.dart index 2252632..9a1ec99 100644 --- a/lib/modele/activity.dart +++ b/lib/modele/activity.dart @@ -12,6 +12,7 @@ class ActivityOfUser { String get fileUuid => _fileUuid; String get nameFile => _nameFile; + String get category => _categorie; Map get enteteCSV => _enteteCSV; // -- Getter/Setter -- Ancien // diff --git a/lib/modele/manager_selected_activity.dart b/lib/modele/manager_selected_activity.dart index 717e207..d229b1c 100644 --- a/lib/modele/manager_selected_activity.dart +++ b/lib/modele/manager_selected_activity.dart @@ -9,13 +9,10 @@ class ManagerSelectedActivity { List activitySelected = List.empty(growable: true); bool addSelectedActivity(ActivityOfUser activityOfUser) { - // Regarder si l'entete est la même - // C'est de la merde!! à recoder !! - /* if (activitySelected.isNotEmpty && - activitySelected.first.enteteCSV != activityOfUser.enteteCSV) { + activityOfUser.category != activitySelected.first.category) { return false; - }*/ + } activitySelected.add(activityOfUser); return true; } diff --git a/lib/modele/utile/list_activity/list_activity_utile.dart b/lib/modele/utile/list_activity/list_activity_utile.dart index aad1884..d6b706a 100644 --- a/lib/modele/utile/list_activity/list_activity_utile.dart +++ b/lib/modele/utile/list_activity/list_activity_utile.dart @@ -27,9 +27,11 @@ class ListActivityUtile { activityOfUser.contentActivity = List.from(_managerFile.convertByteIntoCSV(result.item2)); - Provider.of(context, listen: false) + if (!Provider.of(context, listen: false) .managerSelectedActivity - .addSelectedActivity(activityOfUser); + .addSelectedActivity(activityOfUser)) { + return const Tuple2(false, "Pas de même categorie"); + } return const Tuple2(true, "Yeah"); }