Krow/Krow-workspace
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 493-implement-rapid-order-creation-voice-text-in-client-mobile-app

Browse Source
This commit is contained in:
Achintha Isuru
2026-02-27 15:32:11 -05:00
parent f39f8860ea c52bb7e767
commit d609dd75fa
20 changed files with 228 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/mobile/packages/core/lib/src/routing/staff/navigator.dart
View File

@@ -139,7 +139,7 @@ extension StaffNavigator on IModularNavigator {
///
/// Manage personal information, documents, and preferences.
void toProfile() {
pushNamedAndRemoveUntil(StaffPaths.profile, (_) => false);
navigate(StaffPaths.profile);
}
// ==========================================================================
@@ -189,7 +189,7 @@ extension StaffNavigator on IModularNavigator {
///
/// Record previous work experience and qualifications.
void toExperience() {
pushNamed(StaffPaths.experience);
navigate(StaffPaths.experience);
}
/// Pushes the attire preferences page.

1
apps/mobile/packages/core/pubspec.yaml
View File

@@ -27,4 +27,3 @@ dependencies:
file_picker: ^8.1.7
record: ^6.2.0
firebase_auth: ^6.1.4

6
apps/mobile/packages/features/client/orders/create_order/lib/src/create_order_module.dart
View File

@@ -9,6 +9,7 @@ import 'domain/usecases/create_permanent_order_usecase.dart';
import 'domain/usecases/create_recurring_order_usecase.dart';
import 'domain/usecases/create_rapid_order_usecase.dart';
import 'domain/usecases/get_order_details_for_reorder_usecase.dart';
import 'domain/usecases/parse_rapid_order_usecase.dart';
import 'domain/usecases/transcribe_rapid_order_usecase.dart';
import 'presentation/blocs/index.dart';
import 'presentation/pages/create_order_page.dart';
@@ -24,7 +25,7 @@ import 'presentation/pages/recurring_order_page.dart';
/// presentation layer BLoCs.
class ClientCreateOrderModule extends Module {
@override
List<Module> get imports => <Module>[DataConnectModule(), CoreModule()];
List<Module> get imports => <Module>[DataConnectModule()];
@override
void binds(Injector i) {
@@ -39,13 +40,14 @@ class ClientCreateOrderModule extends Module {
i.addLazySingleton(CreateRecurringOrderUseCase.new);
i.addLazySingleton(CreateRapidOrderUseCase.new);
i.addLazySingleton(TranscribeRapidOrderUseCase.new);
i.addLazySingleton(ParseRapidOrderTextToOrderUseCase.new);
i.addLazySingleton(GetOrderDetailsForReorderUseCase.new);
// BLoCs
i.add<RapidOrderBloc>(
(Injector i) => RapidOrderBloc(
i.get<CreateRapidOrderUseCase>(),
i.get<TranscribeRapidOrderUseCase>(),
i.get<ParseRapidOrderTextToOrderUseCase>(),
i.get<AudioRecorderService>(),
),
);

47
apps/mobile/packages/features/client/orders/create_order/lib/src/data/repositories_impl/client_create_order_repository_impl.dart
View File

@@ -1,6 +1,5 @@
import 'package:firebase_data_connect/firebase_data_connect.dart';
import 'package:intl/intl.dart';
import 'package:krow_core/core.dart';
import 'package:krow_data_connect/krow_data_connect.dart' as dc;
import 'package:krow_domain/krow_domain.dart' as domain;
import '../../domain/repositories/client_create_order_repository_interface.dart';
@@ -14,14 +13,10 @@ import '../../domain/repositories/client_create_order_repository_interface.dart'
/// on delegation and data mapping, without business logic.
class ClientCreateOrderRepositoryImpl
implements ClientCreateOrderRepositoryInterface {
ClientCreateOrderRepositoryImpl({
required dc.DataConnectService service,
required RapidOrderService rapidOrderService,
}) : _service = service,
_rapidOrderService = rapidOrderService;
ClientCreateOrderRepositoryImpl({required dc.DataConnectService service})
: _service = service;
final dc.DataConnectService _service;
final RapidOrderService _rapidOrderService;
@override
Future<void> createOneTimeOrder(domain.OneTimeOrder order) async {
@@ -372,6 +367,44 @@ class ClientCreateOrderRepositoryImpl
throw UnimplementedError('Rapid order IA is not connected yet.');
}
@override
Future<domain.OneTimeOrder> parseRapidOrder(String text) async {
final RapidOrderParseResponse response = await _rapidOrderService.parseText(
text: text,
);
final RapidOrderParsedData data = response.parsed;
final DateTime startAt =
DateTime.tryParse(data.startAt ?? '') ?? DateTime.now();
final DateTime endAt =
DateTime.tryParse(data.endAt ?? '') ??
startAt.add(const Duration(hours: 8));
final String startTimeStr = DateFormat('hh:mm a').format(startAt);
final String endTimeStr = DateFormat('hh:mm a').format(endAt);
return domain.OneTimeOrder(
date: startAt,
location: data.locationHint ?? '',
eventName: data.notes ?? '',
hub: data.locationHint != null
? domain.OneTimeOrderHubDetails(
id: '',
name: data.locationHint!,
address: '',
)
: null,
positions: data.positions.map((RapidOrderPosition p) {
return domain.OneTimeOrderPosition(
role: p.role,
count: p.count,
startTime: startTimeStr,
endTime: endTimeStr,
);
}).toList(),
);
}
@override
Future<String> transcribeRapidOrder(String audioPath) async {
final RapidOrderTranscriptionResponse response = await _rapidOrderService

5
apps/mobile/packages/features/client/orders/create_order/lib/src/domain/repositories/client_create_order_repository_interface.dart
View File

@@ -29,6 +29,11 @@ abstract interface class ClientCreateOrderRepositoryInterface {
/// [audioPath] is the local path to the recorded audio file.
Future<String> transcribeRapidOrder(String audioPath);
/// Parses the text description for a rapid order into a structured draft.
///
/// [text] is the text message describing the need.
Future<OneTimeOrder> parseRapidOrder(String text);
/// Reorders an existing staffing order with a new date.
///
/// [previousOrderId] is the ID of the order to reorder.

15
apps/mobile/packages/features/client/orders/create_order/lib/src/domain/usecases/parse_rapid_order_usecase.dart Normal file
View File

@@ -0,0 +1,15 @@
import 'package:krow_domain/krow_domain.dart';
import '../repositories/client_create_order_repository_interface.dart';
/// Use case for parsing rapid order text into a structured OneTimeOrder.
class ParseRapidOrderTextToOrderUseCase {
ParseRapidOrderTextToOrderUseCase({
required ClientCreateOrderRepositoryInterface repository,
}) : _repository = repository;
final ClientCreateOrderRepositoryInterface _repository;
Future<OneTimeOrder> call(String text) async {
return _repository.parseRapidOrder(text);
}
}

50
apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/one_time_order/one_time_order_bloc.dart
View File

@@ -136,9 +136,7 @@ class OneTimeOrderBloc extends Bloc<OneTimeOrderEvent, OneTimeOrderState>
}
}
Future<void> _loadManagersForHub(
String hubId,
) async {
Future<void> _loadManagersForHub(String hubId) async {
final List<OneTimeOrderManagerOption>? managers =
await handleErrorWithResult(
action: () async {
@@ -163,7 +161,9 @@ class OneTimeOrderBloc extends Bloc<OneTimeOrderEvent, OneTimeOrderState>
.toList();
},
onError: (_) {
add(const OneTimeOrderManagersLoaded(<OneTimeOrderManagerOption>[]));
add(
const OneTimeOrderManagersLoaded(<OneTimeOrderManagerOption>[]),
);
},
);
@@ -172,7 +172,6 @@ class OneTimeOrderBloc extends Bloc<OneTimeOrderEvent, OneTimeOrderState>
}
}
Future<void> _onVendorsLoaded(
OneTimeOrderVendorsLoaded event,
Emitter<OneTimeOrderState> emit,
@@ -216,7 +215,6 @@ class OneTimeOrderBloc extends Bloc<OneTimeOrderEvent, OneTimeOrderState>
}
}
void _onHubChanged(
OneTimeOrderHubChanged event,
Emitter<OneTimeOrderState> emit,
@@ -239,7 +237,6 @@ class OneTimeOrderBloc extends Bloc<OneTimeOrderEvent, OneTimeOrderState>
emit(state.copyWith(managers: event.managers));
}
void _onEventNameChanged(
OneTimeOrderEventNameChanged event,
Emitter<OneTimeOrderState> emit,
@@ -349,6 +346,45 @@ class OneTimeOrderBloc extends Bloc<OneTimeOrderEvent, OneTimeOrderState>
final DateTime? startDate = data['startDate'] as DateTime?;
final String? orderId = data['orderId']?.toString();
// Handle Rapid Order Draft
if (data['isRapidDraft'] == true) {
final OneTimeOrder? order = data['order'] as OneTimeOrder?;
if (order != null) {
emit(
state.copyWith(
eventName: order.eventName ?? '',
date: order.date,
positions: order.positions,
location: order.location,
isRapidDraft: true,
),
);
// Try to match vendor if available
if (order.vendorId != null) {
final Vendor? vendor = state.vendors
.where((Vendor v) => v.id == order.vendorId)
.firstOrNull;
if (vendor != null) {
emit(state.copyWith(selectedVendor: vendor));
await _loadRolesForVendor(vendor.id, emit);
}
}
// Try to match hub if available
if (order.hub != null) {
final OneTimeOrderHubOption? hub = state.hubs
.where((OneTimeOrderHubOption h) => h.id == order.hub?.id)
.firstOrNull;
if (hub != null) {
emit(state.copyWith(selectedHub: hub));
await _loadManagersForHub(hub.id);
}
}
return;
}
}
emit(state.copyWith(eventName: title, date: startDate ?? DateTime.now()));
if (orderId == null || orderId.isEmpty) return;

11
apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/one_time_order/one_time_order_state.dart
View File

@@ -18,6 +18,7 @@ class OneTimeOrderState extends Equatable {
this.roles = const <OneTimeOrderRoleOption>[],
this.managers = const <OneTimeOrderManagerOption>[],
this.selectedManager,
this.isRapidDraft = false,
});
factory OneTimeOrderState.initial() {
@@ -47,6 +48,7 @@ class OneTimeOrderState extends Equatable {
final List<OneTimeOrderRoleOption> roles;
final List<OneTimeOrderManagerOption> managers;
final OneTimeOrderManagerOption? selectedManager;
final bool isRapidDraft;
OneTimeOrderState copyWith({
DateTime? date,
@@ -62,6 +64,7 @@ class OneTimeOrderState extends Equatable {
List<OneTimeOrderRoleOption>? roles,
List<OneTimeOrderManagerOption>? managers,
OneTimeOrderManagerOption? selectedManager,
bool? isRapidDraft,
}) {
return OneTimeOrderState(
date: date ?? this.date,
@@ -77,6 +80,7 @@ class OneTimeOrderState extends Equatable {
roles: roles ?? this.roles,
managers: managers ?? this.managers,
selectedManager: selectedManager ?? this.selectedManager,
isRapidDraft: isRapidDraft ?? this.isRapidDraft,
);
}
@@ -109,6 +113,7 @@ class OneTimeOrderState extends Equatable {
roles,
managers,
selectedManager,
isRapidDraft,
];
}
@@ -171,10 +176,7 @@ class OneTimeOrderRoleOption extends Equatable {
}
class OneTimeOrderManagerOption extends Equatable {
const OneTimeOrderManagerOption({
required this.id,
required this.name,
});
const OneTimeOrderManagerOption({required this.id, required this.name});
final String id;
final String name;
@@ -182,4 +184,3 @@ class OneTimeOrderManagerOption extends Equatable {
@override
List<Object?> get props => <Object?>[id, name];
}

59
apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/rapid_order/rapid_order_bloc.dart
View File

@@ -1,8 +1,8 @@
import 'package:client_create_order/src/domain/arguments/rapid_order_arguments.dart';
import 'package:client_create_order/src/domain/usecases/create_rapid_order_usecase.dart';
import 'package:client_create_order/src/domain/usecases/parse_rapid_order_usecase.dart';
import 'package:client_create_order/src/domain/usecases/transcribe_rapid_order_usecase.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:krow_core/core.dart';
import 'package:krow_domain/krow_domain.dart';
import 'rapid_order_event.dart';
import 'rapid_order_state.dart';
@@ -11,8 +11,8 @@ import 'rapid_order_state.dart';
class RapidOrderBloc extends Bloc<RapidOrderEvent, RapidOrderState>
with BlocErrorHandler<RapidOrderState> {
RapidOrderBloc(
this._createRapidOrderUseCase,
this._transcribeRapidOrderUseCase,
this._parseRapidOrderUseCase,
this._audioRecorderService,
) : super(
const RapidOrderInitial(
@@ -28,8 +28,8 @@ class RapidOrderBloc extends Bloc<RapidOrderEvent, RapidOrderState>
on<RapidOrderSubmitted>(_onSubmitted);
on<RapidOrderExampleSelected>(_onExampleSelected);
}
final CreateRapidOrderUseCase _createRapidOrderUseCase;
final TranscribeRapidOrderUseCase _transcribeRapidOrderUseCase;
final ParseRapidOrderTextToOrderUseCase _parseRapidOrderUseCase;
final AudioRecorderService _audioRecorderService;
void _onMessageChanged(
@@ -47,39 +47,21 @@ class RapidOrderBloc extends Bloc<RapidOrderEvent, RapidOrderState>
) async {
if (state is RapidOrderInitial) {
final RapidOrderInitial currentState = state as RapidOrderInitial;
final bool alreadyListening = currentState.isListening;
final bool newListeningState = !currentState.isListening;
if (!alreadyListening) {
// Start recording
await handleError(
emit: (RapidOrderState s) => emit(s),
action: () async {
await _audioRecorderService.startRecording();
emit(currentState.copyWith(isListening: true));
},
onError: (String errorKey) => RapidOrderFailure(errorKey),
);
} else {
// Stop and transcribe
emit(currentState.copyWith(isListening: false));
emit(currentState.copyWith(isListening: newListeningState));
await handleError(
emit: (RapidOrderState s) => emit(s),
action: () async {
final String? path = await _audioRecorderService.stopRecording();
if (path != null) {
final String transcript = await _transcribeRapidOrderUseCase(
path,
);
if (state is RapidOrderInitial) {
emit(
(state as RapidOrderInitial).copyWith(message: transcript),
);
}
}
},
onError: (String errorKey) => RapidOrderFailure(errorKey),
);
// Simulate voice recognition
if (newListeningState) {
await Future<void>.delayed(const Duration(seconds: 2));
if (state is RapidOrderInitial) {
emit(
(state as RapidOrderInitial).copyWith(
message: 'Need 2 servers for a banquet right now.',
isListening: false,
),
);
}
}
}
}
@@ -96,10 +78,8 @@ class RapidOrderBloc extends Bloc<RapidOrderEvent, RapidOrderState>
await handleError(
emit: emit.call,
action: () async {
await _createRapidOrderUseCase(
RapidOrderArguments(description: message),
);
emit(const RapidOrderSuccess());
final OneTimeOrder order = await _parseRapidOrderUseCase(message);
emit(RapidOrderParsed(order));
},
onError: (String errorKey) => RapidOrderFailure(errorKey),
);
@@ -116,3 +96,4 @@ class RapidOrderBloc extends Bloc<RapidOrderEvent, RapidOrderState>
}
}
}

9
apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/rapid_order/rapid_order_state.dart
View File

@@ -1,4 +1,5 @@
import 'package:equatable/equatable.dart';
import 'package:krow_domain/krow_domain.dart';
abstract class RapidOrderState extends Equatable {
const RapidOrderState();
@@ -48,3 +49,11 @@ class RapidOrderFailure extends RapidOrderState {
@override
List<Object?> get props => <Object?>[error];
}
class RapidOrderParsed extends RapidOrderState {
const RapidOrderParsed(this.order);
final OneTimeOrder order;
@override
List<Object?> get props => <Object?>[order];
}

1
apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/one_time_order_page.dart
View File

@@ -53,6 +53,7 @@ class OneTimeOrderPage extends StatelessWidget {
: null,
hubManagers: state.managers.map(_mapManager).toList(),
isValid: state.isValid,
title: state.isRapidDraft ? 'Rapid Order : Verify the order' : null,
onEventNameChanged: (String val) =>
bloc.add(OneTimeOrderEventNameChanged(val)),
onVendorChanged: (Vendor val) =>

7
apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/widgets/rapid_order/rapid_order_view.dart
View File

@@ -72,6 +72,13 @@ class _RapidOrderFormState extends State<_RapidOrderForm> {
TextPosition(offset: _messageController.text.length),
);
}
} else if (state is RapidOrderParsed) {
Modular.to.toCreateOrderOneTime(
arguments: <String, dynamic>{
'order': state.order,
'isRapidDraft': true,
},
);
} else if (state is RapidOrderFailure) {
UiSnackbar.show(
context,

17
apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/one_time_order/one_time_order_view.dart
View File

@@ -38,6 +38,7 @@ class OneTimeOrderView extends StatelessWidget {
required this.onSubmit,
required this.onDone,
required this.onBack,
this.title,
super.key,
});
@@ -54,6 +55,7 @@ class OneTimeOrderView extends StatelessWidget {
final List<OrderManagerUiModel> hubManagers;
final OrderManagerUiModel? selectedHubManager;
final bool isValid;
final String? title;
final ValueChanged<String> onEventNameChanged;
final ValueChanged<Vendor> onVendorChanged;
@@ -61,7 +63,8 @@ class OneTimeOrderView extends StatelessWidget {
final ValueChanged<OrderHubUiModel> onHubChanged;
final ValueChanged<OrderManagerUiModel?> onHubManagerChanged;
final VoidCallback onPositionAdded;
final void Function(int index, OrderPositionUiModel position) onPositionUpdated;
final void Function(int index, OrderPositionUiModel position)
onPositionUpdated;
final void Function(int index) onPositionRemoved;
final VoidCallback onSubmit;
final VoidCallback onDone;
@@ -98,7 +101,7 @@ class OneTimeOrderView extends StatelessWidget {
body: Column(
children: <Widget>[
OneTimeOrderHeader(
title: labels.title,
title: title ?? labels.title,
subtitle: labels.subtitle,
onBack: onBack,
),
@@ -136,7 +139,7 @@ class OneTimeOrderView extends StatelessWidget {
body: Column(
children: <Widget>[
OneTimeOrderHeader(
title: labels.title,
title: title ?? labels.title,
subtitle: labels.subtitle,
onBack: onBack,
),
@@ -220,7 +223,8 @@ class _OneTimeOrderForm extends StatelessWidget {
final ValueChanged<OrderHubUiModel> onHubChanged;
final ValueChanged<OrderManagerUiModel?> onHubManagerChanged;
final VoidCallback onPositionAdded;
final void Function(int index, OrderPositionUiModel position) onPositionUpdated;
final void Function(int index, OrderPositionUiModel position)
onPositionUpdated;
final void Function(int index) onPositionRemoved;
@override
@@ -317,10 +321,7 @@ class _OneTimeOrderForm extends StatelessWidget {
items: hubs.map((OrderHubUiModel hub) {
return DropdownMenuItem<OrderHubUiModel>(
value: hub,
child: Text(
hub.name,
style: UiTypography.body2m.textPrimary,
),
child: Text(hub.name, style: UiTypography.body2m.textPrimary),
);
}).toList(),
),

4
apps/mobile/packages/features/client/orders/orders_common/macos/Flutter/GeneratedPluginRegistrant.swift
View File

@@ -10,7 +10,7 @@ import file_selector_macos
import firebase_app_check
import firebase_auth
import firebase_core
import record_darwin
import record_macos
import shared_preferences_foundation
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
@@ -19,6 +19,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
FLTFirebaseAppCheckPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAppCheckPlugin"))
FLTFirebaseAuthPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAuthPlugin"))
FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
RecordPlugin.register(with: registry.registrar(forPlugin: "RecordPlugin"))
RecordMacOsPlugin.register(with: registry.registrar(forPlugin: "RecordMacOsPlugin"))
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
}