intelligently choosing tokens and passing all their info

lib/main.dart

@@ -22,7 +22,7 @@ void main() async {
 
   // #Pangea
   try {
-    await dotenv.load(fileName: ".env.local_choreo");
+    await dotenv.load(fileName: ".env");
   } catch (e) {
     Logs().e('Failed to load .env file', e);
   }

lib/pangea/controllers/practice_activity_generation_controller.dart

@@ -121,11 +121,12 @@ class PracticeGenerationController {
 
       // if the server points to an existing event, return that event
       if (res.existingActivityEventId != null) {
-        debugPrint(
-          'Existing activity event found: ${res.existingActivityEventId}',
-        );
         final Event? existingEvent =
             await event.room.getEventById(res.existingActivityEventId!);
+
+        debugPrint(
+          'Existing activity event found: ${existingEvent?.content}',
+        );
         if (existingEvent != null) {
           return PracticeActivityEvent(
             event: existingEvent,

lib/pangea/models/analytics/construct_list_model.dart

@@ -21,7 +21,7 @@ class ConstructListModel {
   }) : _uses = uses;
 
   List<OneConstructUse> get uses =>
-      _uses.where((use) => use.constructType == type).toList();
+      _uses.where((use) => use.constructType == type || type == null).toList();
 
   /// All unique lemmas used in the construct events
   List<String> get lemmas => constructList.map((e) => e.lemma).toSet().toList();
@@ -38,7 +38,7 @@ class ConstructListModel {
 
     _constructMap = lemmaToUses.map(
       (key, value) => MapEntry(
-        key + value.first.constructType.string,
+        key,
         ConstructUses(
           uses: value,
           constructType: value.first.constructType,

lib/pangea/models/practice_activities.dart/message_activity_request.dart

@@ -27,11 +27,12 @@ class ConstructWithXP {
   }
 
   Map<String, dynamic> toJson() {
-    return {
+    final json = {
       'construct_id': id.toJson(),
       'xp': xp,
       'last_used': lastUsed?.toIso8601String(),
     };
+    return json;
   }
 }
 

lib/pangea/models/practice_activities.dart/practice_activity_model.dart

@@ -253,6 +253,21 @@ class PracticeActivityModel {
     this.freeResponse,
   });
 
+  String get question {
+    switch (activityType) {
+      case ActivityTypeEnum.multipleChoice:
+        return multipleChoice!.question;
+      case ActivityTypeEnum.listening:
+        return listening!.text;
+      case ActivityTypeEnum.speaking:
+        return speaking!.text;
+      case ActivityTypeEnum.freeResponse:
+        return freeResponse!.question;
+      default:
+        return '';
+    }
+  }
+
   factory PracticeActivityModel.fromJson(Map<String, dynamic> json) {
     return PracticeActivityModel(
       tgtConstructs: (json['tgt_constructs'] as List)

lib/pangea/widgets/practice_activity/multiple_choice_activity.dart

@@ -1,6 +1,5 @@
 import 'package:collection/collection.dart';
 import 'package:fluffychat/pangea/choreographer/widgets/choice_array.dart';
-import 'package:fluffychat/pangea/enum/construct_use_type_enum.dart';
 import 'package:fluffychat/pangea/matrix_event_wrappers/practice_activity_event.dart';
 import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_model.dart';
 import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_record_model.dart';
@@ -28,21 +27,22 @@ class MultipleChoiceActivityState extends State<MultipleChoiceActivity> {
   PracticeActivityRecordModel? get currentRecordModel =>
       widget.practiceCardController.currentCompletionRecord;
 
-  bool get isSubmitted =>
+  // bool get isSubmitted =>
-      widget.currentActivity?.latestUserRecord?.record.latestResponse != null;
+  //     widget.currentActivity?.latestUserRecord?.record.latestResponse != null;
 
   @override
   void initState() {
     super.initState();
-    setCompletionRecord();
+    // setCompletionRecord();
   }
 
   @override
   void didUpdateWidget(covariant MultipleChoiceActivity oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (oldWidget.currentActivity?.event.eventId !=
+    if (widget.practiceCardController.currentCompletionRecord?.responses
-        widget.currentActivity?.event.eventId) {
+            .isEmpty ??
-      setCompletionRecord();
+        false) {
+      selectedChoiceIndex = null;
     }
   }
 
@@ -52,7 +52,7 @@ class MultipleChoiceActivityState extends State<MultipleChoiceActivity> {
   /// Otherwise, it sets the current model to the user record's record and
   /// determines the selected choice index.
   void setCompletionRecord() {
-    if (widget.currentActivity?.latestUserRecord?.record == null) {
+    // if (widget.currentActivity?.latestUserRecord?.record == null) {
     widget.practiceCardController.setCompletionRecord(
       PracticeActivityRecordModel(
         question:
@@ -60,13 +60,13 @@ class MultipleChoiceActivityState extends State<MultipleChoiceActivity> {
       ),
     );
     selectedChoiceIndex = null;
-    } else {
+    // } else {
-      widget.practiceCardController.setCompletionRecord(
+    //   widget.practiceCardController.setCompletionRecord(
-          widget.currentActivity!.latestUserRecord!.record);
+    //       widget.currentActivity!.latestUserRecord!.record);
-      selectedChoiceIndex = widget
+    //   selectedChoiceIndex = widget
-          .currentActivity?.practiceActivity.multipleChoice!
+    //       .currentActivity?.practiceActivity.multipleChoice!
-          .choiceIndex(currentRecordModel!.latestResponse!.text!);
+    //       .choiceIndex(currentRecordModel!.latestResponse!.text!);
-    }
+    // }
     setState(() {});
   }
 
@@ -79,8 +79,8 @@ class MultipleChoiceActivityState extends State<MultipleChoiceActivity> {
         .currentActivity!.practiceActivity.multipleChoice!
         .isCorrect(value, index);
 
-    final ConstructUseTypeEnum useType =
+    // final ConstructUseTypeEnum useType =
-        isCorrect ? ConstructUseTypeEnum.corPA : ConstructUseTypeEnum.incPA;
+    //     isCorrect ? ConstructUseTypeEnum.corPA : ConstructUseTypeEnum.incPA;
 
     currentRecordModel?.addResponse(
       text: value,
@@ -146,7 +146,7 @@ class MultipleChoiceActivityState extends State<MultipleChoiceActivity> {
                   ),
                 )
                 .toList(),
-            isActive: !isSubmitted,
+            isActive: true,
           ),
         ],
       ),

lib/pangea/widgets/practice_activity/practice_activity_card.dart

@@ -73,17 +73,27 @@ class MessagePracticeActivityCardState extends State<PracticeActivityCard> {
     setState(() => fetchingActivity = value);
   }
 
-  /// Set target tokens.
+  void _setPracticeActivity(PracticeActivityEvent? activity) {
+    if (activity == null) {
+      widget.overlayController.exitPracticeFlow();
+      return;
+    }
+
+    currentActivity = activity;
+
+    currentCompletionRecord = PracticeActivityRecordModel(
+      question: activity.practiceActivity.question,
+    );
+
+    widget.overlayController.setSelectedSpan(currentActivity!.practiceActivity);
+  }
+
   /// Get an existing activity if there is one.
   /// If not, get a new activity from the server.
   Future<void> initialize() async {
-    currentActivity =
+    _setPracticeActivity(
-        _fetchExistingIncompleteActivity() ?? await _fetchNewActivity();
+      _fetchExistingIncompleteActivity() ?? await _fetchNewActivity(),
-
+    );
-    currentActivity == null
-        ? widget.overlayController.exitPracticeFlow()
-        : widget.overlayController
-            .setSelectedSpan(currentActivity!.practiceActivity);
   }
 
   // if the user did the activity before but awhile ago and we don't have any
@@ -178,7 +188,7 @@ class MessagePracticeActivityCardState extends State<PracticeActivityCard> {
   /// Fetches a new activity if there are any left to complete.
   /// Exits the practice flow if there are no more activities.
   void onActivityFinish() async {
-    try {
+    // try {
     if (currentCompletionRecord == null || currentActivity == null) {
       debugger(when: kDebugMode);
       return;
@@ -196,7 +206,7 @@ class MessagePracticeActivityCardState extends State<PracticeActivityCard> {
     );
 
     // update the target tokens with the new construct uses
-      targetTokensController.updateTokensWithConstructs(
+    await targetTokensController.updateTokensWithConstructs(
       uses,
       context,
       widget.pangeaMessageEvent,
@@ -230,25 +240,21 @@ class MessagePracticeActivityCardState extends State<PracticeActivityCard> {
 
     widget.overlayController.onActivityFinish();
 
-      currentActivity = await _fetchNewActivity();
+    _setPracticeActivity(await _fetchNewActivity());
-
+
-      currentActivity == null
+    // } catch (e, s) {
-          ? widget.overlayController.exitPracticeFlow()
+    //   debugger(when: kDebugMode);
-          : widget.overlayController
+    //   ErrorHandler.logError(
-              .setSelectedSpan(currentActivity!.practiceActivity);
+    //     e: e,
-    } catch (e, s) {
+    //     s: s,
-      debugger(when: kDebugMode);
+    //     m: 'Failed to get new activity',
-      ErrorHandler.logError(
+    //     data: {
-        e: e,
+    //       'activity': currentActivity,
-        s: s,
+    //       'record': currentCompletionRecord,
-        m: 'Failed to get new activity',
+    //     },
-        data: {
+    //   );
-          'activity': currentActivity,
+    //   widget.overlayController.exitPracticeFlow();
-          'record': currentCompletionRecord,
+    // }
-        },
-      );
-      widget.overlayController.exitPracticeFlow();
-    }
   }
 
   RepresentationEvent? get representation =>