Clear the checkup location if the user rejects data contribution

2grep · Mar 20, 2020 · ac4a8f9 · ac4a8f9
1 parent 9a28b93
commit ac4a8f9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/lib/src/data/models/checkups.dart b/lib/src/data/models/checkups.dart
@@ -15,11 +15,10 @@ class Checkup {
     this.id,
     this.created,
     dataContributionPreference,
-    location,
+    this.location,
     subjectiveResponses,
     vitalsResponses,
   })  : dataContributionPreference = dataContributionPreference ?? true,
-        location = location ?? CheckupLocation(),
         subjectiveResponses = subjectiveResponses ?? [],
         vitalsResponses = vitalsResponses ?? [];
 

diff --git a/lib/src/data/models/checkups.g.dart b/lib/src/data/models/checkups.g.dart
diff --git a/lib/src/ui/screens/checkup/checkup_loaded_body.dart b/lib/src/ui/screens/checkup/checkup_loaded_body.dart
@@ -35,7 +35,7 @@ class _CheckupLoadedBodyState extends State<CheckupLoadedBody> {
         context: context,
         checkupState: checkupState,
         updateFunction: (Checkup checkup) {
-          checkup.location.postalCode = postalCode;
+          checkup.location = CheckupLocation(postalCode: postalCode);
           return checkup;
         },
       );

diff --git a/lib/src/ui/screens/checkup/steps/intro.dart b/lib/src/ui/screens/checkup/steps/intro.dart
@@ -20,6 +20,9 @@ class _IntroStepState extends State<IntroStep> {
     Checkup checkup = checkupState.checkup;
     checkup.dataContributionPreference = value;
 
+    // Make sure to clear location
+    checkup.location = null;
+
     context
         .bloc<CheckupBloc>()
         .add(UpdateLocalCheckup(updatedCheckup: checkup));