Merge pull request #91 from pvdthings/dev

Release
pvdthings · Nov 14, 2024 · c17e885 · c17e885
2 parents 1fe5a4b + b3e54b5
commit c17e885
Show file tree

Hide file tree

Showing 35 changed files with 673 additions and 432 deletions.
diff --git a/apps/librarian/lib/core/api/models/borrower_model.dart b/apps/librarian/lib/core/api/models/borrower_model.dart
@@ -9,7 +9,7 @@ class BorrowerModel {
 
   bool get active => issues.isEmpty;
 
-  BorrowerModel({
+  const BorrowerModel({
     required this.id,
     required this.name,
     required this.issues,

diff --git a/apps/librarian/lib/core/data/borrowers_repository.dart b/apps/librarian/lib/core/data/borrowers_repository.dart
@@ -1,26 +1,16 @@
-import 'package:collection/collection.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:librarian_app/core/api/api.dart' as api;
 import 'package:librarian_app/core/api/models/payment_model.dart';
 
 import '../api/models/borrower_model.dart';
 
-class BorrowersRepository extends Notifier<Future<List<BorrowerModel>>> {
-  @override
-  Future<List<BorrowerModel>> build() async => await getBorrowers();
-
+class BorrowersRepository {
   Future<List<BorrowerModel>> getBorrowers() async {
     final response = await api.fetchBorrowers();
     return (response.data as List)
         .map((json) => BorrowerModel.fromJson(json))
         .toList();
   }
 
-  Future<BorrowerModel?> getBorrower(String id) async {
-    final borrowers = await state;
-    return borrowers.firstWhereOrNull((b) => b.id == id);
-  }
-
   Future<BorrowerModel?> getBorrowerDetails(String id) async {
     final response = await api.fetchBorrower(id);
     return BorrowerModel.fromJson(response.data as Map<String, dynamic>);
@@ -29,8 +19,6 @@ class BorrowersRepository extends Notifier<Future<List<BorrowerModel>>> {
   Future<bool> updateBorrower(String id, {String? email, String? phone}) async {
     try {
       await api.updateBorrower(id, email: email, phone: phone);
-
-      ref.invalidateSelf();
       return true;
     } catch (error) {
       return false;
@@ -56,8 +44,6 @@ class BorrowersRepository extends Notifier<Future<List<BorrowerModel>>> {
     } catch (error) {
       return false;
     }
-
-    ref.invalidateSelf();
     return true;
   }
 }
diff --git a/apps/librarian/lib/core/data/loans_repository.dart b/apps/librarian/lib/core/data/loans_repository.dart
@@ -1,14 +1,10 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:intl/intl.dart';
 import 'package:librarian_app/core/api/api.dart' as API;
 
 import '../api/models/loan_details_model.dart';
 import '../api/models/loan_model.dart';
 
-class LoansRepository extends Notifier<Future<List<LoanModel>>> {
-  @override
-  Future<List<LoanModel>> build() async => await getLoans();
-
+class LoansRepository {
   Future<LoanDetailsModel?> getLoan({
     required String id,
     required String thingId,
@@ -40,7 +36,6 @@ class LoansRepository extends Notifier<Future<List<LoanModel>>> {
         dueBackDate: dateFormat.format(dueBackDate),
       ));
 
-      ref.invalidateSelf();
       return (response.data as Map<String, dynamic>)['id'] as String;
     } catch (error) {
       return null;
@@ -58,8 +53,6 @@ class LoansRepository extends Notifier<Future<List<LoanModel>>> {
       thingId: thingId,
       checkedInDate: dateFormat.format(DateTime.now()),
     ));
-
-    ref.invalidateSelf();
   }
 
   Future<void> updateLoan({
@@ -76,7 +69,5 @@ class LoansRepository extends Notifier<Future<List<LoanModel>>> {
       dueBackDate: dateFormat.format(dueBackDate),
       notes: notes,
     ));
-
-    ref.invalidateSelf();
   }
 }
diff --git a/apps/librarian/lib/dashboard/pages/dashboard_page.dart b/apps/librarian/lib/dashboard/pages/dashboard_page.dart
@@ -2,6 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:librarian_app/dashboard/providers/create_loan_controller.dart';
+import 'package:librarian_app/dashboard/providers/invalidate_module.dart';
 import 'package:librarian_app/dashboard/providers/workspace.dart';
 import 'package:librarian_app/modules/authentication/providers/auth_service_provider.dart';
 import 'package:librarian_app/modules/authentication/providers/user_tray.dart';
@@ -200,6 +201,7 @@ class _DashboardPageState extends ConsumerState<DashboardPage> {
                   selectedIndex: _moduleIndex,
                   onDestinationSelected: (index) {
                     setState(() => _moduleIndex = index);
+                    invalidateModule(ref, index);
                   },
                   leading: menuAnchor,
                   child: module.desktopLayout,
@@ -209,6 +211,7 @@ class _DashboardPageState extends ConsumerState<DashboardPage> {
                   selectedIndex: _moduleIndex,
                   onDestinationSelected: (index) {
                     setState(() => _moduleIndex = index);
+                    invalidateModule(ref, index);
                   },
                   destinations: const [
                     NavigationDestination(

diff --git a/apps/librarian/lib/dashboard/providers/invalidate_module.dart b/apps/librarian/lib/dashboard/providers/invalidate_module.dart
@@ -0,0 +1,26 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:librarian_app/modules/things/providers/things_repository_provider.dart';
+import 'package:librarian_app/providers/loans.dart';
+import 'package:librarian_app/providers/members.dart';
+
+void invalidateModule(WidgetRef ref, int index) {
+  switch (index) {
+    case loansIndex:
+      ref.invalidate(loansProvider);
+      return;
+    case membersIndex:
+      ref.invalidate(membersProvider);
+    case thingsIndex:
+    case repairIndex:
+      ref.invalidate(thingsRepositoryProvider);
+      return;
+    case actionsIndex:
+      return;
+  }
+}
+
+const loansIndex = 0;
+const membersIndex = 1;
+const thingsIndex = 2;
+const repairIndex = 3;
+const actionsIndex = 4;
diff --git a/apps/librarian/lib/modules/actions/providers/actions_service_provider.dart b/apps/librarian/lib/modules/actions/providers/actions_service_provider.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:librarian_app/core/api/api.dart';
-import 'package:librarian_app/modules/loans/providers/loans_repository_provider.dart';
+import 'package:librarian_app/providers/loans.dart';
 import 'package:librarian_app/utils/format.dart';
 
 class ActionsService {
@@ -26,7 +26,7 @@ class ActionsService {
 
       if (result) {
         Future.delayed(const Duration(seconds: 2), () {
-          ref.invalidate(loansRepositoryProvider);
+          ref.invalidate(loansProvider);
         });
       }
 

diff --git a/apps/librarian/lib/modules/loans/checkout/stepper/borrower/borrower_step.dart b/apps/librarian/lib/modules/loans/checkout/stepper/borrower/borrower_step.dart
@@ -1,9 +1,10 @@
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:librarian_app/core/api/models/borrower_model.dart';
 import 'package:librarian_app/modules/members/details/issues.dart';
-import 'package:librarian_app/modules/members/providers/borrowers_repository_provider.dart';
 import 'package:librarian_app/modules/loans/checkout/stepper/borrower/borrower_search_delegate.dart';
+import 'package:librarian_app/providers/members.dart';
 
 Step buildBorrowerStep({
   required BuildContext context,
@@ -35,10 +36,9 @@ Step buildBorrowerStep({
               );
 
               if (success) {
-                ref
-                    .read(borrowersRepositoryProvider.notifier)
-                    .getBorrower(borrower.id)
-                    .then(onBorrowerSelected);
+                ref.read(membersProvider).then((list) {
+                  return list.firstWhereOrNull((b) => b.id == borrower.id);
+                }).then(onBorrowerSelected);
               }
             },
           ),
@@ -80,8 +80,8 @@ class _SelectBorrowerTextFieldState
       onTap: () {
         setState(() => _isLoading = true);
 
-        ref.invalidate(borrowersRepositoryProvider);
-        ref.read(borrowersRepositoryProvider).then((borrowers) async {
+        ref.invalidate(membersProvider);
+        ref.read(membersProvider).then((borrowers) async {
           return await showSearch(
             context: context,
             delegate: BorrowerSearchDelegate(borrowers),

diff --git a/apps/librarian/lib/modules/loans/checkout/stepper/confirm/checkout_details.dart b/apps/librarian/lib/modules/loans/checkout/stepper/confirm/checkout_details.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:librarian_app/core/api/models/borrower_model.dart';
 import 'package:librarian_app/widgets/detail.dart';
@@ -17,11 +18,13 @@ class CheckoutDetails extends StatelessWidget {
   final DateTime dueDate;
   final void Function(DateTime newDate) onDueDateUpdated;
 
+  DateTime get _twoWeeksAgo => DateTime.now().add(const Duration(days: -14));
+
   void showDateSelection(BuildContext context) async {
     showDatePicker(
       context: context,
       initialDate: dueDate,
-      firstDate: dueDate,
+      firstDate: kDebugMode ? _twoWeeksAgo : dueDate,
       lastDate: dueDate.add(const Duration(days: 14)),
     ).then((value) {
       if (value == null) return;

diff --git a/apps/librarian/lib/modules/loans/details/loan_details_controller.dart b/apps/librarian/lib/modules/loans/details/loan_details_controller.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:librarian_app/core/api/api.dart' as api;
 import 'package:librarian_app/modules/loans/details/thing_number.dart';
-import 'package:librarian_app/modules/loans/providers/loans_repository_provider.dart';
+import 'package:librarian_app/providers/loans.dart';
 import 'package:librarian_app/widgets/dialogs/general_dialog.dart';
 
 import 'previous_loan_details.dart';
@@ -44,7 +44,7 @@ class LoanDetailsController {
 
   Future<void> sendReminderEmail({required int loanNumber}) async {
     api.sendReminderEmail(loanNumber: loanNumber).then((value) {
-      ref.invalidate(loansRepositoryProvider);
+      ref.invalidate(loansProvider);
 
       ScaffoldMessenger.of(context)
           .showSnackBar(const SnackBar(content: Text('Email was sent')));

diff --git a/apps/librarian/lib/modules/loans/details/loan_details_header.dart b/apps/librarian/lib/modules/loans/details/loan_details_header.dart
@@ -12,14 +12,16 @@ import 'thing_number.dart';
 class LoanDetailsHeader extends ConsumerWidget {
   const LoanDetailsHeader({
     super.key,
+    required this.loading,
     required this.loan,
     required this.onSave,
     required this.onCheckIn,
   });
 
+  final bool loading;
   final LoanDetailsModel loan;
-  final void Function(DateTime dueDate, String? notes) onSave;
-  final void Function() onCheckIn;
+  final void Function(DateTime dueDate, String? notes)? onSave;
+  final void Function()? onCheckIn;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -30,32 +32,34 @@ class LoanDetailsHeader extends ConsumerWidget {
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
           Row(
-            children: [
-              ThingNumber(number: loan.thing.number),
-              const SizedBox(width: 16),
-              Text(
-                loan.thing.name,
-                style: const TextStyle(fontSize: 24),
-              ),
-            ],
+            children: loading
+                ? []
+                : [
+                    ThingNumber(number: loan.thing.number),
+                    const SizedBox(width: 16),
+                    Text(
+                      loan.thing.name,
+                      style: const TextStyle(fontSize: 24),
+                    ),
+                  ],
           ),
           Row(
             children: [
               IconButton(
-                onPressed: () {
-                  showDialog(
-                    context: context,
-                    builder: (context) {
-                      return EditLoanDialog(
-                        dueDate: loan.dueDate,
-                        notes: loan.notes,
-                        onSavePressed: (newDueDate, notes) {
-                          onSave(newDueDate, notes);
-                        },
-                      );
-                    },
-                  );
-                },
+                onPressed: loading
+                    ? null
+                    : () {
+                        showDialog(
+                          context: context,
+                          builder: (context) {
+                            return EditLoanDialog(
+                              dueDate: loan.dueDate,
+                              notes: loan.notes,
+                              onSavePressed: onSave,
+                            );
+                          },
+                        );
+                      },
                 icon: const Icon(Icons.edit),
                 tooltip: 'Edit',
               ),
@@ -67,7 +71,7 @@ class LoanDetailsHeader extends ConsumerWidget {
                 ),
               ),
               IconButton(
-                onPressed: loan.thing.lastLoanId != null
+                onPressed: !loading && loan.thing.lastLoanId != null
                     ? () {
                         controller.viewPreviousLoan(
                           id: loan.thing.lastLoanId!,
@@ -81,7 +85,7 @@ class LoanDetailsHeader extends ConsumerWidget {
               ),
               const SizedBox(width: 4),
               IconButton(
-                onPressed: loan.borrower.email != null
+                onPressed: !loading && loan.borrower.email != null
                     ? () {
                         showDialog(
                           context: context,
@@ -103,19 +107,21 @@ class LoanDetailsHeader extends ConsumerWidget {
               ),
               const SizedBox(width: 4),
               IconButton(
-                onPressed: () {
-                  showDialog(
-                    context: context,
-                    builder: (context) {
-                      return CheckinDialog(
-                        thingNumber: loan.thing.number,
-                        onCheckin: () async {
-                          await Future(onCheckIn);
-                        },
-                      );
-                    },
-                  );
-                },
+                onPressed: !loading && onCheckIn != null
+                    ? () {
+                        showDialog(
+                          context: context,
+                          builder: (context) {
+                            return CheckinDialog(
+                              thingNumber: loan.thing.number,
+                              onCheckin: () async {
+                                await Future(onCheckIn!);
+                              },
+                            );
+                          },
+                        );
+                      }
+                    : null,
                 tooltip: 'Check in',
                 icon: const Icon(Icons.library_add_check),
               ),