devbeni/student-legacy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Márton Kiss
2023-12-25 22:09:22 +01:00
committed by GitHub
parent 8ef2bee62e cd0c821bae
commit d2d36c3d0f
5 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
filcnaplo/lib/api/providers/live_card_provider.dart
View File

@@ -88,7 +88,7 @@ class LiveCardProvider extends ChangeNotifier {
// Debugging
static DateTime _now() {
// return DateTime(2023, 8, 31, 8, 0);
// return DateTime(2023, 9, 27, 9, 30);
return DateTime.now();
}
@@ -120,7 +120,7 @@ class LiveCardProvider extends ChangeNotifier {
"index":
currentLesson != null ? '${currentLesson!.lessonIndex}. ' : "",
"title": currentLesson != null
? ShortSubject.resolve(subject: currentLesson?.subject).capital()
? currentLesson?.subject.renamedTo ?? ShortSubject.resolve(subject: currentLesson?.subject).capital()
: "",
"subtitle": currentLesson?.room.replaceAll("_", " ") ?? "",
"description": currentLesson?.description ?? "",
@@ -131,7 +131,7 @@ class LiveCardProvider extends ChangeNotifier {
_delay.inMilliseconds)
.toString(),
"nextSubject": nextLesson != null
? ShortSubject.resolve(subject: nextLesson?.subject).capital()
? nextLesson?.subject.renamedTo ?? ShortSubject.resolve(subject: nextLesson?.subject).capital()
: "",
"nextRoom": nextLesson?.room.replaceAll("_", " ") ?? "",
};
@@ -160,7 +160,7 @@ class LiveCardProvider extends ChangeNotifier {
_delay.inMilliseconds)
.toString(),
"nextSubject": (nextLesson != null
? ShortSubject.resolve(subject: nextLesson?.subject)
? nextLesson?.subject.renamedTo ?? ShortSubject.resolve(subject: nextLesson?.subject).capital()
: "")
.capital(),
"nextRoom": nextLesson?.room.replaceAll("_", " ") ?? "",