Merge pull request #393 from Oloodi/389-staff-app-inconsistent-display-of-client-app-shifts-in-search-shifts-after-todays-000000

solving problem with the time in shifts
This commit is contained in:
José Salazar
2026-02-10 16:35:36 -05:00
committed by GitHub

View File

@@ -281,15 +281,20 @@ class ShiftsBloc extends Bloc<ShiftsEvent, ShiftsState>
List<Shift> _filterPastShifts(List<Shift> shifts) { List<Shift> _filterPastShifts(List<Shift> shifts) {
final now = DateTime.now(); final now = DateTime.now();
final today = DateTime(now.year, now.month, now.day);
return shifts.where((shift) { return shifts.where((shift) {
if (shift.date.isEmpty) return false; if (shift.date.isEmpty) return false;
try { try {
final shiftDate = DateTime.parse(shift.date); final shiftDate = DateTime.parse(shift.date);
return shiftDate.isAfter(now); final dateOnly = DateTime(
shiftDate.year,
shiftDate.month,
shiftDate.day,
);
return !dateOnly.isBefore(today);
} catch (_) { } catch (_) {
return false; return false;
} }
}).toList(); }).toList();
} }
} }