firka/student-legacy
firka/student-legacy
8
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed little issues with lesson popups

Browse Source
This commit is contained in:
Kima 2024-05-21 19:46:47 +02:00
parent a319b26d82
commit 416f42f42d
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
refilc_mobile_ui/lib/common/widgets/lesson/lesson_viewable.dart
View File

@ -481,13 +481,15 @@ class TimetableLessonPopup extends StatelessWidget {
height: 8.0, height: 8.0,
), ),
Text( Text(
(lesson.teacher.isRenamed && ((lesson.substituteTeacher == null ||
Provider.of<SettingsProvider>(context, lesson.substituteTeacher!.name == "")
listen: false) ? (lesson.teacher.isRenamed
.renamedTeachersEnabled) ? lesson.teacher.renamedTo
? (lesson.teacher.renamedTo ?? : lesson.teacher.name)
lesson.teacher.name) : (lesson.substituteTeacher!.isRenamed
: lesson.teacher.name, ? lesson.substituteTeacher!.renamedTo
: lesson.substituteTeacher!.name)) ??
'',
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(0.9), color: AppColors.of(context).text.withOpacity(0.9),
fontSize: 14.0, fontSize: 14.0,

8
refilc_mobile_ui/lib/pages/timetable/timetable_page.dart
View File

@ -20,7 +20,7 @@ import 'package:refilc_mobile_ui/common/empty.dart';
import 'package:refilc_mobile_ui/common/profile_image/profile_button.dart'; import 'package:refilc_mobile_ui/common/profile_image/profile_button.dart';
import 'package:refilc_mobile_ui/common/profile_image/profile_image.dart'; import 'package:refilc_mobile_ui/common/profile_image/profile_image.dart';
import 'package:refilc_mobile_ui/common/system_chrome.dart'; import 'package:refilc_mobile_ui/common/system_chrome.dart';
import 'package:refilc_mobile_ui/common/widgets/lesson/lesson_view.dart'; // import 'package:refilc_mobile_ui/common/widgets/lesson/lesson_view.dart';
import 'package:refilc_kreta_api/controllers/timetable_controller.dart'; import 'package:refilc_kreta_api/controllers/timetable_controller.dart';
import 'package:refilc_mobile_ui/common/widgets/lesson/lesson_viewable.dart'; import 'package:refilc_mobile_ui/common/widgets/lesson/lesson_viewable.dart';
import 'package:refilc_mobile_ui/pages/timetable/day_title.dart'; import 'package:refilc_mobile_ui/pages/timetable/day_title.dart';
@ -61,7 +61,11 @@ class TimetablePage extends StatefulWidget {
NavigationScreen.of(context)?.setPage("timetable"); NavigationScreen.of(context)?.setPage("timetable");
// Show initial Lesson // Show initial Lesson
if (lesson != null) LessonView.show(lesson, context: context); // if (lesson != null) LessonView.show(lesson, context: context);
// changed to new popup
if (lesson != null) {
TimetableLessonPopup.show(context: context, lesson: lesson);
}
} }
@override @override