some progress in goal planner (started goal state)

filcnaplo/lib/database/init.dart

@@ -46,8 +46,10 @@ const userDataDB = DatabaseStruct("user_data", {
   "renamed_teachers": String,
   // "subject_lesson_count": String, // non kreta data
   "last_seen_grade": int,
-  // goal plans // non kreta data
+  // goal planning // non kreta data
   "goal_plans": String,
+  "goal_averages": String,
+  "goal_befores": String,
 });
 
 Future<void> createTable(Database db, DatabaseStruct struct) =>
@@ -99,8 +101,10 @@ Future<Database> initDB(DatabaseProvider database) async {
       "renamed_teachers": "{}",
       // "subject_lesson_count": "{}", // non kreta data
       "last_seen_grade": 0,
-      // goal plans // non kreta data
+      // goal planning // non kreta data
       "goal_plans": "{}",
+      "goal_averages": "{}",
+      "goal_befores": "{}",
     });
   } catch (error) {
     print("ERROR: migrateDB: $error");

filcnaplo/lib/database/query.dart

@@ -192,6 +192,7 @@ class UserDatabaseQuery {
     return lastSeen;
   }
 
+  // renamed things
   Future<Map<String, String>> renamedSubjects({required String userId}) async {
     List<Map> userData =
         await db.query("user_data", where: "id = ?", whereArgs: [userId]);
@@ -214,14 +215,36 @@ class UserDatabaseQuery {
         .map((key, value) => MapEntry(key.toString(), value.toString()));
   }
 
+  // goal planner
   Future<Map<String, String>> subjectGoalPlans({required String userId}) async {
     List<Map> userData =
         await db.query("user_data", where: "id = ?", whereArgs: [userId]);
     if (userData.isEmpty) return {};
-    String? goalPlansJson =
-        userData.elementAt(0)["goal_plans"] as String?;
+    String? goalPlansJson = userData.elementAt(0)["goal_plans"] as String?;
     if (goalPlansJson == null) return {};
     return (jsonDecode(goalPlansJson) as Map)
         .map((key, value) => MapEntry(key.toString(), value.toString()));
   }
+
+  Future<Map<String, String>> subjectGoalAverages(
+      {required String userId}) async {
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    if (userData.isEmpty) return {};
+    String? goalAvgsJson = userData.elementAt(0)["goal_averages"] as String?;
+    if (goalAvgsJson == null) return {};
+    return (jsonDecode(goalAvgsJson) as Map)
+        .map((key, value) => MapEntry(key.toString(), value.toString()));
+  }
+
+  Future<Map<String, String>> subjectGoalBefores(
+      {required String userId}) async {
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    if (userData.isEmpty) return {};
+    String? goalBeforesJson = userData.elementAt(0)["goal_befores"] as String?;
+    if (goalBeforesJson == null) return {};
+    return (jsonDecode(goalBeforesJson) as Map)
+        .map((key, value) => MapEntry(key.toString(), value.toString()));
+  }
 }

filcnaplo/lib/database/store.dart

@@ -127,6 +127,7 @@ class UserDatabaseStore {
         where: "id = ?", whereArgs: [userId]);
   }
 
+  // renamed things
   Future<void> storeRenamedSubjects(Map<String, String> subjects,
       {required String userId}) async {
     String renamedSubjectsJson = jsonEncode(subjects);
@@ -141,10 +142,25 @@ class UserDatabaseStore {
         where: "id = ?", whereArgs: [userId]);
   }
 
+  // goal planner
   Future<void> storeSubjectGoalPlans(Map<String, String> plans,
       {required String userId}) async {
     String goalPlansJson = jsonEncode(plans);
     await db.update("user_data", {"goal_plans": goalPlansJson},
         where: "id = ?", whereArgs: [userId]);
   }
+
+  Future<void> storeSubjectGoalAverages(Map<String, String> avgs,
+      {required String userId}) async {
+    String goalAvgsJson = jsonEncode(avgs);
+    await db.update("user_data", {"goal_averages": goalAvgsJson},
+        where: "id = ?", whereArgs: [userId]);
+  }
+
+  Future<void> storeSubjectGoalBefores(Map<String, String> befores,
+      {required String userId}) async {
+    String goalBeforesJson = jsonEncode(befores);
+    await db.update("user_data", {"goal_befores": goalBeforesJson},
+        where: "id = ?", whereArgs: [userId]);
+  }
 }

filcnaplo/pubspec.yaml

@@ -86,6 +86,7 @@ flutter:
     - assets/icons/ic_splash.png
     - assets/animations/
     - assets/images/
+    - assets/images/subject_covers/
 
   fonts:
     - family: FilcIcons