From 19bf01421fbbe93ada8e5fef5733917ac158842f Mon Sep 17 00:00:00 2001 From: ggurdin Date: Tue, 25 Jun 2024 17:14:51 -0400 Subject: [PATCH] for now, don't show the next activity after submitting an activity --- .../pangea_message_event.dart | 10 ++++++++-- .../practice_activity_card.dart | 19 +++++++++++-------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/lib/pangea/matrix_event_wrappers/pangea_message_event.dart b/lib/pangea/matrix_event_wrappers/pangea_message_event.dart index 870d305a1..951b77dfc 100644 --- a/lib/pangea/matrix_event_wrappers/pangea_message_event.dart +++ b/lib/pangea/matrix_event_wrappers/pangea_message_event.dart @@ -568,10 +568,16 @@ class PangeaMessageEvent { bool get hasUncompletedActivity { if (l2Code == null) return false; final List activities = practiceActivities(l2Code!); - if (activities.isEmpty) return false; - return !activities.every((activity) => activity.isComplete); + // for now, only show the button if the event has no completed activities + // TODO - revert this after adding logic to show next activity + for (final activity in activities) { + if (activity.isComplete) return false; + } + return true; + // if (activities.isEmpty) return false; + // return !activities.every((activity) => activity.isComplete); } String? get l2Code => diff --git a/lib/pangea/widgets/practice_activity/practice_activity_card.dart b/lib/pangea/widgets/practice_activity/practice_activity_card.dart index ce888f0fb..17c528b22 100644 --- a/lib/pangea/widgets/practice_activity/practice_activity_card.dart +++ b/lib/pangea/widgets/practice_activity/practice_activity_card.dart @@ -62,19 +62,22 @@ class MessagePracticeActivityCardState extends State { if (langCode == null) return; final List activities = widget.pangeaMessageEvent.practiceActivities(langCode!); + if (activities.isEmpty) return; final List incompleteActivities = activities.where((element) => !element.isComplete).toList(); debugPrint("total events: ${activities.length}"); debugPrint("incomplete practice events: ${incompleteActivities.length}"); - // if an incomplete activity is found, show that - if (incompleteActivities.isNotEmpty) { - practiceEvent = incompleteActivities.first; - } - // if no incomplete activity is found, show the last activity - else if (activities.isNotEmpty) { - practiceEvent = activities.last; - } + // TODO update to show next activity + practiceEvent = activities.first; + // // if an incomplete activity is found, show that + // if (incompleteActivities.isNotEmpty) { + // practiceEvent = incompleteActivities.first; + // } + // // if no incomplete activity is found, show the last activity + // else if (activities.isNotEmpty) { + // practiceEvent = activities.last; + // } setState(() {}); }