Case Information Modifications

* Added two new properties to ReportedCase and set up safe parsing for the properties from JSON (since those values are not there in JSON yet) * Updated CaseItem to display the new values * Updated Podfile.lock created for iOS (otherwise project does not compile correctly)
ICTASL · Mar 22, 2020 · c6d9e02 · c6d9e02
1 parent 1e24503
commit c6d9e02
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 14 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -123,7 +123,7 @@ PODS:
     - Flutter
   - path_provider_macos (0.0.1):
     - Flutter
-  - Protobuf (3.10.0)
+  - Protobuf (3.11.4)
   - share (0.5.2):
     - Flutter
   - shared_preferences (0.0.1):
@@ -164,14 +164,8 @@ DEPENDENCIES:
   - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`)
 
 SPEC REPOS:
-  https://cdn.cocoapods.org/:
-    - FirebaseAnalyticsInterop
-    - FirebaseCore
-    - FirebaseInstanceID
-    - FirebaseRemoteConfig
-  https://github.com/cocoapods/specs.git:
+  https://github.com/CocoaPods/Specs.git:
     - Firebase
-    - FirebaseABTesting
     - FirebaseAnalytics
     - FirebaseCoreDiagnostics
     - FirebaseCoreDiagnosticsInterop
@@ -183,6 +177,12 @@ SPEC REPOS:
     - GoogleMaps
     - GoogleUtilities
     - nanopb
+  trunk:
+    - FirebaseABTesting
+    - FirebaseAnalyticsInterop
+    - FirebaseCore
+    - FirebaseInstanceID
+    - FirebaseRemoteConfig
     - Protobuf
 
 EXTERNAL SOURCES:
@@ -254,7 +254,7 @@ SPEC CHECKSUMS:
   package_info: 48b108e75b8802c2d5e126f208ef540561c98aef
   path_provider: fb74bd0465e96b594bb3b5088ee4a4e7bb1f2a9d
   path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0
-  Protobuf: a4dc852ad69c027ca2166ed287b856697814375b
+  Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7
   share: bae0a282aab4483288913fc4dc0b935d4b491f2e
   shared_preferences: 430726339841afefe5142b9c1f50cb6bd7793e01
   shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
@@ -266,4 +266,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 1b66dae606f75376c5f2135a8290850eeb09ae83
 
-COCOAPODS: 1.7.5
+COCOAPODS: 1.8.4
diff --git a/lib/models/reported_case.dart b/lib/models/reported_case.dart
@@ -7,6 +7,9 @@ class ReportedCase extends Equatable {
   List<Location> locations;
   String message;
   DateTime createdAt;
+  // New properties - need to be added to backend
+  bool isLocal = true;
+  bool isFromFacility = true;
 
   ReportedCase(
       {this.id, this.caseNumber, this.locations, this.message, this.createdAt});
@@ -23,8 +26,16 @@ class ReportedCase extends Equatable {
         locations: _locations,
         message: json['message'],
         createdAt: DateTime.parse(json['created']));
-
-    print("CASE HAS BEEN REPORTED: ${_case.id}");
+    // isLocal
+    if (json.containsKey('isLocal')) {
+      _case.isLocal = json['isLocal'] as bool;
+    }
+    // Quarantine/home
+    if (json.containsKey('detectedFrom')) {
+      var from = json['detectedFrom'] as String;
+      _case.isFromFacility = from == 'quarantine';
+    }
+    // print("CASE HAS BEEN REPORTED: ${_case.id}");
     return _case;
   }
 

diff --git a/lib/page/screen/case_list_screen.dart b/lib/page/screen/case_list_screen.dart
@@ -178,8 +178,7 @@ class _CaseListScreenState extends State<CaseListScreen> {
                   );
                   break;
                 case ConnectionState.done:
-                  print("DATA: ");
-                  print(snapshot.data);
+                  // print('DATA: ${snapshot.data}');
                   if (snapshot.hasData) {
                     List<ReportedCase> _cases = List();
                     _cases = snapshot.data

diff --git a/lib/widgets/case_item.dart b/lib/widgets/case_item.dart
@@ -15,6 +15,9 @@ class CaseItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    var source = _case.isLocal ? 'Local' : 'Imported';
+    source += ', from: ' +
+        (_case.isFromFacility ? 'Quarantine Facility' : 'Community');
     return GestureDetector(
       child: Container(
         width: 100.0,
@@ -53,6 +56,10 @@ class CaseItem extends StatelessWidget {
                       style: TextStyle(fontSize: 12.0),
                     ),
                     SizedBox(height: 16.0),
+                    Text(
+                      source,
+                    ),
+                    SizedBox(height: 16.0),
                     Text(
                       _case.message,
                     ),