rounding shits
This commit is contained in:
@@ -5,14 +5,18 @@ class GradeSubject {
|
||||
Category category;
|
||||
String name;
|
||||
String? renamedTo;
|
||||
double? customRounding;
|
||||
|
||||
bool get isRenamed => renamedTo != null;
|
||||
bool get hasCustomRounding => customRounding != null;
|
||||
|
||||
GradeSubject({
|
||||
required this.id,
|
||||
required this.category,
|
||||
required this.name,
|
||||
this.renamedTo,
|
||||
// v5
|
||||
this.customRounding,
|
||||
});
|
||||
|
||||
factory GradeSubject.fromJson(Map json) {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// ignore_for_file: no_leading_underscores_for_local_identifiers
|
||||
// ignore_for_file: no_leading_underscores_for_local_identifiers, use_build_context_synchronously
|
||||
|
||||
import 'package:filcnaplo/api/providers/user_provider.dart';
|
||||
import 'package:filcnaplo/api/providers/database_provider.dart';
|
||||
@@ -45,17 +45,21 @@ class AbsenceProvider with ChangeNotifier {
|
||||
(await _database.query.getSettings(_database)).renamedSubjectsEnabled
|
||||
? await _database.userQuery.renamedSubjects(
|
||||
userId:
|
||||
// ignore: use_build_context_synchronously
|
||||
Provider.of<UserProvider>(_context, listen: false).user!.id)
|
||||
: {};
|
||||
Map<String, String> renamedTeachers =
|
||||
(await _database.query.getSettings(_database)).renamedTeachersEnabled
|
||||
? await _database.userQuery.renamedTeachers(
|
||||
userId:
|
||||
// ignore: use_build_context_synchronously
|
||||
Provider.of<UserProvider>(_context, listen: false).user!.id)
|
||||
: {};
|
||||
|
||||
// v5
|
||||
Map<String, String> customRoundings = await _database.userQuery
|
||||
.getRoundings(
|
||||
userId:
|
||||
Provider.of<UserProvider>(_context, listen: false).user!.id);
|
||||
|
||||
for (Absence absence in _absences) {
|
||||
absence.subject.renamedTo = renamedSubjects.isNotEmpty
|
||||
? renamedSubjects[absence.subject.id]
|
||||
@@ -63,6 +67,11 @@ class AbsenceProvider with ChangeNotifier {
|
||||
absence.teacher.renamedTo = renamedTeachers.isNotEmpty
|
||||
? renamedTeachers[absence.teacher.id]
|
||||
: null;
|
||||
|
||||
// v5
|
||||
absence.subject.customRounding = customRoundings.isNotEmpty
|
||||
? double.parse(customRoundings[absence.subject.id] ?? '5.0')
|
||||
: null;
|
||||
}
|
||||
|
||||
notifyListeners();
|
||||
|
||||
@@ -87,6 +87,10 @@ class GradeProvider with ChangeNotifier {
|
||||
? await _database.userQuery.renamedTeachers(userId: _user.user!.id)
|
||||
: {};
|
||||
|
||||
// v5
|
||||
Map<String, String> customRoundings =
|
||||
await _database.userQuery.getRoundings(userId: _user.user!.id);
|
||||
|
||||
for (Grade grade in _grades) {
|
||||
grade.subject.renamedTo =
|
||||
renamedSubjects.isNotEmpty ? renamedSubjects[grade.subject.id] : null;
|
||||
@@ -109,6 +113,11 @@ class GradeProvider with ChangeNotifier {
|
||||
""
|
||||
? '${grade.json!["SzovegesErtekelesRovidNev"]}'.i18n
|
||||
: grade.value.valueName;
|
||||
|
||||
// v5
|
||||
grade.subject.customRounding = customRoundings.isNotEmpty
|
||||
? double.parse(customRoundings[grade.subject.id] ?? '5.0')
|
||||
: null;
|
||||
}
|
||||
|
||||
notifyListeners();
|
||||
|
||||
@@ -45,6 +45,10 @@ class TimetableProvider with ChangeNotifier {
|
||||
? await _database.userQuery.renamedTeachers(userId: _user.id!)
|
||||
: {};
|
||||
|
||||
// v5
|
||||
Map<String, String> customRoundings =
|
||||
await _database.userQuery.getRoundings(userId: _user.user!.id);
|
||||
|
||||
for (Lesson lesson in lessons.values.expand((e) => e)) {
|
||||
lesson.subject.renamedTo = renamedSubjects.isNotEmpty
|
||||
? renamedSubjects[lesson.subject.id]
|
||||
@@ -52,6 +56,11 @@ class TimetableProvider with ChangeNotifier {
|
||||
lesson.teacher.renamedTo = renamedTeachers.isNotEmpty
|
||||
? renamedTeachers[lesson.teacher.id]
|
||||
: null;
|
||||
|
||||
// v5
|
||||
lesson.subject.customRounding = customRoundings.isNotEmpty
|
||||
? double.parse(customRoundings[lesson.subject.id] ?? '5.0')
|
||||
: null;
|
||||
}
|
||||
|
||||
notifyListeners();
|
||||
|
||||
Reference in New Issue
Block a user