Fix next month leaves are not showing in calendar (#57)

canopas · Feb 2, 2024 · c97cd20 · c97cd20
1 parent 079376a
commit c97cd20
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 19 deletions.
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>
diff --git a/ios/Podfile b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '11.0'
+platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -393,7 +393,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -476,7 +476,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -525,7 +525,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

diff --git a/lib/data/repo/leave_repo.dart b/lib/data/repo/leave_repo.dart
@@ -50,7 +50,7 @@ class LeaveRepo {
         (leavesByStartDate, leavesByEndDate) {
           List<Leave> mergedList = leavesByStartDate;
           mergedList.addAll(leavesByEndDate.where((endDateLeave) =>
-              !leavesByEndDate.any((startDateLeave) =>
+              !leavesByStartDate.any((startDateLeave) =>
                   startDateLeave.leaveId == endDateLeave.leaveId)));
           return mergedList;
         },

diff --git a/lib/data/services/leave_service.dart b/lib/data/services/leave_service.dart
@@ -67,19 +67,24 @@ class LeaveService {
           .map((event) => event.docs.map((leave) => leave.data()).toList());
 
   Stream<List<Leave>> monthlyLeaveByEndDate(
-          {required int year, required int month, required String spaceId}) =>
-      _leaveDb(spaceId: spaceId)
-          .where(FireStoreConst.leaveStatus,
-              isEqualTo: LeaveStatus.approved.value)
-          .where(FireStoreConst.endLeaveDate,
-              isGreaterThanOrEqualTo: DateTime(year, month).timeStampToInt)
-          .where(FireStoreConst.endLeaveDate,
-              isLessThan: DateTime(year, month + 1).timeStampToInt)
-          .snapshots()
-          .asyncMap((event) => event.docs
-              .map((leave) => leave.data())
-              .where((leave) => leave.startDate.isBefore(DateTime(year, month)))
-              .toList());
+      {required int year, required int month, required String spaceId}) {
+    final leaves = _leaveDb(spaceId: spaceId)
+        .where(FireStoreConst.leaveStatus,
+            isEqualTo: LeaveStatus.approved.value)
+        .where(FireStoreConst.endLeaveDate,
+            isLessThan: DateTime(year, month + 1).timeStampToInt)
+        .where(FireStoreConst.endLeaveDate,
+        isGreaterThanOrEqualTo: DateTime(year, month).timeStampToInt)
+        .snapshots()
+        .asyncMap((event) => event.docs
+            .map((leave) {
+              return leave.data();
+            })
+            .where((leave) => leave.startDate.isBefore(DateTime(year, month)))
+            .toList());
+
+    return leaves;
+  }
 
   Stream<List<Leave>> userLeaveByStatus(
           {required String uid,