diff --git a/Makefile b/Makefile index dd9040a0..2df853fa 100644 --- a/Makefile +++ b/Makefile @@ -17,40 +17,55 @@ include makefiles/tools.mk .PHONY: help help: - @echo "--------------------------------------------------" - @echo " KROW Workforce - Available Makefile Commands" - @echo "--------------------------------------------------" + @echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" + @echo " 🚀 KROW Workforce - Available Makefile Commands" + @echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" @echo "" - @echo " --- CORE DEVELOPMENT ---" - @echo " make install - Installs web frontend dependencies." - @echo " make dev - Starts the local web frontend server." - @echo " make build - Builds the web frontend for production." - @echo " make launchpad-dev - Starts the local launchpad server (Firebase Hosting emulator)." + @echo " 📦 WEB FRONTEND (internal/api-harness)" + @echo " ────────────────────────────────────────────────────────────────────" + @echo " make install Install web frontend dependencies" + @echo " make dev Start local web frontend dev server" + @echo " make build Build web frontend for production" + @echo " make deploy-app [ENV=dev] Build and deploy web app (dev/staging/prod)" @echo "" - @echo " --- MOBILE APP DEVELOPMENT ---" - @echo " make mobile-install - Bootstrap the mobile workspace (Melos)." - @echo " make mobile-info - List custom mobile development commands." - @echo " make mobile-client-dev-android - Run client app in dev mode (Android)." - @echo " make mobile-client-build PLATFORM=apk - Build client app for specified platform." - @echo " make mobile-staff-dev-android - Run staff app in dev mode (Android)." - @echo " make mobile-staff-build PLATFORM=apk - Build staff app for specified platform." + @echo " 🏠 LAUNCHPAD (internal/launchpad)" + @echo " ────────────────────────────────────────────────────────────────────" + @echo " make launchpad-dev Start launchpad dev server (Firebase Hosting)" + @echo " make deploy-launchpad-hosting Deploy launchpad to Firebase Hosting" @echo "" - @echo " --- DEPLOYMENT ---" - @echo " make deploy-launchpad-hosting - Deploys internal launchpad to Firebase Hosting." - @echo " make deploy-app [ENV=staging] - Builds and deploys the main web app (default: dev)." + @echo " 📱 MOBILE APPS (apps/mobile)" + @echo " ────────────────────────────────────────────────────────────────────" + @echo " make mobile-install Bootstrap mobile workspace + Dataconnect SDK" + @echo " make mobile-info List mobile development commands" + @echo " make mobile-client-dev-android [DEVICE=android] Run client app (Android)" + @echo " make mobile-client-build PLATFORM=apk Build client app (apk/ipa/etc)" + @echo " make mobile-staff-dev-android [DEVICE=android] Run staff app (Android)" + @echo " make mobile-staff-build PLATFORM=apk Build staff app (apk/ipa/etc)" @echo "" - @echo " --- DEVELOPMENT TOOLS ---" - @echo " make install-melos - Installs Melos globally if not already present." - @echo " make install-git-hooks - Installs git pre-push hook to protect main/dev branches." - @echo " make sync-prototypes - Builds and copies prototypes from adjacent 'client-krow-poc' repo." + @echo " 🗄️ DATA CONNECT & BACKEND (backend/dataconnect)" + @echo " ────────────────────────────────────────────────────────────────────" + @echo " make dataconnect-init Initialize Firebase Data Connect" + @echo " make dataconnect-deploy Deploy Data Connect schemas to Cloud SQL" + @echo " make dataconnect-sql-migrate Apply pending SQL migrations" + @echo " make dataconnect-generate-sdk Regenerate Data Connect client SDK" + @echo " make dataconnect-sync Full sync: deploy + migrate + generate SDK" + @echo " make dataconnect-seed Seed database with test data" + @echo " make dataconnect-clean Delete all data from Data Connect" + @echo " make dataconnect-test Test Data Connect deployment (dry-run)" + @echo " make dataconnect-enable-apis Enable required GCP APIs" + @echo " make dataconnect-bootstrap-db ONE-TIME: Full Cloud SQL + Data Connect setup" @echo "" - @echo " --- DATA CONNECT MANAGEMENT ---" - @echo " make dataconnect-init - Initializes Firebase Data Connect." - @echo " make dataconnect-deploy - Deploys Data Connect schemas." - @echo " make dataconnect-sql-migrate - Applies SQL migrations." - @echo " make dataconnect-generate-sdk - Regenerates the Data Connect SDK." - @echo " make dataconnect-sync - Runs migrate + deploy + generate-sdk." - @echo " make dataconnect-bootstrap-db - ONE-TIME: Full Cloud SQL + Data Connect setup." + @echo " 🛠️ DEVELOPMENT TOOLS" + @echo " ────────────────────────────────────────────────────────────────────" + @echo " make install-melos Install Melos globally (for mobile dev)" + @echo " make install-git-hooks Install git pre-push hook (protect main/dev)" + @echo " make sync-prototypes Sync prototypes from client-krow-poc repo" @echo "" - @echo " make help - Shows this help message." - @echo "--------------------------------------------------" \ No newline at end of file + @echo " ℹ️ HELP" + @echo " ────────────────────────────────────────────────────────────────────" + @echo " make help Show this help message" + @echo "" + @echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" + @echo " 💡 Tip: Run 'make mobile-install' first for mobile development" + @echo " 💡 Tip: Use 'make dataconnect-sync' after schema changes" + @echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" \ No newline at end of file diff --git a/apps/mobile/NEXT_SPRINT_TASKS.md b/apps/mobile/NEXT_SPRINT_TASKS.md index 32bea20f..2345c091 100644 --- a/apps/mobile/NEXT_SPRINT_TASKS.md +++ b/apps/mobile/NEXT_SPRINT_TASKS.md @@ -7,3 +7,8 @@ * Add **doc comments** where necessary to improve readability and maintainability * **Remove overly complicated or unnecessary logic** introduced by AI and simplify where possible * **Adhere to the design system** and remove all **hard-coded colors and typography**, using shared tokens instead + +* Improvement points +- apps/mobile/packages/features/client/client_coverage/lib/src/data/repositories_impl/coverage_repository_impl.dart + - Fix the location field in CoverageShiftRole to use the correct fallback logic. + - line 125 remove redundant location values. \ No newline at end of file diff --git a/apps/mobile/packages/features/client/client_coverage/lib/src/data/repositories_impl/coverage_repository_impl.dart b/apps/mobile/packages/features/client/client_coverage/lib/src/data/repositories_impl/coverage_repository_impl.dart index cfecec36..b79c7ddc 100644 --- a/apps/mobile/packages/features/client/client_coverage/lib/src/data/repositories_impl/coverage_repository_impl.dart +++ b/apps/mobile/packages/features/client/client_coverage/lib/src/data/repositories_impl/coverage_repository_impl.dart @@ -122,7 +122,7 @@ class CoverageRepositoryImpl implements CoverageRepository { shiftId: shiftRole.shiftId, roleId: shiftRole.roleId, title: shiftRole.role.name, - location: shiftRole.shift.location ?? '', + location: shiftRole.shift.location ?? shiftRole.shift.locationAddress ?? '', startTime: _formatTime(shiftRole.startTime) ?? '00:00', workersNeeded: shiftRole.count, date: shiftRole.shift.date?.toDateTime() ?? date,