brontomark/flux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

asd

Browse Source
This commit is contained in:
Mark M2 Macbook
2026-05-01 10:11:44 +02:00
parent 9c8576ada5
commit f8bcac51e1
48 changed files with 1187 additions and 1141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/core/routes/app_router.dart
View File

@@ -12,7 +12,7 @@ import 'package:flux/features/customers/models/customer_model.dart';
import 'package:flux/features/customers/ui/customer_detail_screen.dart';
import 'package:flux/features/customers/ui/customer_mobile_upload_screen.dart';
import 'package:flux/features/customers/ui/customers_content.dart';
import 'package:flux/features/home/latest_store_services/bloc/latest_store_services_bloc.dart';
import 'package:flux/features/home/latest_store_operations/bloc/latest_store_operations_bloc.dart';
import 'package:flux/features/home/ui/home_screen.dart';
import 'package:flux/features/master_data/master_data_hub_content.dart';
import 'package:flux/features/master_data/products/ui/products_screen.dart';
@@ -21,11 +21,11 @@ import 'package:flux/features/master_data/staff/ui/staff_screen.dart';
import 'package:flux/features/master_data/store/ui/stores_screen.dart';
import 'package:flux/features/onboarding/blocs/onboarding_cubit.dart';
import 'package:flux/features/onboarding/ui/onboarding_screen.dart';
import 'package:flux/features/operations/blocs/service_files_bloc.dart';
import 'package:flux/features/operations/models/service_model.dart';
import 'package:flux/features/operations/ui/service_form_screen/service_form_screen.dart';
import 'package:flux/features/operations/ui/service_form_screen/service_mobile_upload_screen.dart';
import 'package:flux/features/operations/ui/services_screen.dart';
import 'package:flux/features/operations/blocs/operation_files_bloc.dart';
import 'package:flux/features/operations/models/operation_model.dart';
import 'package:flux/features/operations/ui/operation_form_screen/operation_form_screen.dart';
import 'package:flux/features/operations/ui/operation_form_screen/operation_mobile_upload_screen.dart';
import 'package:flux/features/operations/ui/operations_screen.dart';
import 'package:get_it/get_it.dart';
import 'package:go_router/go_router.dart';
@@ -132,7 +132,7 @@ class AppRouter {
),
GoRoute(
path: '/operations',
builder: (context, state) => const ServicesScreen(),
builder: (context, state) => const OperationsScreen(),
),
GoRoute(
path: '/customers',
@@ -171,14 +171,15 @@ class AppRouter {
path: '/operation-form',
name: 'operation-form',
builder: (context, state) {
final existingService = state.extra as ServiceModel?;
final serviceId = state.uri.queryParameters['serviceId'];
final existingOperation = state.extra as OperationModel?;
final operationId = state.uri.queryParameters['operationId'];
return BlocProvider(
create: (context) =>
ServiceFilesBloc(serviceId: serviceId ?? existingService?.id),
child: ServiceFormScreen(
serviceId: serviceId ?? existingService?.id,
existingService: existingService,
create: (context) => OperationFilesBloc(
operationId: operationId ?? existingOperation?.id,
),
child: OperationFormScreen(
operationId: operationId ?? existingOperation?.id,
existingOperation: existingOperation,
),
);
},
@@ -186,13 +187,14 @@ class AppRouter {
GoRoute(
path: '/operation/:id/upload',
builder: (context, state) {
final serviceId = state.pathParameters['id']!;
final serviceName = state.uri.queryParameters['name'] ?? 'Pratica';
final operationId = state.pathParameters['id']!;
final operationName =
state.uri.queryParameters['name'] ?? 'Pratica';
return BlocProvider(
create: (context) => ServiceFilesBloc(serviceId: serviceId),
child: ServiceMobileUploadScreen(
serviceId: serviceId,
serviceName: serviceName,
create: (context) => OperationFilesBloc(operationId: operationId),
child: OperationMobileUploadScreen(
operationId: operationId,
operationName: operationName,
),
);
},

2
lib/core/widgets/flux_text_field.dart
View File

@@ -1,6 +1,6 @@
// lib/ui/common/flux_text_field.dart
import 'package:flutter/material.dart';
import 'package:flutter/operations.dart';
import 'package:flutter/services.dart';
import 'package:flux/core/theme/theme.dart';
class FluxTextField extends StatefulWidget {