diff --git a/lib/pages/vehicles_on_the_property/vehicle_model.dart b/lib/pages/vehicles_on_the_property/vehicle_model.dart index 079d9c92..0e63ee31 100644 --- a/lib/pages/vehicles_on_the_property/vehicle_model.dart +++ b/lib/pages/vehicles_on_the_property/vehicle_model.dart @@ -73,7 +73,7 @@ class VehicleModel extends FlutterFlowModel await StorageHelper().get(LocalsStorageKey.vehicleAmountRegister.key); } - bool isFormValid(BuildContext context, GlobalKey formKey) { + bool isFormValid(BuildContext context, GlobalKey formKey) { if (formKey.currentState == null) return false; return formKey.currentState!.validate(); } @@ -163,7 +163,6 @@ mixin class _BaseVehiclePage { log('vehicleId: ${item['vehicleId']}'); vehicleId = item['vehicleId']; - textFieldControllerLicensePlate = TextEditingController( text: item != null ? item['licensePlate'] ?? '' : ''); textFieldControllerColor = @@ -320,10 +319,8 @@ mixin _VehicleHistoryScreenModel on _BaseVehiclePage { context.pop(); isEditing = true; - await switchTab(1); await setEditForm(item); - } final cancelText = FFLocalizations.of(context) diff --git a/lib/pages/vehicles_on_the_property/vehicle_register_screen.dart b/lib/pages/vehicles_on_the_property/vehicle_register_screen.dart index 815b9b72..b11e0db7 100644 --- a/lib/pages/vehicles_on_the_property/vehicle_register_screen.dart +++ b/lib/pages/vehicles_on_the_property/vehicle_register_screen.dart @@ -72,7 +72,8 @@ class _VehicleRegisterScreenState extends State { child: SubmitButtonUtil( labelText: FFLocalizations.of(context) .getVariableText(ptText: 'Cadastrar', enText: 'Register'), - onPressed: widget.model.isFormValid(context, widget.model.registerFormKey) + onPressed: widget.model + .isFormValid(context, widget.model.registerFormKey) ? widget.model.registerVehicle : null, ),