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

Fix stash conflict

Browse Source
This commit is contained in:
Suriya
2026-02-25 13:35:58 +05:30
parent 4d4a9b6a66
commit 4e7838bf93
9 changed files with 107 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/mobile/packages/domain/lib/src/entities/orders/permanent_order.dart
View File

@@ -26,8 +26,12 @@ class PermanentOrder extends Equatable {
final Map<String, double> roleRates;
@override
<<<<<<< Updated upstream
<<<<<<< Updated upstream
List<Object?> get props => <Object?>[
=======
List<Object?> get props => [
>>>>>>> Stashed changes
=======
List<Object?> get props => [
>>>>>>> Stashed changes

18
apps/mobile/packages/domain/lib/src/entities/orders/recurring_order.dart
View File

@@ -1,22 +1,31 @@
import 'package:equatable/equatable.dart';
<<<<<<< Updated upstream
<<<<<<< Updated upstream
import 'recurring_order_position.dart';
/// Represents a recurring staffing request spanning a date range.
=======
=======
>>>>>>> Stashed changes
import 'one_time_order.dart';
import 'one_time_order_position.dart';
/// Represents a customer's request for recurring staffing.
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
class RecurringOrder extends Equatable {
const RecurringOrder({
required this.startDate,
required this.endDate,
required this.recurringDays,
<<<<<<< Updated upstream
<<<<<<< Updated upstream
required this.location,
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
required this.positions,
this.hub,
@@ -25,6 +34,7 @@ class RecurringOrder extends Equatable {
this.roleRates = const <String, double>{},
});
<<<<<<< Updated upstream
<<<<<<< Updated upstream
/// Start date for the recurring schedule.
final DateTime startDate;
@@ -60,6 +70,8 @@ class RecurringOrder extends Equatable {
recurringDays,
location,
=======
=======
>>>>>>> Stashed changes
final DateTime startDate;
final DateTime endDate;
@@ -77,6 +89,9 @@ class RecurringOrder extends Equatable {
startDate,
endDate,
recurringDays,
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
positions,
hub,
@@ -86,6 +101,7 @@ class RecurringOrder extends Equatable {
];
}
<<<<<<< Updated upstream
<<<<<<< Updated upstream
/// Minimal hub details used during recurring order creation.
class RecurringOrderHubDetails extends Equatable {
@@ -132,3 +148,5 @@ class RecurringOrderHubDetails extends Equatable {
}
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes

19
apps/mobile/packages/features/client/hubs/lib/src/domain/usecases/update_hub_usecase.dart
View File

@@ -1,4 +1,5 @@
<<<<<<< Updated upstream
<<<<<<< Updated upstream
import 'package:krow_core/core.dart';
import 'package:krow_domain/krow_domain.dart';
@@ -7,6 +8,8 @@ import '../repositories/hub_repository_interface.dart';
/// Arguments for the UpdateHubUseCase.
class UpdateHubArguments extends UseCaseArgument {
=======
=======
>>>>>>> Stashed changes
import 'package:krow_domain/krow_domain.dart';
import '../repositories/hub_repository_interface.dart';
@@ -14,6 +17,9 @@ import '../../domain/arguments/create_hub_arguments.dart';
/// Arguments for the UpdateHubUseCase.
class UpdateHubArguments {
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
const UpdateHubArguments({
required this.id,
@@ -26,10 +32,14 @@ class UpdateHubArguments {
this.state,
this.street,
this.country,
<<<<<<< Updated upstream
<<<<<<< Updated upstream
this.country,
this.zipCode,
this.costCenter,
=======
this.zipCode,
>>>>>>> Stashed changes
=======
this.zipCode,
>>>>>>> Stashed changes
@@ -46,6 +56,7 @@ class UpdateHubArguments {
final String? street;
final String? country;
final String? zipCode;
<<<<<<< Updated upstream
<<<<<<< Updated upstream
final String? costCenter;
@@ -69,10 +80,15 @@ class UpdateHubArguments {
/// Use case for updating an existing hub.
class UpdateHubUseCase implements UseCase<UpdateHubArguments, Hub> {
=======
=======
>>>>>>> Stashed changes
}
/// Use case for updating an existing hub.
class UpdateHubUseCase implements UseCase<Future<Hub>, UpdateHubArguments> {
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
UpdateHubUseCase(this.repository);
@@ -92,9 +108,12 @@ class UpdateHubUseCase implements UseCase<Future<Hub>, UpdateHubArguments> {
street: params.street,
country: params.country,
zipCode: params.zipCode,
<<<<<<< Updated upstream
<<<<<<< Updated upstream
costCenter: params.costCenter,
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
);
}

21
apps/mobile/packages/features/client/hubs/lib/src/presentation/pages/hub_details_page.dart
View File

@@ -1,12 +1,16 @@
<<<<<<< Updated upstream
<<<<<<< Updated upstream
import 'package:core_localization/core_localization.dart';
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
import 'package:design_system/design_system.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_modular/flutter_modular.dart';
<<<<<<< Updated upstream
<<<<<<< Updated upstream
import 'package:krow_core/core.dart';
import 'package:krow_domain/krow_domain.dart';
@@ -100,6 +104,8 @@ class HubDetailsPage extends StatelessWidget {
);
},
=======
=======
>>>>>>> Stashed changes
import 'package:krow_domain/krow_domain.dart';
import '../blocs/client_hubs_bloc.dart';
import '../blocs/client_hubs_event.dart';
@@ -160,12 +166,16 @@ class HubDetailsPage extends StatelessWidget {
),
],
),
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
),
),
);
}
<<<<<<< Updated upstream
<<<<<<< Updated upstream
Future<void> _navigateToEditPage(BuildContext context) async {
final bool? saved = await Modular.to.toEditHub(hub: hub);
@@ -190,6 +200,8 @@ class HubDetailsPage extends StatelessWidget {
style: TextButton.styleFrom(foregroundColor: UiColors.destructive),
child: Text(t.client_hubs.delete_dialog.delete),
=======
=======
>>>>>>> Stashed changes
Widget _buildDetailItem({
required String label,
required String value,
@@ -239,17 +251,23 @@ class HubDetailsPage extends StatelessWidget {
),
],
),
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
),
],
),
);
<<<<<<< Updated upstream
<<<<<<< Updated upstream
if (confirm == true) {
bloc.add(HubDetailsDeleteRequested(hub.id));
}
=======
=======
>>>>>>> Stashed changes
}
void _showEditDialog(BuildContext context) {
@@ -280,6 +298,9 @@ class HubDetailsPage extends StatelessWidget {
onCancel: () => Navigator.of(context).pop(),
),
);
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
}
}

25
apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/hub_form_dialog.dart
View File

@@ -27,9 +27,12 @@ class HubFormDialog extends StatefulWidget {
String? placeId,
double? latitude,
double? longitude,
<<<<<<< Updated upstream
<<<<<<< Updated upstream
String? costCenter,
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
}) onSave;
@@ -42,9 +45,12 @@ class HubFormDialog extends StatefulWidget {
class _HubFormDialogState extends State<HubFormDialog> {
late final TextEditingController _nameController;
<<<<<<< Updated upstream
<<<<<<< Updated upstream
late final TextEditingController _costCenterController;
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
late final TextEditingController _addressController;
late final FocusNode _addressFocusNode;
@@ -54,9 +60,12 @@ class _HubFormDialogState extends State<HubFormDialog> {
void initState() {
super.initState();
_nameController = TextEditingController(text: widget.hub?.name);
<<<<<<< Updated upstream
<<<<<<< Updated upstream
_costCenterController = TextEditingController(text: widget.hub?.costCenter);
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
_addressController = TextEditingController(text: widget.hub?.address);
_addressFocusNode = FocusNode();
@@ -65,9 +74,12 @@ class _HubFormDialogState extends State<HubFormDialog> {
@override
void dispose() {
_nameController.dispose();
<<<<<<< Updated upstream
<<<<<<< Updated upstream
_costCenterController.dispose();
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
_addressController.dispose();
_addressFocusNode.dispose();
@@ -84,8 +96,12 @@ class _HubFormDialogState extends State<HubFormDialog> {
: t.client_hubs.add_hub_dialog.title;
final String buttonText = isEditing
<<<<<<< Updated upstream
<<<<<<< Updated upstream
? t.client_hubs.edit_hub.save_button
=======
? 'Save Changes' // TODO: localize
>>>>>>> Stashed changes
=======
? 'Save Changes' // TODO: localize
>>>>>>> Stashed changes
@@ -131,6 +147,7 @@ class _HubFormDialogState extends State<HubFormDialog> {
),
),
const SizedBox(height: UiConstants.space4),
<<<<<<< Updated upstream
<<<<<<< Updated upstream
_buildFieldLabel(t.client_hubs.add_hub_dialog.cost_center_label),
TextFormField(
@@ -143,6 +160,8 @@ class _HubFormDialogState extends State<HubFormDialog> {
),
const SizedBox(height: UiConstants.space4),
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
_buildFieldLabel(t.client_hubs.add_hub_dialog.address_label),
HubAddressAutocomplete(
@@ -179,6 +198,7 @@ class _HubFormDialogState extends State<HubFormDialog> {
latitude: double.tryParse(
_selectedPrediction?.lat ?? '',
),
<<<<<<< Updated upstream
<<<<<<< Updated upstream
longitude: double.tryParse(
_selectedPrediction?.lng ?? '',
@@ -186,10 +206,15 @@ class _HubFormDialogState extends State<HubFormDialog> {
costCenter: _costCenterController.text.trim().isEmpty ? null : _costCenterController.text.trim(),
);
=======
=======
>>>>>>> Stashed changes
longitude: double.tryParse(
_selectedPrediction?.lng ?? '',
),
);
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
}
},

4
apps/mobile/packages/features/client/orders/create_order/lib/src/domain/usecases/create_permanent_order_usecase.dart
View File

@@ -4,9 +4,13 @@ import '../repositories/client_create_order_repository_interface.dart';
/// Use case for creating a permanent staffing order.
<<<<<<< Updated upstream:apps/mobile/packages/features/client/orders/create_order/lib/src/domain/usecases/create_permanent_order_usecase.dart
<<<<<<< Updated upstream:apps/mobile/packages/features/client/orders/create_order/lib/src/domain/usecases/create_permanent_order_usecase.dart
class CreatePermanentOrderUseCase implements UseCase<PermanentOrder, void> {
=======
class CreatePermanentOrderUseCase implements UseCase<Future<void>, PermanentOrder> {
>>>>>>> Stashed changes:apps/mobile/packages/features/client/create_order/lib/src/domain/usecases/create_permanent_order_usecase.dart
=======
class CreatePermanentOrderUseCase implements UseCase<Future<void>, PermanentOrder> {
>>>>>>> Stashed changes:apps/mobile/packages/features/client/create_order/lib/src/domain/usecases/create_permanent_order_usecase.dart
const CreatePermanentOrderUseCase(this._repository);

4
apps/mobile/packages/features/client/orders/create_order/lib/src/domain/usecases/create_recurring_order_usecase.dart
View File

@@ -4,9 +4,13 @@ import '../repositories/client_create_order_repository_interface.dart';
/// Use case for creating a recurring staffing order.
<<<<<<< Updated upstream:apps/mobile/packages/features/client/orders/create_order/lib/src/domain/usecases/create_recurring_order_usecase.dart
<<<<<<< Updated upstream:apps/mobile/packages/features/client/orders/create_order/lib/src/domain/usecases/create_recurring_order_usecase.dart
class CreateRecurringOrderUseCase implements UseCase<RecurringOrder, void> {
=======
class CreateRecurringOrderUseCase implements UseCase<Future<void>, RecurringOrder> {
>>>>>>> Stashed changes:apps/mobile/packages/features/client/create_order/lib/src/domain/usecases/create_recurring_order_usecase.dart
=======
class CreateRecurringOrderUseCase implements UseCase<Future<void>, RecurringOrder> {
>>>>>>> Stashed changes:apps/mobile/packages/features/client/create_order/lib/src/domain/usecases/create_recurring_order_usecase.dart
const CreateRecurringOrderUseCase(this._repository);

4
apps/mobile/packages/features/client/orders/create_order/lib/src/domain/usecases/reorder_usecase.dart
View File

@@ -14,9 +14,13 @@ class ReorderArguments {
/// Use case for reordering an existing staffing order.
<<<<<<< Updated upstream:apps/mobile/packages/features/client/orders/create_order/lib/src/domain/usecases/reorder_usecase.dart
<<<<<<< Updated upstream:apps/mobile/packages/features/client/orders/create_order/lib/src/domain/usecases/reorder_usecase.dart
class ReorderUseCase implements UseCase<ReorderArguments, void> {
=======
class ReorderUseCase implements UseCase<Future<void>, ReorderArguments> {
>>>>>>> Stashed changes:apps/mobile/packages/features/client/create_order/lib/src/domain/usecases/reorder_usecase.dart
=======
class ReorderUseCase implements UseCase<Future<void>, ReorderArguments> {
>>>>>>> Stashed changes:apps/mobile/packages/features/client/create_order/lib/src/domain/usecases/reorder_usecase.dart
const ReorderUseCase(this._repository);

8
apps/mobile/packages/features/client/settings/lib/src/presentation/widgets/client_settings_page/settings_logout.dart
View File

@@ -4,6 +4,10 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_modular/flutter_modular.dart';
<<<<<<< Updated upstream
<<<<<<< Updated upstream
=======
import 'package:krow_core/core.dart';
>>>>>>> Stashed changes
=======
import 'package:krow_core/core.dart';
>>>>>>> Stashed changes
@@ -62,8 +66,12 @@ class SettingsLogout extends StatelessWidget {
style: UiTypography.headline3m.textPrimary,
),
content: Text(
<<<<<<< Updated upstream
<<<<<<< Updated upstream
'Are you sure you want to log out?',
=======
t.client_settings.profile.log_out_confirmation,
>>>>>>> Stashed changes
=======
t.client_settings.profile.log_out_confirmation,
>>>>>>> Stashed changes