diff --git a/lib/pages/pets_page/pets_page_model.dart b/lib/pages/pets_page/pets_page_model.dart index 8a4a07a5..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,25 @@ class PetsPageModel extends FlutterFlowModel { return false; } - if (dropDownValue1 == null || dropDownValue1!.isEmpty || dropDownValue1 == '') { + if (dropDownValueController1!.value == defaultDropDownText || + dropDownValueController1!.value == '' || + dropDownValueController1!.value == null) { return false; } - if (dropDownValue2 == null || dropDownValue2!.isEmpty || dropDownValue2 == '') { + if (dropDownValueController2!.value == defaultDropDownText || + 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 +276,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 +297,7 @@ class PetsPageModel extends FlutterFlowModel { ptText: 'Falha ao atualizar o pet', ); } - DialogUtil.error(buildContext!, errorMessage); + await DialogUtil.error(buildContext!, errorMessage); } } @@ -299,7 +317,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 +329,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 +378,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({