diff --git a/filcnaplo/lib/database/query.dart b/filcnaplo/lib/database/query.dart index 2efec87..20dabb9 100644 --- a/filcnaplo/lib/database/query.dart +++ b/filcnaplo/lib/database/query.dart @@ -52,21 +52,21 @@ class UserDatabaseQuery { final Database db; - Future> getGrades({required String userId, required Map renamedSubjects}) async { + Future> getGrades({required String userId}) async { List userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]); if (userData.isEmpty) return []; String? gradesJson = userData.elementAt(0)["grades"] as String?; if (gradesJson == null) return []; - List grades = (jsonDecode(gradesJson) as List).map((e) => Grade.fromJson(e, renamedSubjects: renamedSubjects)).toList(); + List grades = (jsonDecode(gradesJson) as List).map((e) => Grade.fromJson(e)).toList(); return grades; } - Future> getLessons({required String userId, required Map renamedSubjects}) async { + Future> getLessons({required String userId}) async { List userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]); if (userData.isEmpty) return []; String? lessonsJson = userData.elementAt(0)["timetable"] as String?; if (lessonsJson == null) return []; - List lessons = (jsonDecode(lessonsJson) as List).map((e) => Lesson.fromJson(e, renamedSubjects: renamedSubjects)).toList(); + List lessons = (jsonDecode(lessonsJson) as List).map((e) => Lesson.fromJson(e)).toList(); return lessons; } @@ -115,21 +115,21 @@ class UserDatabaseQuery { return events; } - Future> getAbsences({required String userId, required Map renamedSubjects}) async { + Future> getAbsences({required String userId}) async { List userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]); if (userData.isEmpty) return []; String? absencesJson = userData.elementAt(0)["absences"] as String?; if (absencesJson == null) return []; - List absences = (jsonDecode(absencesJson) as List).map((e) => Absence.fromJson(e, renamedSubjects: renamedSubjects)).toList(); + List absences = (jsonDecode(absencesJson) as List).map((e) => Absence.fromJson(e)).toList(); return absences; } - Future> getGroupAverages({required String userId, required Map renamedSubjects}) async { + Future> getGroupAverages({required String userId}) async { List userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]); if (userData.isEmpty) return []; String? groupAveragesJson = userData.elementAt(0)["group_averages"] as String?; if (groupAveragesJson == null) return []; - List groupAverages = (jsonDecode(groupAveragesJson) as List).map((e) => GroupAverage.fromJson(e, renamedSubjects: renamedSubjects)).toList(); + List groupAverages = (jsonDecode(groupAveragesJson) as List).map((e) => GroupAverage.fromJson(e)).toList(); return groupAverages; }