Merge f5c020a into f7fc78f

albertms10 · Jan 28, 2023 · efa22ec · efa22ec
2 parents f7fc78f + f5c020a
commit efa22ec
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 45 deletions.
diff --git a/lib/src/model/booking_collection.dart b/lib/src/model/booking_collection.dart
@@ -9,6 +9,7 @@ import 'package:flutter/material.dart';
 import 'booking/booking.dart';
 import 'booking/recurring_booking.dart';
 import 'booking/single_booking.dart';
+import 'date/date_range.dart';
 import 'date/date_ranger.dart';
 import 'serializable.dart';
 
@@ -114,41 +115,23 @@ class BookingCollection with ChangeNotifier implements Serializable {
         null;
   }
 
-  Duration occupiedDuration({DateTime? dateTime, DateRanger? dateRange}) {
-    if (dateTime != null && dateRange != null) {
-      throw ArgumentError(
-        'Either dateTime or dateRange must be given, but not both.',
-      );
-    }
+  Duration occupiedDuration([DateRanger? dateRanger]) {
+    final bookingsList =
+        dateRanger != null ? allBookingsBetween(dateRanger) : allBookings;
 
     var runDuration = Duration.zero;
-
-    final bookingsList = dateTime != null
-        ? allBookingsOn(dateTime)
-        : dateRange != null
-            ? allBookingsBetween(dateRange)
-            : allBookings;
-
     for (final booking in bookingsList) {
       runDuration += booking.duration;
     }
 
     return runDuration;
   }
 
-  double occupancyPercentOn(
-    DateTime? dateTime, {
-    required TimeOfDay startTime,
-    required TimeOfDay endTime,
-  }) {
-    final fallbackDateTime = dateTime ?? DateTime.now();
-    final startDate = fallbackDateTime.addLocalTimeOfDay(startTime);
-    final endDate = fallbackDateTime.addLocalTimeOfDay(endTime);
+  double occupancyPercentOn([DateRanger? dateRanger]) {
+    dateRanger ??= DateRange.today();
 
-    final maxViewDuration = endDate.difference(startDate);
-
-    return occupiedDuration(dateTime: fallbackDateTime).inMicroseconds /
-        maxViewDuration.inMicroseconds;
+    return occupiedDuration(dateRanger).inMicroseconds /
+        dateRanger.duration.inMicroseconds;
   }
 
   double occupancyPercent({
@@ -158,15 +141,14 @@ class BookingCollection with ChangeNotifier implements Serializable {
   }) {
     var runPercent = 0.0;
     var count = 0;
-
     for (final dateTime in dates ?? datesWithBookings()) {
       count++;
 
-      final currentPercent = occupancyPercentOn(
-        dateTime,
-        startTime: startTime,
-        endTime: endTime,
+      final dateRanger = DateRange(
+        startDate: dateTime.addLocalTimeOfDay(startTime),
+        endDate: dateTime.addLocalTimeOfDay(endTime),
       );
+      final currentPercent = occupancyPercentOn(dateRanger);
 
       runPercent += (currentPercent - runPercent) / count;
     }

diff --git a/lib/src/model/cabin_collection.dart b/lib/src/model/cabin_collection.dart
@@ -131,14 +131,10 @@ class CabinCollection extends WritableManager<Set<Cabin>>
     return count;
   }
 
-  Duration totalOccupiedDuration({DateTime? dateTime, DateRanger? dateRange}) {
+  Duration totalOccupiedDuration([DateRanger? dateRanger]) {
     var duration = Duration.zero;
-
     for (final cabin in cabins) {
-      duration += cabin.bookingCollection.occupiedDuration(
-        dateTime: dateTime,
-        dateRange: dateRange,
-      );
+      duration += cabin.bookingCollection.occupiedDuration(dateRanger);
     }
 
     return duration;

diff --git a/lib/widgets/layout/scrollable_time_table.dart b/lib/widgets/layout/scrollable_time_table.dart
@@ -1,5 +1,6 @@
 import 'package:cabin_booking/constants.dart';
 import 'package:cabin_booking/model.dart';
+import 'package:cabin_booking/utils/date_time_extension.dart';
 import 'package:cabin_booking/widgets/booking/booking_preview_panel_overlay.dart';
 import 'package:cabin_booking/widgets/booking/bookings_table.dart';
 import 'package:cabin_booking/widgets/cabin/cabin_icon.dart';
@@ -86,6 +87,11 @@ class _ScrollablePanelOverlayTimeTableState
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
 
+    final dateRange = DateRange(
+      startDate: widget.dateTime.addLocalTimeOfDay(kTimeTableStartTime),
+      endDate: widget.dateTime.addLocalTimeOfDay(kTimeTableEndTime),
+    );
+
     return LayoutBuilder(
       builder: (context, constraints) {
         final bookingStackWidth = _stackWidth(constraints.maxWidth);
@@ -110,12 +116,8 @@ class _ScrollablePanelOverlayTimeTableState
                           width: bookingStackWidth,
                           child: CabinIcon.progress(
                             number: cabin.number,
-                            progress:
-                                cabin.bookingCollection.occupancyPercentOn(
-                              widget.dateTime,
-                              startTime: kTimeTableStartTime,
-                              endTime: kTimeTableEndTime,
-                            ),
+                            progress: cabin.bookingCollection
+                                .occupancyPercentOn(dateRange),
                           ),
                         ),
                     ],

diff --git a/lib/widgets/school_year/school_years_table.dart b/lib/widgets/school_year/school_years_table.dart
@@ -28,9 +28,8 @@ class SchoolYearsTable extends StatelessWidget {
                 bookingsCount: cabinCollection.bookingsCountBetween(schoolYear),
                 recurringBookingsCount:
                     cabinCollection.recurringBookingsCountBetween(schoolYear),
-                occupiedDuration: cabinCollection.totalOccupiedDuration(
-                  dateRange: schoolYear,
-                ),
+                occupiedDuration:
+                    cabinCollection.totalOccupiedDuration(schoolYear),
                 occupiedDurationPerWeek:
                     cabinCollection.occupiedDurationPerWeek(schoolYear)
                       ..fillEmptyKeyValues(