Merge branch 'development' into dev/feat/final_ui_fixes

beakpeek/lib/Controller/DB/life_list_provider.dart

@@ -3,6 +3,7 @@ import 'dart:convert';
 
 import 'package:beakpeek/Model/BirdInfo/bird.dart';
 import 'package:beakpeek/Model/BirdInfo/province_data.dart';
+import 'package:beakpeek/Model/UserProfile/achievment_list.dart';
 import 'package:beakpeek/Model/UserProfile/user_model.dart';
 import 'package:beakpeek/config_azure.dart';
 import 'package:http/http.dart';
@@ -166,6 +167,8 @@ class LifeListProvider {
 
   Future<void> insertBird(int birdId) async {
     final bird = await getBirdInByID(birdId);
+    print(bird);
+    await updateLifeListAchievments(bird.commonGroup, birdId);
     final db = await instance.database;
     if (!await isDuplicate(bird)) {
       await db
@@ -196,6 +199,19 @@ class LifeListProvider {
     return encodedString;
   }
 
+  Future<String> fetchUserLifelistString() async {
+    final db = await instance.database;
+    final List<Map<String, Object?>> birdMap = await db.query(
+      'birds',
+      orderBy: 'commonGroup DESC',
+      columns: ['id'],
+    );
+    final String encodedString = jsonEncode(birdMap);
+    // user.lifelist = encodedString;
+    // storeUserLocally(user);
+    return encodedString;
+  }
+
   Future<List<Bird>> fetchLifeList() async {
     final db = await instance.database;
 
@@ -291,6 +307,30 @@ class LifeListProvider {
     return count;
   }
 
+  Future<int> allBirdCount(String commonGroup) async {
+    final db = await instance.database;
+    final int count = Sqflite.firstIntValue(
+          await db.query('allBirds',
+              columns: ['COUNT(*)'],
+              where: 'commonGroup = ?',
+              whereArgs: [commonGroup]),
+        ) ??
+        0;
+    return count;
+  }
+
+  Future<int> lifeBirdCount(String commonGroup) async {
+    final db = await instance.database;
+    final int count = Sqflite.firstIntValue(
+          await db.query('birds',
+              columns: ['COUNT(*)'],
+              where: 'commonGroup = ?',
+              whereArgs: [commonGroup]),
+        ) ??
+        0;
+    return count;
+  }
+
   Future<int> containsProvData() async {
     final db = await instance.database;
     final int count = Sqflite.firstIntValue(

beakpeek/lib/Model/UserProfile/achievment_list.dart

@@ -2,6 +2,7 @@
 
 import 'dart:convert';
 import 'dart:io';
+import 'package:beakpeek/Controller/DB/life_list_provider.dart';
 import 'package:beakpeek/Model/UserProfile/user_achievment.dart';
 import 'package:beakpeek/Model/UserProfile/user_model.dart';
 import 'package:beakpeek/config_azure.dart';
@@ -97,3 +98,89 @@ AchievementList? getLocalAchievmentList() {
   }
   return AchievementList.fromJson(userString);
 }
+
+Future<void> updateLifeListAchievments(String commonGroup, int id) async {
+  switch (commonGroup.toLowerCase()) {
+    case 'weaver':
+      updateAchievmentProgressBirds('Weaver Believer', 'weaver');
+      updateProvinces(id);
+      break;
+    case 'duck':
+      updateAchievmentProgressBirds('Duck Hunter', 'duck');
+      updateProvinces(id);
+      break;
+    case 'egale':
+      updateAchievmentProgressBirds('USA', 'egale');
+      updateProvinces(id);
+      break;
+    case 'kingfisher':
+      updateAchievmentProgressBirds('Fisherman', 'kingfisher');
+      updateProvinces(id);
+      break;
+    case 'hawk':
+      updateAchievmentProgressBirds('Hawk Spotter', 'hawk');
+      updateProvinces(id);
+      break;
+    case 'heron':
+      updateAchievmentProgressBirds('Heron Horror', 'heron');
+
+      break;
+  }
+  updateProvinces(id);
+}
+
+Future<void> updateProvinces(int id) async {
+  final List<String> achivementNames = [
+    'Risk it for the Biscuits',
+    'Gauteng Explorer',
+    'Watch The Waves',
+    'Limpopo Hoopoe',
+    'Mpumalanga Adventurer',
+    'Dimond Hunter',
+    'Directionally challanged',
+    'Western Cape Wanderer',
+    'Freesest Alive'
+  ];
+  final LifeListProvider lifeList = LifeListProvider.instance;
+  final List<double> progress = await lifeList.precentLifeListBirds();
+  for (int i = 0; i < achivementNames.length; i++) {
+    final Achievement? provMaster = getAchievementByName(achivementNames[i]);
+
+    if (provMaster != null) {
+      await updateUsersAchievement(provMaster.id, progress[i]);
+      //print('progress at $i ${progress[i]}');
+      for (UserAchievement ua in user.achievements) {
+        print(ua.toJson());
+      }
+      print(achivementNames[i]);
+    }
+  }
+}
+
+/// All checks for user progress should go here
+Future<void> updateAchievmentProgressBirds(
+    String achievemntName, String commonGroup) async {
+  /// Quiz Master
+  final Achievement? birdMaster = getAchievementByName(achievemntName);
+  final LifeListProvider lifeList = LifeListProvider.instance;
+  if (birdMaster != null) {
+    final int countBird = await lifeList.lifeBirdCount(commonGroup);
+    final int totalBird = await lifeList.allBirdCount(commonGroup);
+    double progress = countBird / totalBird;
+    progress = progress < 1 ? progress : 1;
+    await updateUsersAchievement(birdMaster.id, progress);
+    for (UserAchievement ua in user.achievements) {
+      print(ua.toJson());
+    }
+    print(achievemntName);
+  }
+
+  for (UserAchievement userAchievement in user.achievements) {
+    achievementList
+        .achievements[achievementList.achievements
+            .indexWhere((element) => element.id == userAchievement.id)]
+        .progress = userAchievement.progress;
+  }
+
+  storeAchievementListLocally(achievementList);
+}

beakpeek/lib/Model/UserProfile/user_model.dart

@@ -97,12 +97,12 @@ Future<UserModel> getOnlineUser() async {
     return user;
   }
   user = UserModel.fromJson(response.body);
-
-  final String localLife = await lifelist.updateUserLifelist();
+  final String localLife = await lifelist.fetchUserLifelistString();
   if (localLife.length < user.lifelist.length) {
-    final Map<String, int> valueMap = json.decode(localLife);
-    valueMap.forEach((key, value) {
-      lifelist.insertBird(value);
+    final List<dynamic> valueList = json.decode(user.lifelist);
+    valueList.forEach((element) {
+      final int birdId = element['id'];
+      lifelist.insertBird(birdId);
     });
   } else {
     user.lifelist = localLife;
@@ -134,16 +134,19 @@ void deleteLocalUser() {
 
 Future<void> updateOnline(
     {LifeListProvider? lifelist, bool logout = false}) async {
-  // if (lifelist != null) {
-  //   await lifelist.updateUserLifelist();
-  // }
+  lifelist = LifeListProvider.instance;
+  if (lifelist != null) {
+    String list = await lifelist.updateUserLifelist();
+    user.set('lifelist', list);
+  }
   final response = await http.post(Uri.parse('$userApiUrl/User/UpdateProfile'),
       headers: {
         HttpHeaders.authorizationHeader: 'Bearer $accessToken',
         HttpHeaders.contentTypeHeader: 'application/json'
       },
       body: user.toJson());
 
+  // print(json.decode(response.body));
   if (logout) {
     return;
   }

beakpeek/lib/View/Sightings/sightings.dart

@@ -38,8 +38,6 @@ class _SightingsState extends State<Sightings> {
     context.goNamed(
       'birdInfo',
       pathParameters: {
-        'group': bird.commonGroup,
-        'species': bird.commonSpecies,
         'id': bird.id.toString(),
       },
     );

beakpeek/pubspec.yaml

@@ -118,10 +118,10 @@ flutter:
     - assets/province_limpopo.kml
     - assets/province_northerncape.kml
     - assets/province_northwest.kml
-    # - assets/Legal/combinepdf.pdf
+    - assets/Legal/combinepdf.pdf
     - assets/Legal/BeakPeekTermsOfUse.pdf
     - assets/Legal/BeakPeekPrivacyPolicy.pdf
-    - assets/Legal/BeakPeekCookiePolicy.pdf    
+    - assets/Legal/BeakPeekCookiePolicy.pdf   
   #   - images/a_dot_ham.jpeg
 
   # An image asset can refer to one or more resolution-specific "variants", see