From 535f6ffb1ca68df7f02c9de40e01f2f8d6893c6b Mon Sep 17 00:00:00 2001 From: Achintha Isuru Date: Wed, 18 Feb 2026 15:25:31 -0500 Subject: [PATCH] feat: Update ownerId assignment in HomeRepositoryImpl and clean up shifts page code --- .../repositories/home_repository_impl.dart | 2 +- .../shifts_repository_impl.dart | 2 - .../src/presentation/pages/shifts_page.dart | 74 ++++++++++--------- .../features/staff/shifts/pubspec.yaml | 2 + 4 files changed, 44 insertions(+), 36 deletions(-) diff --git a/apps/mobile/packages/features/staff/home/lib/src/data/repositories/home_repository_impl.dart b/apps/mobile/packages/features/staff/home/lib/src/data/repositories/home_repository_impl.dart index 61de301e..980f7e0b 100644 --- a/apps/mobile/packages/features/staff/home/lib/src/data/repositories/home_repository_impl.dart +++ b/apps/mobile/packages/features/staff/home/lib/src/data/repositories/home_repository_impl.dart @@ -105,7 +105,7 @@ class HomeRepositoryImpl address: staff.addres, avatar: staff.photoUrl, ), - ownerId: session?.ownerId, + ownerId: staff.ownerId, ); StaffSessionStore.instance.setSession(updatedSession); diff --git a/apps/mobile/packages/features/staff/shifts/lib/src/data/repositories_impl/shifts_repository_impl.dart b/apps/mobile/packages/features/staff/shifts/lib/src/data/repositories_impl/shifts_repository_impl.dart index 9d799fcb..8be4f612 100644 --- a/apps/mobile/packages/features/staff/shifts/lib/src/data/repositories_impl/shifts_repository_impl.dart +++ b/apps/mobile/packages/features/staff/shifts/lib/src/data/repositories_impl/shifts_repository_impl.dart @@ -187,8 +187,6 @@ class ShiftsRepositoryImpl .listShiftRolesByVendorId(vendorId: vendorId) .execute()); - - final allShiftRoles = result.data.shiftRoles; // Fetch my applications to filter out already booked shifts diff --git a/apps/mobile/packages/features/staff/shifts/lib/src/presentation/pages/shifts_page.dart b/apps/mobile/packages/features/staff/shifts/lib/src/presentation/pages/shifts_page.dart index 1b6e1592..32ffc356 100644 --- a/apps/mobile/packages/features/staff/shifts/lib/src/presentation/pages/shifts_page.dart +++ b/apps/mobile/packages/features/staff/shifts/lib/src/presentation/pages/shifts_page.dart @@ -175,30 +175,30 @@ class _ShiftsPageState extends State { child: state is ShiftsLoading ? const Center(child: CircularProgressIndicator()) : state is ShiftsError - ? Center( - child: Padding( - padding: const EdgeInsets.all(UiConstants.space5), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - translateErrorKey(state.message), - style: UiTypography.body2r.textSecondary, - textAlign: TextAlign.center, - ), - ], + ? Center( + child: Padding( + padding: const EdgeInsets.all(UiConstants.space5), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + translateErrorKey(state.message), + style: UiTypography.body2r.textSecondary, + textAlign: TextAlign.center, ), - ), - ) - : _buildTabContent( + ], + ), + ), + ) + : _buildTabContent( myShifts, - pendingAssignments, - cancelledShifts, - availableJobs, - historyShifts, - availableLoading, - historyLoading, - ), + pendingAssignments, + cancelledShifts, + availableJobs, + historyShifts, + availableLoading, + historyLoading, + ), ), ], ), @@ -254,14 +254,14 @@ class _ShiftsPageState extends State { onTap: !enabled ? null : () { - setState(() => _activeTab = id); - if (id == 'history') { - _bloc.add(LoadHistoryShiftsEvent()); - } - if (id == 'find') { - _bloc.add(LoadAvailableShiftsEvent()); - } - }, + setState(() => _activeTab = id); + if (id == 'history') { + _bloc.add(LoadHistoryShiftsEvent()); + } + if (id == 'find') { + _bloc.add(LoadAvailableShiftsEvent()); + } + }, child: Container( padding: const EdgeInsets.symmetric( vertical: UiConstants.space2, @@ -290,9 +290,17 @@ class _ShiftsPageState extends State { Flexible( child: Text( label, - style: (isActive ? UiTypography.body3m.copyWith(color: UiColors.primary) : UiTypography.body3m.white).copyWith( - color: !enabled ? UiColors.white.withValues(alpha: 0.5) : null, - ), + style: + (isActive + ? UiTypography.body3m.copyWith( + color: UiColors.primary, + ) + : UiTypography.body3m.white) + .copyWith( + color: !enabled + ? UiColors.white.withValues(alpha: 0.5) + : null, + ), overflow: TextOverflow.ellipsis, ), ), diff --git a/apps/mobile/packages/features/staff/shifts/pubspec.yaml b/apps/mobile/packages/features/staff/shifts/pubspec.yaml index 8315559b..0f23b89c 100644 --- a/apps/mobile/packages/features/staff/shifts/pubspec.yaml +++ b/apps/mobile/packages/features/staff/shifts/pubspec.yaml @@ -32,6 +32,8 @@ dependencies: url_launcher: ^6.3.1 firebase_auth: ^6.1.4 firebase_data_connect: ^0.2.2+2 + meta: ^1.17.0 + bloc: ^8.1.4 dev_dependencies: flutter_test: