diff --git a/apps/mobile/packages/features/client/view_orders/lib/src/data/repositories/view_orders_repository_impl.dart b/apps/mobile/packages/features/client/view_orders/lib/src/data/repositories/view_orders_repository_impl.dart index 3480235e..013515e2 100644 --- a/apps/mobile/packages/features/client/view_orders/lib/src/data/repositories/view_orders_repository_impl.dart +++ b/apps/mobile/packages/features/client/view_orders/lib/src/data/repositories/view_orders_repository_impl.dart @@ -36,6 +36,9 @@ class ViewOrdersRepositoryImpl implements IViewOrdersRepository { end: endTimestamp, ) .execute(); + print( + 'ViewOrders range start=${start.toIso8601String()} end=${end.toIso8601String()} shiftRoles=${result.data.shiftRoles.length}', + ); final String businessName = dc.ClientSessionStore.instance.session?.business?.businessName ?? @@ -106,6 +109,10 @@ class ViewOrdersRepositoryImpl implements IViewOrdersRepository { ) .execute(); + print( + 'ViewOrders day=${day.toIso8601String()} applications=${result.data.applications.length}', + ); + final Map>> grouped = >>{}; for (final dc.ListAcceptedApplicationsByBusinessForDayApplications application in result.data.applications) { print( diff --git a/apps/mobile/packages/features/client/view_orders/lib/src/presentation/blocs/view_orders_cubit.dart b/apps/mobile/packages/features/client/view_orders/lib/src/presentation/blocs/view_orders_cubit.dart index 46c6d76c..f65f4964 100644 --- a/apps/mobile/packages/features/client/view_orders/lib/src/presentation/blocs/view_orders_cubit.dart +++ b/apps/mobile/packages/features/client/view_orders/lib/src/presentation/blocs/view_orders_cubit.dart @@ -160,7 +160,7 @@ class ViewOrdersCubit extends Cubit { final int filled = confirmed.length; final String status = - filled >= order.workersNeeded ? 'filled' : order.status; + filled >= order.workersNeeded ? 'FILLED' : order.status; return OrderItem( id: order.id, orderId: order.orderId, @@ -212,6 +212,9 @@ class ViewOrdersCubit extends Cubit { final List ordersOnDate = state.orders .where((OrderItem s) => s.date == selectedDateStr) .toList(); + print( + 'ViewOrders selectedDate=$selectedDateStr ordersOnDate=${ordersOnDate.length}', + ); // Sort by start time ordersOnDate.sort( @@ -219,22 +222,34 @@ class ViewOrdersCubit extends Cubit { ); if (state.filterTab == 'all') { - return ordersOnDate + final List filtered = ordersOnDate .where( (OrderItem s) => // TODO(orders): move PENDING to its own tab once available. - ['OPEN', 'FILLED', 'CONFIRMED', 'PENDING'] + ['OPEN', 'FILLED', 'CONFIRMED', 'PENDING', 'ASSIGNED'] .contains(s.status), ) .toList(); + print( + 'ViewOrders tab=all statuses=${ordersOnDate.map((OrderItem s) => s.status).toList()} filtered=${filtered.length}', + ); + return filtered; } else if (state.filterTab == 'active') { - return ordersOnDate + final List filtered = ordersOnDate .where((OrderItem s) => s.status == 'IN_PROGRESS') .toList(); + print( + 'ViewOrders tab=active statuses=${ordersOnDate.map((OrderItem s) => s.status).toList()} filtered=${filtered.length}', + ); + return filtered; } else if (state.filterTab == 'completed') { - return ordersOnDate + final List filtered = ordersOnDate .where((OrderItem s) => s.status == 'COMPLETED') .toList(); + print( + 'ViewOrders tab=completed statuses=${ordersOnDate.map((OrderItem s) => s.status).toList()} filtered=${filtered.length}', + ); + return filtered; } return []; } @@ -272,7 +287,7 @@ class ViewOrdersCubit extends Cubit { .where( (OrderItem s) => // TODO(orders): move PENDING to its own tab once available. - ['OPEN', 'FILLED', 'CONFIRMED', 'PENDING'] + ['OPEN', 'FILLED', 'CONFIRMED', 'PENDING', 'ASSIGNED'] .contains(s.status), ) .length;