Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0

lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart

@@ -29,8 +29,8 @@ class _MonthlyFragmentState extends State<MonthlyFragment> {
     _firstDate = DateTime.utc(2010, 10, 16);
     _lastDate = DateTime.utc(2030, 3, 14);
     Provider.of<AllRequestsProvider>(context, listen: false).getCalenderRequests(
-      from: DateTime.now().subtract(const Duration(days: 31)),
-      to: DateTime.now(),
+      from: DateTime(DateTime.now().year, DateTime.now().month, 1),
+      to:DateTime(DateTime.now().year, DateTime.now().month +1, 0)
     );
   }
 
@@ -59,7 +59,9 @@ class _MonthlyFragmentState extends State<MonthlyFragment> {
                     initialDatePickerMode: DatePickerMode.year,
                   );
                   if (result != null) {
-                    await snapshot.getCalenderRequests(from: DateTime(result.year, result.month), to: DateTime.now());
+                    await snapshot.getCalenderRequests(
+                        from: DateTime(result.year, result.month, 1),
+                        to: DateTime(result.year, result.month+1, 0));
                     _initialDate = result;
                     setState(() {});
                   }

lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart

@@ -33,7 +33,9 @@ class _WeeklyFragmentState extends State<WeeklyFragment> {
     _initialDate = DateTime.now();
     _firstDate = DateTime.utc(2010, 10, 16);
     _lastDate = DateTime.utc(2030, 3, 14);
-    Provider.of<AllRequestsProvider>(context, listen: false).getCalenderRequests(from: DateTime.now().subtract(const Duration(days: 7)), to: DateTime.now());
+    Provider.of<AllRequestsProvider>(context, listen: false).getCalenderRequests(
+        from: DateTime.now().subtract(Duration(days: DateTime.now().weekday)),
+        to: DateTime.now().add(Duration(days: DateTime.daysPerWeek - DateTime.now().weekday -1)));
   }
 
   @override
@@ -58,7 +60,8 @@ class _WeeklyFragmentState extends State<WeeklyFragment> {
               onCalendarCreated: (controller) {},
               onPageChanged: (date) {
                 _initialDate = date;
-                Provider.of<AllRequestsProvider>(context, listen: false).getCalenderRequests(from: date, to: date.add(const Duration(days: 7)));
+
+                Provider.of<AllRequestsProvider>(context, listen: false).getCalenderRequests(from: date.subtract(Duration(days: date.weekday)), to: date.add(Duration(days: DateTime.daysPerWeek - date.weekday -1)));
               },
               calendarBuilders: CalendarBuilders(
                 headerTitleBuilder: (context, dateTime) => Column(