added book lendings for users, many fixes

Author: dabblingwithcode

docs/model_relations/school_data_hub_server.svg

@@ -13,6 +13,7 @@ import 'package:serverpod_client/serverpod_client.dart' as _i1;
 import '../../../_features/pupil/models/pupil_data/pupil_data.dart' as _i2;
 import '../../../_features/books/models/library_book.dart' as _i3;
 import '../../../_shared/models/hub_document.dart' as _i4;
+import '../../../_features/user/models/staff_user.dart' as _i5;
 
 abstract class PupilBookLending implements _i1.SerializableModel {
   PupilBookLending._({
@@ -25,12 +26,15 @@ abstract class PupilBookLending implements _i1.SerializableModel {
     required this.lentBy,
     this.returnedAt,
     this.receivedBy,
-    required this.pupilId,
+    this.pupilId,
     this.pupil,
     required this.isbn,
     required this.libraryBookId,
     this.libraryBook,
     this.pupilBookLendingFiles,
+    this.borrowerUserId,
+    this.borrowerUser,
+    this.borrowerType,
   });
 
   factory PupilBookLending({
@@ -43,12 +47,15 @@ abstract class PupilBookLending implements _i1.SerializableModel {
     required String lentBy,
     DateTime? returnedAt,
     String? receivedBy,
-    required int pupilId,
+    int? pupilId,
     _i2.PupilData? pupil,
     required int isbn,
     required int libraryBookId,
     _i3.LibraryBook? libraryBook,
     List<_i4.HubDocument>? pupilBookLendingFiles,
+    int? borrowerUserId,
+    _i5.User? borrowerUser,
+    String? borrowerType,
   }) = _PupilBookLendingImpl;
 
   factory PupilBookLending.fromJson(Map<String, dynamic> jsonSerialization) {
@@ -64,7 +71,7 @@ abstract class PupilBookLending implements _i1.SerializableModel {
           ? null
           : _i1.DateTimeJsonExtension.fromJson(jsonSerialization['returnedAt']),
       receivedBy: jsonSerialization['receivedBy'] as String?,
-      pupilId: jsonSerialization['pupilId'] as int,
+      pupilId: jsonSerialization['pupilId'] as int?,
       pupil: jsonSerialization['pupil'] == null
           ? null
           : _i2.PupilData.fromJson(
@@ -79,6 +86,12 @@ abstract class PupilBookLending implements _i1.SerializableModel {
               as List?)
           ?.map((e) => _i4.HubDocument.fromJson((e as Map<String, dynamic>)))
           .toList(),
+      borrowerUserId: jsonSerialization['borrowerUserId'] as int?,
+      borrowerUser: jsonSerialization['borrowerUser'] == null
+          ? null
+          : _i5.User.fromJson(
+              (jsonSerialization['borrowerUser'] as Map<String, dynamic>)),
+      borrowerType: jsonSerialization['borrowerType'] as String?,
     );
   }
 
@@ -103,7 +116,7 @@ abstract class PupilBookLending implements _i1.SerializableModel {
 
   String? receivedBy;
 
-  int pupilId;
+  int? pupilId;
 
   _i2.PupilData? pupil;
 
@@ -115,6 +128,12 @@ abstract class PupilBookLending implements _i1.SerializableModel {
 
   List<_i4.HubDocument>? pupilBookLendingFiles;
 
+  int? borrowerUserId;
+
+  _i5.User? borrowerUser;
+
+  String? borrowerType;
+
   /// Returns a shallow copy of this [PupilBookLending]
   /// with some or all fields replaced by the given arguments.
   @_i1.useResult
@@ -134,6 +153,9 @@ abstract class PupilBookLending implements _i1.SerializableModel {
     int? libraryBookId,
     _i3.LibraryBook? libraryBook,
     List<_i4.HubDocument>? pupilBookLendingFiles,
+    int? borrowerUserId,
+    _i5.User? borrowerUser,
+    String? borrowerType,
   });
   @override
   Map<String, dynamic> toJson() {
@@ -147,14 +169,17 @@ abstract class PupilBookLending implements _i1.SerializableModel {
       'lentBy': lentBy,
       if (returnedAt != null) 'returnedAt': returnedAt?.toJson(),
       if (receivedBy != null) 'receivedBy': receivedBy,
-      'pupilId': pupilId,
+      if (pupilId != null) 'pupilId': pupilId,
       if (pupil != null) 'pupil': pupil?.toJson(),
       'isbn': isbn,
       'libraryBookId': libraryBookId,
       if (libraryBook != null) 'libraryBook': libraryBook?.toJson(),
       if (pupilBookLendingFiles != null)
         'pupilBookLendingFiles':
             pupilBookLendingFiles?.toJson(valueToJson: (v) => v.toJson()),
+      if (borrowerUserId != null) 'borrowerUserId': borrowerUserId,
+      if (borrowerUser != null) 'borrowerUser': borrowerUser?.toJson(),
+      if (borrowerType != null) 'borrowerType': borrowerType,
     };
   }
 
@@ -177,12 +202,15 @@ class _PupilBookLendingImpl extends PupilBookLending {
     required String lentBy,
     DateTime? returnedAt,
     String? receivedBy,
-    required int pupilId,
+    int? pupilId,
     _i2.PupilData? pupil,
     required int isbn,
     required int libraryBookId,
     _i3.LibraryBook? libraryBook,
     List<_i4.HubDocument>? pupilBookLendingFiles,
+    int? borrowerUserId,
+    _i5.User? borrowerUser,
+    String? borrowerType,
   }) : super._(
           id: id,
           lendingId: lendingId,
@@ -199,6 +227,9 @@ class _PupilBookLendingImpl extends PupilBookLending {
           libraryBookId: libraryBookId,
           libraryBook: libraryBook,
           pupilBookLendingFiles: pupilBookLendingFiles,
+          borrowerUserId: borrowerUserId,
+          borrowerUser: borrowerUser,
+          borrowerType: borrowerType,
         );
 
   /// Returns a shallow copy of this [PupilBookLending]
@@ -215,12 +246,15 @@ class _PupilBookLendingImpl extends PupilBookLending {
     String? lentBy,
     Object? returnedAt = _Undefined,
     Object? receivedBy = _Undefined,
-    int? pupilId,
+    Object? pupilId = _Undefined,
     Object? pupil = _Undefined,
     int? isbn,
     int? libraryBookId,
     Object? libraryBook = _Undefined,
     Object? pupilBookLendingFiles = _Undefined,
+    Object? borrowerUserId = _Undefined,
+    Object? borrowerUser = _Undefined,
+    Object? borrowerType = _Undefined,
   }) {
     return PupilBookLending(
       id: id is int? ? id : this.id,
@@ -232,7 +266,7 @@ class _PupilBookLendingImpl extends PupilBookLending {
       lentBy: lentBy ?? this.lentBy,
       returnedAt: returnedAt is DateTime? ? returnedAt : this.returnedAt,
       receivedBy: receivedBy is String? ? receivedBy : this.receivedBy,
-      pupilId: pupilId ?? this.pupilId,
+      pupilId: pupilId is int? ? pupilId : this.pupilId,
       pupil: pupil is _i2.PupilData? ? pupil : this.pupil?.copyWith(),
       isbn: isbn ?? this.isbn,
       libraryBookId: libraryBookId ?? this.libraryBookId,
@@ -242,6 +276,12 @@ class _PupilBookLendingImpl extends PupilBookLending {
       pupilBookLendingFiles: pupilBookLendingFiles is List<_i4.HubDocument>?
           ? pupilBookLendingFiles
           : this.pupilBookLendingFiles?.map((e0) => e0.copyWith()).toList(),
+      borrowerUserId:
+          borrowerUserId is int? ? borrowerUserId : this.borrowerUserId,
+      borrowerUser: borrowerUser is _i5.User?
+          ? borrowerUser
+          : this.borrowerUser?.copyWith(),
+      borrowerType: borrowerType is String? ? borrowerType : this.borrowerType,
     );
   }
 }

school_data_hub_client/lib/src/protocol/_features/books/models/pupil_book_lending.dart

@@ -17,6 +17,7 @@ import '../../../_features/timetable/models/junction_models/scheduled_lesson_tea
 import '../../../_features/timetable/models/junction_models/lesson_teacher.dart'
     as _i5;
 import '../../../_features/user/models/user_flags.dart' as _i6;
+import '../../../_features/books/models/pupil_book_lending.dart' as _i7;
 
 abstract class User implements _i1.SerializableModel {
   User._({
@@ -33,6 +34,7 @@ abstract class User implements _i1.SerializableModel {
     this.schooldayEventsProcessingTeam,
     required this.credit,
     required this.userFlags,
+    this.bookLendings,
   });
 
   factory User({
@@ -49,6 +51,7 @@ abstract class User implements _i1.SerializableModel {
     String? schooldayEventsProcessingTeam,
     required int credit,
     required _i6.UserFlags userFlags,
+    List<_i7.PupilBookLending>? bookLendings,
   }) = _UserImpl;
 
   factory User.fromJson(Map<String, dynamic> jsonSerialization) {
@@ -81,6 +84,10 @@ abstract class User implements _i1.SerializableModel {
       credit: jsonSerialization['credit'] as int,
       userFlags: _i6.UserFlags.fromJson(
           (jsonSerialization['userFlags'] as Map<String, dynamic>)),
+      bookLendings: (jsonSerialization['bookLendings'] as List?)
+          ?.map(
+              (e) => _i7.PupilBookLending.fromJson((e as Map<String, dynamic>)))
+          .toList(),
     );
   }
 
@@ -113,6 +120,8 @@ abstract class User implements _i1.SerializableModel {
 
   _i6.UserFlags userFlags;
 
+  List<_i7.PupilBookLending>? bookLendings;
+
   /// Returns a shallow copy of this [User]
   /// with some or all fields replaced by the given arguments.
   @_i1.useResult
@@ -130,6 +139,7 @@ abstract class User implements _i1.SerializableModel {
     String? schooldayEventsProcessingTeam,
     int? credit,
     _i6.UserFlags? userFlags,
+    List<_i7.PupilBookLending>? bookLendings,
   });
   @override
   Map<String, dynamic> toJson() {
@@ -152,6 +162,8 @@ abstract class User implements _i1.SerializableModel {
         'schooldayEventsProcessingTeam': schooldayEventsProcessingTeam,
       'credit': credit,
       'userFlags': userFlags.toJson(),
+      if (bookLendings != null)
+        'bookLendings': bookLendings?.toJson(valueToJson: (v) => v.toJson()),
     };
   }
 
@@ -178,6 +190,7 @@ class _UserImpl extends User {
     String? schooldayEventsProcessingTeam,
     required int credit,
     required _i6.UserFlags userFlags,
+    List<_i7.PupilBookLending>? bookLendings,
   }) : super._(
           id: id,
           userInfoId: userInfoId,
@@ -192,6 +205,7 @@ class _UserImpl extends User {
           schooldayEventsProcessingTeam: schooldayEventsProcessingTeam,
           credit: credit,
           userFlags: userFlags,
+          bookLendings: bookLendings,
         );
 
   /// Returns a shallow copy of this [User]
@@ -212,6 +226,7 @@ class _UserImpl extends User {
     Object? schooldayEventsProcessingTeam = _Undefined,
     int? credit,
     _i6.UserFlags? userFlags,
+    Object? bookLendings = _Undefined,
   }) {
     return User(
       id: id is int? ? id : this.id,
@@ -237,6 +252,9 @@ class _UserImpl extends User {
           : this.schooldayEventsProcessingTeam,
       credit: credit ?? this.credit,
       userFlags: userFlags ?? this.userFlags.copyWith(),
+      bookLendings: bookLendings is List<_i7.PupilBookLending>?
+          ? bookLendings
+          : this.bookLendings?.map((e0) => e0.copyWith()).toList(),
     );
   }
 }

school_data_hub_client/lib/src/protocol/_features/user/models/staff_user.dart

@@ -983,6 +983,21 @@ class EndpointPupilBookLending extends _i1.EndpointRef {
         },
       );
 
+  _i2.Future<_i31.PupilBookLending> postUserBookLending(
+    int userId,
+    String libraryId,
+    String lentBy,
+  ) =>
+      caller.callServerEndpoint<_i31.PupilBookLending>(
+        'pupilBookLending',
+        'postUserBookLending',
+        {
+          'userId': userId,
+          'libraryId': libraryId,
+          'lentBy': lentBy,
+        },
+      );
+
   _i2.Future<List<_i31.PupilBookLending>> fetchPupilBookLendings() =>
       caller.callServerEndpoint<List<_i31.PupilBookLending>>(
         'pupilBookLending',

school_data_hub_client/lib/src/protocol/client.dart

@@ -1407,6 +1407,13 @@ class Protocol extends _i1.SerializationManager {
           ? (data as List).map((e) => deserialize<int>(e)).toSet()
           : null) as T;
     }
+    if (t == _i1.getType<List<_i27.PupilBookLending>?>()) {
+      return (data != null
+          ? (data as List)
+              .map((e) => deserialize<_i27.PupilBookLending>(e))
+              .toList()
+          : null) as T;
+    }
     if (t == List<_i17.UserDevice>) {
       return (data as List).map((e) => deserialize<_i17.UserDevice>(e)).toList()
           as T;

school_data_hub_client/lib/src/protocol/protocol.dart

@@ -5,7 +5,12 @@ import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 
 class BottomNavBarLayout extends StatelessWidget {
   final Widget bottomNavBar;
-  const BottomNavBarLayout({required this.bottomNavBar, super.key});
+  final bool? isMainNavigation;
+  const BottomNavBarLayout({
+    required this.bottomNavBar,
+    this.isMainNavigation,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -14,7 +19,9 @@ class BottomNavBarLayout extends StatelessWidget {
           ? const EdgeInsets.only(left: 5, right: 5, bottom: 20)
           : const EdgeInsets.only(left: 5, right: 5, bottom: 20),
       child: SizedBox(
-        height: kBottomNavigationBarHeight + 30,
+        height: isMainNavigation == true
+            ? kBottomNavigationBarHeight + 30
+            : kBottomNavigationBarHeight,
         child: Align(
           alignment: Alignment.bottomCenter,
           child: ConstrainedBox(