-
-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add teachers to the timetable (#1629)
## Description This pull request adds the Sharezone Plus feature to add teachers to the timetable. ## Demo https://github.com/SharezoneApp/sharezone-app/assets/24459435/51576d4d-c5ac-42be-bee9-04084cb228a5 Changed the lesson sheet to a dialog: ![image](https://github.com/SharezoneApp/sharezone-app/assets/24459435/a856afb7-9c76-4dd7-8ae0-f4af1466f6e3) Reason: In the sheet you need to scroll to see the substitutions tiles and it's not easy to adjust the size of the sheet (depending on the screen size). A dialog is here the better option. Users can also add the teacher when adding a lesson: ![image](https://github.com/SharezoneApp/sharezone-app/assets/24459435/cdbff9b2-2d99-4371-906a-414aba708264) Sharezone Plus page: ![image](https://github.com/SharezoneApp/sharezone-app/assets/24459435/e737e6d5-5bbb-4638-ab2b-cd6d38d882d0) ## Related Tickets Closes #1608 Opens #1628
- Loading branch information
1 parent
34c9cfa
commit f1ae76d
Showing
24 changed files
with
620 additions
and
158 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
app/lib/timetable/timetable_add/tabs/room_and_teacher_tab.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
// Copyright (c) 2022 Sharezone UG (haftungsbeschränkt) | ||
// Licensed under the EUPL-1.2-or-later. | ||
// | ||
// You may obtain a copy of the Licence at: | ||
// https://joinup.ec.europa.eu/software/page/eupl | ||
// | ||
// SPDX-License-Identifier: EUPL-1.2 | ||
|
||
part of '../timetable_add_page.dart'; | ||
|
||
class _RoomAndTeachersTab extends StatelessWidget { | ||
const _RoomAndTeachersTab({ | ||
required this.index, | ||
}); | ||
|
||
final int index; | ||
|
||
@override | ||
Widget build(BuildContext context) { | ||
final bloc = BlocProvider.of<TimetableAddBloc>(context); | ||
return _TimetableAddSection( | ||
index: index, | ||
title: 'Gib einen Raum & eine Lehrkraft an (optional)', | ||
child: Padding( | ||
padding: const EdgeInsets.symmetric(horizontal: 8), | ||
child: Column( | ||
children: [ | ||
RoomField( | ||
onChanged: bloc.changeRoom, | ||
), | ||
const SizedBox(height: 16), | ||
TeacherField( | ||
teachers: BlocProvider.of<TimetableBloc>(context).currentTeachers, | ||
onTeacherChanged: bloc.changeTeacher, | ||
), | ||
], | ||
), | ||
), | ||
); | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.