CONVERT KEY TO SUPER PARAMETER KYS
This commit is contained in:
@@ -21,23 +21,14 @@ class KretaAPI {
|
||||
static String groups(String iss) =>
|
||||
BaseKreta.kreta(iss) + KretaApiEndpoints.groups;
|
||||
static String groupAverages(String iss, String uid) =>
|
||||
BaseKreta.kreta(iss) +
|
||||
KretaApiEndpoints.groupAverages +
|
||||
"?oktatasiNevelesiFeladatUid=" +
|
||||
uid;
|
||||
"${BaseKreta.kreta(iss)}${KretaApiEndpoints.groupAverages}?oktatasiNevelesiFeladatUid=$uid";
|
||||
static String averages(String iss, String uid) =>
|
||||
BaseKreta.kreta(iss) +
|
||||
KretaApiEndpoints.averages +
|
||||
"?oktatasiNevelesiFeladatUid=" +
|
||||
uid;
|
||||
"${BaseKreta.kreta(iss)}${KretaApiEndpoints.averages}?oktatasiNevelesiFeladatUid=$uid";
|
||||
static String timetable(String iss, {DateTime? start, DateTime? end}) =>
|
||||
BaseKreta.kreta(iss) +
|
||||
KretaApiEndpoints.timetable +
|
||||
(start != null && end != null
|
||||
? "?datumTol=" +
|
||||
start.toUtc().toIso8601String() +
|
||||
"&datumIg=" +
|
||||
end.toUtc().toIso8601String()
|
||||
? "?datumTol=${start.toUtc().toIso8601String()}&datumIg=${end.toUtc().toIso8601String()}"
|
||||
: "");
|
||||
static String exams(String iss) =>
|
||||
BaseKreta.kreta(iss) + KretaApiEndpoints.exams;
|
||||
@@ -46,7 +37,7 @@ class KretaAPI {
|
||||
KretaApiEndpoints.homework +
|
||||
(id != null ? "/$id" : "") +
|
||||
(id == null && start != null
|
||||
? "?datumTol=" + DateFormat('yyyy-MM-dd').format(start)
|
||||
? "?datumTol=${DateFormat('yyyy-MM-dd').format(start)}"
|
||||
: "");
|
||||
static String capabilities(String iss) =>
|
||||
BaseKreta.kreta(iss) + KretaApiEndpoints.capabilities;
|
||||
@@ -55,9 +46,7 @@ class KretaAPI {
|
||||
BaseKreta.kreta(iss) +
|
||||
KretaApiEndpoints.downloadHomeworkAttachments(uid, type);
|
||||
static String subjects(String iss, String uid) =>
|
||||
BaseKreta.kreta(iss) +
|
||||
KretaApiEndpoints.subjects +
|
||||
"?oktatasiNevelesiFeladatUid=" + uid;
|
||||
"${BaseKreta.kreta(iss)}${KretaApiEndpoints.subjects}?oktatasiNevelesiFeladatUid=$uid";
|
||||
// Structure:
|
||||
// {
|
||||
// "Uid": 000,
|
||||
|
||||
@@ -154,9 +154,9 @@ class TimetableController extends ChangeNotifier {
|
||||
}
|
||||
|
||||
for (int i = 0; i < days.length; i++) {
|
||||
List<Lesson> _day = List.castFrom(days[i]);
|
||||
List<Lesson> day0 = List.castFrom(days[i]);
|
||||
|
||||
List<int> lessonIndexes = _getIndexes(_day);
|
||||
List<int> lessonIndexes = _getIndexes(day0);
|
||||
int minIndex = 0, maxIndex = 0;
|
||||
|
||||
if (lessonIndexes.isNotEmpty) {
|
||||
@@ -170,7 +170,7 @@ class TimetableController extends ChangeNotifier {
|
||||
// Fill missing indexes with empty spaces
|
||||
for (var i in List<int>.generate(
|
||||
maxIndex - minIndex + 1, (int i) => minIndex + i)) {
|
||||
List<Lesson> indexLessons = _getLessonsByIndex(_day, i);
|
||||
List<Lesson> indexLessons = _getLessonsByIndex(day0, i);
|
||||
|
||||
// Empty lesson
|
||||
if (indexLessons.isEmpty) {
|
||||
@@ -193,13 +193,13 @@ class TimetableController extends ChangeNotifier {
|
||||
}
|
||||
|
||||
// Additional lessons
|
||||
day.addAll(_day.where((l) =>
|
||||
day.addAll(day0.where((l) =>
|
||||
int.tryParse(l.lessonIndex) == null && l.subject.id != ''));
|
||||
|
||||
day.sort((a, b) => a.start.compareTo(b.start));
|
||||
|
||||
// Special Dates
|
||||
for (var l in _day) {
|
||||
for (var l in day0) {
|
||||
l.subject.id == '' ? day.insert(0, l) : null;
|
||||
}
|
||||
|
||||
|
||||
@@ -38,16 +38,16 @@ class ExamProvider with ChangeNotifier {
|
||||
|
||||
// for renamed subjects
|
||||
Future<void> convertBySettings() async {
|
||||
final _database = Provider.of<DatabaseProvider>(_context, listen: false);
|
||||
final database = Provider.of<DatabaseProvider>(_context, listen: false);
|
||||
Map<String, String> renamedSubjects =
|
||||
(await _database.query.getSettings(_database)).renamedSubjectsEnabled
|
||||
? await _database.userQuery.renamedSubjects(
|
||||
(await database.query.getSettings(database)).renamedSubjectsEnabled
|
||||
? await database.userQuery.renamedSubjects(
|
||||
userId:
|
||||
Provider.of<UserProvider>(_context, listen: false).user!.id)
|
||||
: {};
|
||||
Map<String, String> renamedTeachers =
|
||||
(await _database.query.getSettings(_database)).renamedTeachersEnabled
|
||||
? await _database.userQuery.renamedTeachers(
|
||||
(await database.query.getSettings(database)).renamedTeachersEnabled
|
||||
? await database.userQuery.renamedTeachers(
|
||||
userId:
|
||||
Provider.of<UserProvider>(_context, listen: false).user!.id)
|
||||
: {};
|
||||
|
||||
@@ -11,7 +11,10 @@ dependencies:
|
||||
path: ../filcnaplo/
|
||||
http: ^0.13.3
|
||||
provider: ^5.0.0
|
||||
file_picker: ^5.3.2
|
||||
file_picker: ^6.1.1
|
||||
intl: ^0.18.1
|
||||
i18n_extension: ^10.0.1
|
||||
uuid: ^4.2.1
|
||||
|
||||
dev_dependencies:
|
||||
flutter_lints: ^1.0.0
|
||||
flutter_lints: ^3.0.1
|
||||
|
||||
Reference in New Issue
Block a user