From 1ca638dc776b511a506660ff83013156fda55281 Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Tue, 12 Nov 2024 08:53:09 -0300 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20valida=C3=A7=C3=A3o=20do=20campo=20e?= =?UTF-8?q?=20tratamento=20de=20exce=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/pets_page/pets_page_model.dart | 34 ++++++++++++++++-------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/lib/pages/pets_page/pets_page_model.dart b/lib/pages/pets_page/pets_page_model.dart index 8a4a07a5..38a6da61 100644 --- a/lib/pages/pets_page/pets_page_model.dart +++ b/lib/pages/pets_page/pets_page_model.dart @@ -230,12 +230,25 @@ class PetsPageModel extends FlutterFlowModel { return false; } - if (dropDownValue1 == null || dropDownValue1!.isEmpty || dropDownValue1 == '') { + if (dropDownValueController1!.value == 'Selecione uma opção' || + dropDownValueController1!.value == '' || + dropDownValueController1!.value == null) { return false; } - if (dropDownValue2 == null || dropDownValue2!.isEmpty || dropDownValue2 == '') { + if (dropDownValueController2!.value == 'Selecione uma opção' || + dropDownValueController2!.value == '' || + dropDownValueController2!.value == null) { return false; } + + if (dropDownValue1 == 'Selecione uma opção' || dropDownValue1 == null || dropDownValue1 == '') { + return false; + } + + if (dropDownValue2 == 'Selecione uma opção' || dropDownValue2 == null || dropDownValue2 == '') { + return false; + } + return true; } @@ -258,7 +271,7 @@ class PetsPageModel extends FlutterFlowModel { ); if (response.jsonBody['error'] == false) { - DialogUtil.success( + await DialogUtil.success( buildContext!, FFLocalizations.of(buildContext!).getVariableText( enText: 'Pet successfully updated', @@ -279,7 +292,7 @@ class PetsPageModel extends FlutterFlowModel { ptText: 'Falha ao atualizar o pet', ); } - DialogUtil.error(buildContext!, errorMessage); + await DialogUtil.error(buildContext!, errorMessage); } } @@ -299,7 +312,7 @@ class PetsPageModel extends FlutterFlowModel { ); if (response.jsonBody['error'] == false) { - DialogUtil.success( + await DialogUtil.success( buildContext!, FFLocalizations.of(buildContext!).getVariableText( enText: 'Pet successfully registered', @@ -311,15 +324,16 @@ class PetsPageModel extends FlutterFlowModel { String errorMessage; try { errorMessage = jsonDecode(response.jsonBody['error_msg'])[0]['message'].toString(); + await DialogUtil.error(buildContext!, errorMessage); } catch (e) { if (response.jsonBody['error_msg'] == "Limite de Cadastro de Pet Atingido.") { errorMessage = FFLocalizations.of(buildContext!).getVariableText( enText: 'Pet registration limit reached', ptText: 'Limite de cadastro de pets atingido', ); - DialogUtil.error(buildContext!, errorMessage); + await DialogUtil.error(buildContext!, errorMessage); } else { - DialogUtil.errorDefault(buildContext!); + await DialogUtil.errorDefault(buildContext!); } } } @@ -359,10 +373,8 @@ class PetsPageModel extends FlutterFlowModel { // dropDownValue1 = ''; // dropDownValue2 = ''; - // dropDownValueController1 = - // FormFieldController('Selecione uma opção'); - // dropDownValueController2 = - // FormFieldController('Selecione uma opção'); + // dropDownValueController1 = FormFieldController('Selecione uma opção'); + // dropDownValueController2 = FormFieldController('Selecione uma opção'); } Widget buildPetDetails({ From 697fa8ff84ee6df4400366e1ae936a47d1002bb7 Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Tue, 12 Nov 2024 10:08:28 -0300 Subject: [PATCH 2/4] fix: tratamento para ingles --- lib/pages/pets_page/pets_page_model.dart | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/pages/pets_page/pets_page_model.dart b/lib/pages/pets_page/pets_page_model.dart index 38a6da61..fd717e00 100644 --- a/lib/pages/pets_page/pets_page_model.dart +++ b/lib/pages/pets_page/pets_page_model.dart @@ -45,6 +45,8 @@ class PetsPageModel extends FlutterFlowModel { FFUploadedFile? uploadedTempFile; String? imgBase64; + late String defaultDropDownText = ''; + String? dropDownValue1; FormFieldController? dropDownValueController1; @@ -103,6 +105,13 @@ class PetsPageModel extends FlutterFlowModel { String? Function(BuildContext, String?)? textControllerObservationValidator; Future initAsync() async { + defaultDropDownText = FFLocalizations.of(buildContext!).getVariableText( + enText: 'Select an option', + ptText: 'Selecione uma opção', + ); + dropDownValueController1 = FormFieldController(dropDownValue1 ??= defaultDropDownText); + dropDownValueController2 = FormFieldController(dropDownValue2 ??= defaultDropDownText); + devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? ''; userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? ''; cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? ''; @@ -136,10 +145,6 @@ class PetsPageModel extends FlutterFlowModel { textFieldFocusObservation = FocusNode(); textControllerObservation = TextEditingController(); - dropDownValueController1 = FormFieldController(dropDownValue1 ??= 'Selecione uma opção'); - - dropDownValueController2 = FormFieldController(dropDownValue2 ??= 'Selecione uma opção'); - initAsync(); } @@ -230,12 +235,12 @@ class PetsPageModel extends FlutterFlowModel { return false; } - if (dropDownValueController1!.value == 'Selecione uma opção' || + if (dropDownValueController1!.value == defaultDropDownText || dropDownValueController1!.value == '' || dropDownValueController1!.value == null) { return false; } - if (dropDownValueController2!.value == 'Selecione uma opção' || + if (dropDownValueController2!.value == defaultDropDownText || dropDownValueController2!.value == '' || dropDownValueController2!.value == null) { return false; From 85816f3da13c34666b2c8836282fb56839d862db Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Tue, 12 Nov 2024 10:10:48 -0300 Subject: [PATCH 3/4] fix: alterar icone de desvincular propriedade --- .../preferences_settings_page/preferences_settings_widget.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/pages/preferences_settings_page/preferences_settings_widget.dart b/lib/pages/preferences_settings_page/preferences_settings_widget.dart index c8603a7a..426e21b9 100644 --- a/lib/pages/preferences_settings_page/preferences_settings_widget.dart +++ b/lib/pages/preferences_settings_page/preferences_settings_widget.dart @@ -6,6 +6,7 @@ import 'package:hub/flutter_flow/flutter_flow_util.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; import 'package:hub/pages/preferences_settings_page/preferences_settings_model.dart'; import 'package:hub/shared/utils/limited_text_size.dart'; +import 'package:material_symbols_icons/symbols.dart'; import 'package:provider/provider.dart'; @@ -154,7 +155,7 @@ class _PreferencesPageWidgetState extends State { ); break; case 6: - icon = Icons.landscape; + icon = Symbols.digital_out_of_home; onPressed = () { model.localUnlink(context); }; From 8cbe3d35cf9da3e5dfaea0f56241fe80bd45ef92 Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Tue, 12 Nov 2024 10:20:22 -0300 Subject: [PATCH 4/4] WIP --- .../preferences_settings_page/preferences_settings_widget.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/pages/preferences_settings_page/preferences_settings_widget.dart b/lib/pages/preferences_settings_page/preferences_settings_widget.dart index 426e21b9..c8603a7a 100644 --- a/lib/pages/preferences_settings_page/preferences_settings_widget.dart +++ b/lib/pages/preferences_settings_page/preferences_settings_widget.dart @@ -6,7 +6,6 @@ import 'package:hub/flutter_flow/flutter_flow_util.dart'; import 'package:hub/flutter_flow/nav/nav.dart'; import 'package:hub/pages/preferences_settings_page/preferences_settings_model.dart'; import 'package:hub/shared/utils/limited_text_size.dart'; -import 'package:material_symbols_icons/symbols.dart'; import 'package:provider/provider.dart'; @@ -155,7 +154,7 @@ class _PreferencesPageWidgetState extends State { ); break; case 6: - icon = Symbols.digital_out_of_home; + icon = Icons.landscape; onPressed = () { model.localUnlink(context); };