Skip to content

Commit 8b07c13

Browse files
dabblingwithcodedabblingwithcode
committed
pupil profile pages WIP
1 parent 5e66f6a commit 8b07c13

33 files changed

Lines changed: 420 additions & 298 deletions

File tree

‎school_data_hub_flutter/HP_credentials_@lehrer3‎

Whitespace-only changes.

‎school_data_hub_flutter/lib/common/widgets/dialogs/pupil_list_dialog.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
33
import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_app_bar.dart';
44
import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_sliver_list.dart';
55
import 'package:school_data_hub_flutter/features/_pupil/domain/models/pupil_proxy.dart';
6-
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/language_content/pupil_language_card.dart';
6+
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/pupil_profile_page_content/language_content/pupil_language_card.dart';
77

88
class PupilListDialog extends StatefulWidget {
99
final String title;

‎school_data_hub_flutter/lib/core/auth/auth_clearance_helper.dart‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ import 'package:school_data_hub_flutter/features/_pupil/domain/models/pupil_prox
55
enum Clearance { none, developer, admin, tester }
66

77
class AuthClearanceHelper {
8-
static bool isAuthorized(Clearance clearanceLevel, {String? createdBy}) {
8+
static bool isAuthorizedForItem(
9+
Clearance clearanceLevel, {
10+
String? createdBy,
11+
}) {
912
final currentUser = di<HubSessionManager>().user!;
1013

1114
switch (clearanceLevel) {

‎school_data_hub_flutter/lib/core/session/hub_session_manager.dart‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,6 @@ class HubSessionManager with ChangeNotifier {
199199
);
200200

201201
if (authResponse.response.success) {
202-
_notificationService.showSnackBar(
203-
NotificationType.success,
204-
'Erfolgreich eingeloggt!',
205-
);
206202
await di<HubSessionManager>().registerSignedInUser(
207203
authResponse.response.userInfo!,
208204
authResponse.response.keyId!,

‎school_data_hub_flutter/lib/features/_pupil/presentation/pupil_profile_page/pupil_profile_page.dart‎

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter/services.dart';
3-
import 'package:flutter_it/flutter_it.dart';
43
import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
54
import 'package:school_data_hub_flutter/common/widgets/bottom_nav_bar/bottom_nav_bar_layouts.dart';
65
import 'package:school_data_hub_flutter/features/_pupil/domain/models/pupil_proxy.dart';
7-
import 'package:school_data_hub_flutter/features/_pupil/domain/pupil_proxy_manager.dart';
6+
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/pupil_profile_page_content/pupil_profile_page_content.dart';
87
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_bottom_navbar.dart';
98
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_heading_card.dart';
109
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_navigation.dart';
11-
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/pupil_profile_page_content.dart';
1210

1311
class PupilProfilePage extends StatelessWidget {
1412
final PupilProxy pupil;
@@ -17,45 +15,42 @@ class PupilProfilePage extends StatelessWidget {
1715

1816
@override
1917
Widget build(BuildContext context) {
20-
final pupilManager = di<PupilProxyManager>();
2118
return Scaffold(
2219
backgroundColor: AppColors.pupilProfileBackgroundColor,
23-
body: SafeArea(
24-
child: Center(
25-
child: ConstrainedBox(
26-
constraints: const BoxConstraints(maxWidth: 800),
27-
child: Column(
28-
children: [
29-
Expanded(
30-
child: NestedScrollView(
31-
physics: const AlwaysScrollableScrollPhysics(),
32-
headerSliverBuilder: (context, innerBoxIsScrolled) => [
33-
SliverAppBar(
34-
systemOverlayStyle: SystemUiOverlayStyle(
35-
statusBarColor: AppColors.pupilProfileBackgroundColor,
36-
),
37-
pinned: true,
38-
floating: true,
39-
snap: true,
40-
scrolledUnderElevation: null,
41-
automaticallyImplyLeading: false,
42-
leading: null,
43-
backgroundColor: AppColors.pupilProfileBackgroundColor,
44-
toolbarHeight: 60,
45-
expandedHeight: 120,
46-
stretch: false,
47-
elevation: 0,
48-
flexibleSpace: PupilProfileHeadingCard(pupil: pupil),
20+
body: Center(
21+
child: ConstrainedBox(
22+
constraints: const BoxConstraints(maxWidth: 800),
23+
child: Column(
24+
children: [
25+
Expanded(
26+
child: NestedScrollView(
27+
physics: const AlwaysScrollableScrollPhysics(),
28+
headerSliverBuilder: (context, innerBoxIsScrolled) => [
29+
SliverAppBar(
30+
systemOverlayStyle: SystemUiOverlayStyle(
31+
statusBarColor: AppColors.pupilProfileBackgroundColor,
4932
),
50-
],
51-
body: PupilProfilePageContent(pupil: pupil),
52-
),
33+
pinned: true,
34+
floating: false,
35+
snap: false,
36+
scrolledUnderElevation: null,
37+
automaticallyImplyLeading: false,
38+
leading: null,
39+
backgroundColor: AppColors.pupilProfileBackgroundColor,
40+
toolbarHeight: 60,
41+
expandedHeight: 110,
42+
stretch: false,
43+
elevation: 0,
44+
flexibleSpace: PupilProfileHeadingCard(pupil: pupil),
45+
),
46+
],
47+
body: PupilProfilePageContent(pupil: pupil),
5348
),
54-
PupilProfileNavigation(
55-
boxWidth: MediaQuery.sizeOf(context).width,
56-
),
57-
],
58-
),
49+
),
50+
PupilProfileNavigation(
51+
boxWidth: MediaQuery.sizeOf(context).width,
52+
),
53+
],
5954
),
6055
),
6156
),

school_data_hub_flutter/lib/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/after_school_care_content/pupil_profile_after_school_care_content.dart renamed to school_data_hub_flutter/lib/features/_pupil/presentation/pupil_profile_page/pupil_profile_page_content/after_school_care_content/pupil_profile_after_school_care_content.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
22
import 'package:school_data_hub_flutter/features/_pupil/domain/models/pupil_proxy.dart';
33
import 'package:school_data_hub_flutter/features/_pupil/presentation/after_school_care/widgets/after_school_care_details.dart';
4-
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/widgets/pupil_profile_content_widgets.dart';
4+
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_content_widgets.dart';
55

66
class PupilProfileAfterSchoolCareContent extends StatelessWidget {
77
final PupilProxy pupil;

school_data_hub_flutter/lib/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/attendance_content/pupil_profile_attendance_content.dart renamed to school_data_hub_flutter/lib/features/_pupil/presentation/pupil_profile_page/pupil_profile_page_content/attendance_content/pupil_profile_attendance_content.dart

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:school_data_hub_flutter/features/_attendance/presentation/missed
88
import 'package:school_data_hub_flutter/features/_attendance/presentation/widgets/attendance_stats_pupil.dart';
99
import 'package:school_data_hub_flutter/features/_attendance/presentation/widgets/missed_schoolday_card.dart';
1010
import 'package:school_data_hub_flutter/features/_pupil/domain/models/pupil_proxy.dart';
11-
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/widgets/pupil_profile_content_widgets.dart';
11+
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_content_widgets.dart';
1212

1313
class PupilAttendanceContent extends WatchingWidget {
1414
final PupilProxy pupil;
@@ -45,10 +45,7 @@ class PupilAttendanceContent extends WatchingWidget {
4545
Row(
4646
mainAxisAlignment: MainAxisAlignment.start,
4747
children: [
48-
const Text(
49-
'Fehlstunden:',
50-
style: TextStyle(fontSize: 14),
51-
),
48+
const Text('Fehlstunden:', style: TextStyle(fontSize: 14)),
5249
Text(
5350
' ${missedHoursForActualReport.missed.toString()}',
5451
style: const TextStyle(
@@ -58,10 +55,7 @@ class PupilAttendanceContent extends WatchingWidget {
5855
),
5956
),
6057
const Gap(5),
61-
const Text(
62-
'davon unent:',
63-
style: TextStyle(fontSize: 14),
64-
),
58+
const Text('davon unent:', style: TextStyle(fontSize: 14)),
6559
Text(
6660
' ${missedHoursForActualReport.unexcused.toString()}',
6761
style: const TextStyle(

school_data_hub_flutter/lib/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/authorization_content/pupil_profile_authorization_content.dart renamed to school_data_hub_flutter/lib/features/_pupil/presentation/pupil_profile_page/pupil_profile_page_content/authorization_content/pupil_profile_authorization_content.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import 'package:flutter/material.dart';
22
import 'package:school_data_hub_flutter/features/_authorizations/presentation/authorizations_list_page/authorizations_list_page.dart';
33
import 'package:school_data_hub_flutter/features/_pupil/domain/models/pupil_proxy.dart';
4-
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/authorization_content/pupil_profile_authorization_content_list.dart';
5-
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/widgets/pupil_profile_content_widgets.dart';
4+
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/pupil_profile_page_content/authorization_content/pupil_profile_authorization_content_list.dart';
5+
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_content_widgets.dart';
66

77
class PupilProfileAuthorizationContent extends StatelessWidget {
88
final PupilProxy pupil;

school_data_hub_flutter/lib/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/authorization_content/pupil_profile_authorization_content_list.dart renamed to school_data_hub_flutter/lib/features/_pupil/presentation/pupil_profile_page/pupil_profile_page_content/authorization_content/pupil_profile_authorization_content_list.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import 'package:flutter/material.dart';
2+
import 'package:flutter_it/flutter_it.dart';
23
import 'package:school_data_hub_client/school_data_hub_client.dart';
34
import 'package:school_data_hub_flutter/features/_authorizations/domain/authorization_manager.dart';
45
import 'package:school_data_hub_flutter/features/_pupil/domain/models/pupil_proxy.dart';
5-
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/authorization_content/pupil_profile_authorization_entry_card.dart';
6-
import 'package:flutter_it/flutter_it.dart';
6+
import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_profile_page/pupil_profile_page_content/authorization_content/pupil_profile_authorization_entry_card.dart';
77

88
class PupilProfileAuthorizationContentList extends WatchingWidget {
99
final PupilProxy pupil;

school_data_hub_flutter/lib/features/_pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/authorization_content/pupil_profile_authorization_entry_card.dart renamed to school_data_hub_flutter/lib/features/_pupil/presentation/pupil_profile_page/pupil_profile_page_content/authorization_content/pupil_profile_authorization_entry_card.dart

File renamed without changes.

0 commit comments

Comments
 (0)