Fix empty leave screen

canopas · Aug 3, 2023 · 61176fc · 61176fc
1 parent 1d0fd2c
commit 61176fc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/lib/data/model/pagination/pagination.dart b/lib/data/model/pagination/pagination.dart
@@ -3,7 +3,7 @@ import 'package:equatable/equatable.dart';
 import '../leave/leave.dart';
 
 class PaginatedLeaves extends Equatable {
-  final DocumentSnapshot<Leave> lastDoc;
+  final DocumentSnapshot<Leave>? lastDoc;
   final List<Leave> leaves;
 
   const PaginatedLeaves({required this.leaves, required this.lastDoc});

diff --git a/lib/data/repo/leave_repo.dart b/lib/data/repo/leave_repo.dart
@@ -20,7 +20,7 @@ class LeaveRepo {
   Future<PaginatedLeaves> leaves(
           {DocumentSnapshot<Leave>? lastDoc, String? uid}) async =>
       await _leaveService.leaves(
-        limit: 5,
+        limit: 8,
         uid: uid,
         lastDoc: lastDoc,
         spaceId: _userStateNotifier.currentSpaceId!,

diff --git a/lib/data/services/leave_service.dart b/lib/data/services/leave_service.dart
@@ -52,7 +52,7 @@ class LeaveService {
 
     return PaginatedLeaves(
         leaves: leavesDoc.docs.map((e) => e.data()).toList(),
-        lastDoc: leavesDoc.docs.isNotEmpty ? leavesDoc.docs.last : lastDoc!);
+        lastDoc: leavesDoc.docs.isNotEmpty ? leavesDoc.docs.last : null);
   }
 
   Stream<List<Leave>> monthlyLeaveByStartDate(

diff --git a/lib/ui/admin/leaves/leave_screen/bloc /admin_leaves_bloc.dart b/lib/ui/admin/leaves/leave_screen/bloc /admin_leaves_bloc.dart
@@ -33,7 +33,8 @@ class AdminLeavesBloc extends Bloc<AdminLeavesEvents, AdminLeavesState> {
       InitialAdminLeavesEvent event, Emitter<AdminLeavesState> emit) async {
     try {
       _members = _employeeRepo.allEmployees.toList();
-      emit(state.copyWith(members: _members, membersFetchStatus: Status.success));
+      emit(state.copyWith(
+          members: _members, membersFetchStatus: Status.success));
       add(FetchLeavesInitialEvent());
     } on Exception {
       emit(state.copyWith(
@@ -72,7 +73,7 @@ class AdminLeavesBloc extends Bloc<AdminLeavesEvents, AdminLeavesState> {
       try {
         final paginatedData = await _leaveRepo.leaves(
             lastDoc: _lastDoc, uid: state.selectedMember?.uid);
-        if (paginatedData.lastDoc == _lastDoc) {
+        if (paginatedData.lastDoc == null) {
           _isLoadedMax = true;
         }
         _lastDoc = paginatedData.lastDoc;