Byl8/challenge bug fix

game/lib/challenges/challenges_page.dart

@@ -11,6 +11,7 @@ import 'package:game/model/event_model.dart';
 import 'package:game/model/group_model.dart';
 import 'package:game/model/tracker_model.dart';
 import 'package:game/model/user_model.dart';
+import 'package:game/utils/utility_functions.dart';
 import 'package:provider/provider.dart';
 import 'challenge_cell.dart';
 import 'package:game/journeys/filter_form.dart';
@@ -131,7 +132,6 @@ class _ChallengesPageState extends State<ChallengesPage> {
                     if (curEvent != null) events.add(curEvent);
                   }
                   for (EventDto event in events) {
-                    print(event);
                     var tracker = trackerModel.trackerByEventId(event.id);
                     var numberCompleted = tracker?.prevChallenges?.length ?? 0;
                     var complete =
@@ -163,13 +163,13 @@ class _ChallengesPageState extends State<ChallengesPage> {
                                 )
                               : ChallengeCell(
                                   key: UniqueKey(),
-                                  challenge.location?.name ?? "",
-                                  challenge.name ?? "",
+                                  friendlyLocation[challenge.location] ?? "",
+                                  event.name ?? "",
                                   Image.network(
                                       "https://picsum.photos/250?image=9"),
                                   complete,
-                                  challenge.description ?? "",
-                                  event.difficulty?.name ?? "",
+                                  event.description ?? "",
+                                  friendlyDifficulty[event.difficulty] ?? "",
                                   challenge.points ?? 0,
                                   event.id),
                         ),

game/lib/gameplay/gameplay_page.dart

@@ -11,6 +11,7 @@ import 'package:game/model/tracker_model.dart';
 import 'package:game/model/group_model.dart';
 import 'package:game/api/geopoint.dart';
 import 'package:game/navigation_page/home_navbar.dart';
+import 'package:game/utils/utility_functions.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:game/model/challenge_model.dart';
 import 'gameplay_map.dart';
@@ -41,17 +42,6 @@ class _GameplayPageState extends State<GameplayPage> {
 
   late StreamSubscription<Position> positionStream;
 
-  final Map<String, String> friendlyLocation = {
-    "ENG_QUAD": "Eng Quad",
-    "ARTS_QUAD": "Arts Quad",
-    "AG_QUAD": "Ag Quad",
-    "NORTH_CAMPUS": "North Campus",
-    "WEST_CAMPUS": "West Campus",
-    "COLLEGETOWN": "Collegetown",
-    "ITHACA_COMMONS": "Ithaca Commons",
-    "ANY": "Cornell",
-  };
-
   @override
   void initState() {
     startPositionStream();

game/lib/journeys/journeys_page.dart

@@ -10,6 +10,7 @@ import 'package:game/model/group_model.dart';
 import 'package:game/model/tracker_model.dart';
 import 'package:game/model/challenge_model.dart';
 import 'package:game/model/user_model.dart';
+import 'package:game/utils/utility_functions.dart';
 import 'package:provider/provider.dart';
 
 class JourneysPage extends StatefulWidget {
@@ -177,16 +178,16 @@ class _JourneysPageState extends State<JourneysPage> {
                               : JourneyCell(
                                   key: UniqueKey(),
                                   event.name ?? "",
-                                  location?.name ?? "",
+                                  friendlyLocation[location] ?? "",
                                   Image.network(
                                       "https://picsum.photos/250?image=9"), // dummy data for now; should pass in thumbnail parameter
                                   event.description ?? "",
                                   locationCount,
                                   numberCompleted,
                                   complete,
-                                  difficulty?.name ?? "",
-                                  totalPoints,
-                                  event.id),
+                                  friendlyDifficulty[difficulty] ?? "",
+                                  totalPoints, event.id,
+                                ),
                         ),
                       );
                   }

game/lib/profile/completed_challenges_page.dart

@@ -108,7 +108,7 @@ class CompletedChallengesPage extends StatelessWidget {
                   type: type,
                   date: DateFormat("MMMM d, y").format(date),
                   location: locationList[0],
-                  difficulty: difficultyToString[event.difficulty]!,
+                  difficulty: friendlyDifficulty[event.difficulty]!,
                   points: totalPoints,
                 );
               },

game/lib/profile/profile_page.dart

@@ -222,7 +222,7 @@ class _ProfilePageState extends State<ProfilePage> {
                         locationImage,
                         type,
                         formattedDate,
-                        difficultyToString[event.difficulty]!,
+                        friendlyDifficulty[event.difficulty]!,
                         totalPoints);
                   },
                   physics: BouncingScrollPhysics(),

game/lib/utils/utility_functions.dart

@@ -129,8 +129,19 @@ Text LatoText(String text, double fs, Color color, FontWeight fw) {
               color: color, fontWeight: FontWeight.bold, fontSize: fs)));
 }
 
-final Map<EventDifficultyDto, String> difficultyToString = {
+final Map<EventDifficultyDto, String> friendlyDifficulty = {
   EventDifficultyDto.Easy: "Easy",
   EventDifficultyDto.Normal: "Normal",
   EventDifficultyDto.Hard: "Hard",
 };
+
+final Map<String, String> friendlyLocation = {
+  "ENG_QUAD": "Eng Quad",
+  "ARTS_QUAD": "Arts Quad",
+  "AG_QUAD": "Ag Quad",
+  "NORTH_CAMPUS": "North Campus",
+  "WEST_CAMPUS": "West Campus",
+  "COLLEGETOWN": "Collegetown",
+  "ITHACA_COMMONS": "Ithaca Commons",
+  "ANY": "Cornell",
+};