fixes part 2

Author: dabblingwithcode

school_data_hub_flutter/lib/common/audio/presentation/audio_button.dart

@@ -11,7 +11,7 @@ import 'package:school_data_hub_flutter/core/auth/auth_clearance_helper.dart';
 /// A button that displays an audio thumbnail and handles playback.
 ///
 /// On tap, it pre-loads the audio and shows the player overlay.
-/// On long press (admin only), it allows deletion of the audio file.
+/// On long press (authorized only), it allows deletion of the audio file.
 class AudioButton extends StatefulWidget {
   const AudioButton({required this.file, required this.onDelete, super.key});
 

school_data_hub_flutter/lib/common/widgets/hub_document/hub_documents_section.dart

@@ -25,7 +25,7 @@ class HubDocumentsSectionWidget extends StatelessWidget {
   final Future<void> Function(File? file) onImageFileCaptured;
 
   /// Callback when a file is recorded (audio).
-  final Future<void> Function(File? file, Map<String, dynamic>? fileInfo)?
+  final Future<void> Function(File? file, String? fileInfo)?
   onAudioFileRecorded;
 
   /// Callback when a document should be removed.
@@ -127,14 +127,11 @@ class HubDocumentsSectionWidget extends StatelessWidget {
               const Gap(10),
             ],
             if (totalCount < maxDocuments) ...[
-              if (withSpacerToButtons) const Spacer(),
+              withSpacerToButtons ? const Spacer() : const Gap(15),
               MediaCaptureButtons(
                 onFileCaptured: onImageFileCaptured,
                 onFileRecorded: (file, fileInfo) {
-                  onAudioFileRecorded?.call(
-                    file,
-                    fileInfo != null ? {'info': fileInfo} : null,
-                  );
+                  onAudioFileRecorded?.call(file, fileInfo);
                 },
                 iconSize: 20,
                 padding: captureButtonPadding ?? const EdgeInsets.all(11),

school_data_hub_flutter/lib/features/books/data/pupil_book_lending_api_service.dart

@@ -56,6 +56,40 @@ class PupilBookLendingApiService {
     return lending;
   }
 
+  //- Add file to lending
+
+  Future<PupilBookLending?> addFileToPupilBookLending({
+    required String lendingId,
+    required String filePath,
+    required String addedBy,
+  }) async {
+    final lending = await ClientHelper.apiCall(
+      call: () => _client.pupilBookLending.addFileToPupilBookLending(
+        lendingId,
+        filePath,
+        addedBy,
+      ),
+      errorMessage: 'Fehler beim Hinzufügen der Datei zur Ausleihe',
+    );
+    return lending;
+  }
+
+  //- delete file from lending
+
+  Future<bool?> removeFileFromPupilBookLending({
+    required String lendingId,
+    required String fileId,
+  }) async {
+    final success = await ClientHelper.apiCall(
+      call: () => _client.pupilBookLending.removeFileFromPupilBookLending(
+        lendingId,
+        fileId,
+      ),
+      errorMessage: 'Fehler beim Entfernen der Datei von der Ausleihe',
+    );
+    return success;
+  }
+
   //- delete
 
   Future<bool?> deletePupilBookLending({required String lendingId}) async {

school_data_hub_flutter/lib/features/books/domain/book_helper.dart

@@ -1,16 +1,27 @@
+import 'package:flutter_it/flutter_it.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
+import 'package:school_data_hub_flutter/features/books/domain/pupil_book_lending_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
-import 'package:flutter_it/flutter_it.dart';
 
 enum BookBorrowStatus { since2Weeks, since3Weeks, since5weeks }
 
 class BookHelpers {
+  static int totalPupilBookLendings() {
+    return di<PupilBookLendingManager>().allPupilBookLendings.length;
+  }
+
+  static int totalOpenPupilBookLendings() {
+    return di<PupilBookLendingManager>().allPupilBookLendings
+        .where((lending) => lending.returnedAt == null)
+        .length;
+  }
+
   static List<PupilBookLending> pupilBookLendingsLinkedToLibraryBook({
     required int libraryBookId,
   }) {
     // Get all pupil book lendings
     final allPupilBookLendings = di<PupilProxyManager>().allPupils
-        .map((pupil) => pupil.pupilBookLendings ?? <PupilBookLending>[])
+        .map((pupil) => pupil.pupilBookLendings)
         .expand((element) => element)
         .toList();
 

school_data_hub_flutter/lib/features/books/domain/pupil_book_lending_manager.dart

@@ -1,6 +1,10 @@
+import 'dart:io';
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter_it/flutter_it.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
+import 'package:school_data_hub_flutter/app_utils/custom_encrypter.dart';
+import 'package:school_data_hub_flutter/common/data/file_upload_service.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/books/data/pupil_book_lending_api_service.dart';
@@ -11,6 +15,7 @@ class PupilBookLendingManager with ChangeNotifier {
 
   final Map<int, List<PupilBookLending>> _pupilBookLendings = {};
   final Map<String, PupilBookLending> _lendingIdMap = {};
+  final Map<int, List<PupilBookLending>> _isbnPupilBookLendingsMap = {};
   final _pupilBookLendingApiService = PupilBookLendingApiService();
 
   Future<PupilBookLendingManager> init() async {
@@ -45,6 +50,14 @@ class PupilBookLendingManager with ChangeNotifier {
     } else {
       _pupilBookLendings[lending.pupilId] = [lending];
     }
+    if (lending.libraryBook != null) {
+      final isbn = lending.isbn;
+      if (_isbnPupilBookLendingsMap.containsKey(isbn)) {
+        _isbnPupilBookLendingsMap[isbn]!.add(lending);
+      } else {
+        _isbnPupilBookLendingsMap[isbn] = [lending];
+      }
+    }
     // Add to lending ID map for quick lookups
     _lendingIdMap[lending.lendingId] = lending;
   }
@@ -59,6 +72,17 @@ class PupilBookLendingManager with ChangeNotifier {
         _pupilBookLendings.remove(lending.pupilId);
       }
     }
+    if (lending.libraryBook != null) {
+      final isbn = lending.isbn;
+      if (_isbnPupilBookLendingsMap.containsKey(isbn)) {
+        _isbnPupilBookLendingsMap[isbn]!.removeWhere(
+          (l) => l.lendingId == lending.lendingId,
+        );
+        if (_isbnPupilBookLendingsMap[isbn]!.isEmpty) {
+          _isbnPupilBookLendingsMap.remove(isbn);
+        }
+      }
+    }
     // Remove from lending ID map
     _lendingIdMap.remove(lending.lendingId);
   }
@@ -77,6 +101,21 @@ class PupilBookLendingManager with ChangeNotifier {
     } else {
       _pupilBookLendings[lending.pupilId] = [lending];
     }
+    if (lending.libraryBook != null) {
+      final isbn = lending.isbn;
+      if (_isbnPupilBookLendingsMap.containsKey(isbn)) {
+        final index = _isbnPupilBookLendingsMap[isbn]!.indexWhere(
+          (l) => l.lendingId == lending.lendingId,
+        );
+        if (index != -1) {
+          _isbnPupilBookLendingsMap[isbn]![index] = lending;
+        } else {
+          _isbnPupilBookLendingsMap[isbn]!.add(lending);
+        }
+      } else {
+        _isbnPupilBookLendingsMap[isbn] = [lending];
+      }
+    }
     // Update in lending ID map
     _lendingIdMap[lending.lendingId] = lending;
   }
@@ -193,6 +232,88 @@ class PupilBookLendingManager with ChangeNotifier {
     );
   }
 
+  //- add book lending file
+  Future<void> addPupilBookLendingFile(
+    File file, {
+    required PupilBookLending pupilBookLending,
+    String? fileInfo,
+  }) async {
+    try {
+      final encryptedFile = await customEncrypter.encryptFile(file);
+      final fileResponse = await ClientFileUpload.uploadFile(
+        file: encryptedFile,
+        storageId: StorageId.private,
+        folder: ServerStorageFolder.documents,
+        fileInfo: fileInfo,
+      );
+
+      if (!fileResponse.success) {
+        _notificationService.showSnackBar(
+          NotificationType.error,
+          'Die Datei konnte nicht hochgeladen werden!',
+        );
+        return;
+      }
+
+      final pupilBookLendingWithFile = await _pupilBookLendingApiService
+          .addFileToPupilBookLending(
+            lendingId: pupilBookLending.lendingId,
+            filePath: fileResponse.path!,
+            addedBy: _hubSessionManager.userName!,
+          );
+
+      if (pupilBookLendingWithFile == null) {
+        return;
+      }
+
+      _updatePupilBookLendingInCollections(pupilBookLendingWithFile);
+      notifyListeners();
+
+      _notificationService.showSnackBar(
+        NotificationType.success,
+        'Datei zum Leihvorgang hinzugefügt',
+      );
+    } catch (e) {
+      _notificationService.showSnackBar(
+        NotificationType.error,
+        'Fehler beim Hochladen der Datei: $e',
+      );
+    }
+  }
+
+  //- delete file from lending
+  Future<void> deletePupilBookLendingFile({
+    required PupilBookLending pupilBookLending,
+    required String fileId,
+  }) async {
+    try {
+      final success = await _pupilBookLendingApiService
+          .removeFileFromPupilBookLending(
+            lendingId: pupilBookLending.lendingId,
+            fileId: fileId,
+          );
+
+      if (success == null) {
+        return;
+      }
+      pupilBookLending.pupilBookLendingFiles!.removeWhere(
+        (file) => file.documentId == fileId,
+      );
+
+      notifyListeners();
+
+      _notificationService.showSnackBar(
+        NotificationType.success,
+        'Datei aus Leihvorgang entfernt',
+      );
+    } catch (e) {
+      _notificationService.showSnackBar(
+        NotificationType.error,
+        'Fehler beim Löschen der Datei: $e',
+      );
+    }
+  }
+
   //- delete
 
   Future<void> deletePupilBookLending({required String lendingId}) async {