Merge branch 'main' into bugfix/fd-645

This commit is contained in:
Ivan Antunes 2024-08-14 16:51:51 -03:00
commit bb66e77beb
2 changed files with 162 additions and 171 deletions

View File

@ -4,6 +4,7 @@ import 'dart:developer';
import 'package:hub/components/molecular_components/throw_exception/throw_exception_widget.dart'; import 'package:hub/components/molecular_components/throw_exception/throw_exception_widget.dart';
import 'package:hub/custom_code/actions/convert_image_file_to_base64.dart'; import 'package:hub/custom_code/actions/convert_image_file_to_base64.dart';
import 'package:hub/flutter_flow/flutter_flow_theme.dart'; import 'package:hub/flutter_flow/flutter_flow_theme.dart';
import 'package:hub/shared/utils/validator_util.dart';
import '/backend/api_requests/api_calls.dart'; import '/backend/api_requests/api_calls.dart';
import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_util.dart';
@ -12,15 +13,13 @@ import 'package:flutter/material.dart';
import 'regisiter_vistor_template_component_widget.dart'; import 'regisiter_vistor_template_component_widget.dart';
class RegisiterVistorTemplateComponentModel class RegisiterVistorTemplateComponentModel extends FlutterFlowModel<RegisiterVistorTemplateComponentWidget> {
extends FlutterFlowModel<RegisiterVistorTemplateComponentWidget> {
/// State fields for stateful widgets in this page. /// State fields for stateful widgets in this page.
Timer? _debounceTimer; Timer? _debounceTimer;
final unfocusNode = FocusNode(); final unfocusNode = FocusNode();
bool isDataUploading = false; bool isDataUploading = false;
FFUploadedFile uploadedLocalFile = FFUploadedFile uploadedLocalFile = FFUploadedFile(bytes: Uint8List.fromList([]));
FFUploadedFile(bytes: Uint8List.fromList([]));
void debounce(Function() fn, Duration time) { void debounce(Function() fn, Duration time) {
if (_debounceTimer != null) { if (_debounceTimer != null) {
@ -98,13 +97,7 @@ class RegisiterVistorTemplateComponentModel
TextEditingController? textController4; TextEditingController? textController4;
String? Function(BuildContext, String?)? textController4Validator; String? Function(BuildContext, String?)? textController4Validator;
String? _textController4Validator(BuildContext context, String? val) { String? _textController4Validator(BuildContext context, String? val) {
if (val == null || val.isEmpty) { if (val != null && val.isNotEmpty && ValidatorUtil.isValidEmail(val) == false) {
return FFLocalizations.of(context).getVariableText(
enText: 'This field is required',
ptText: 'Este campo é obrigatório',
);
}
if (!val.contains('@') || !val.contains('.')) {
return FFLocalizations.of(context).getVariableText( return FFLocalizations.of(context).getVariableText(
enText: 'Invalid email', enText: 'Invalid email',
ptText: 'Email inválido', ptText: 'Email inválido',

View File

@ -2,6 +2,7 @@ import 'dart:developer';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:hub/shared/utils/dialog_util.dart'; import 'package:hub/shared/utils/dialog_util.dart';
import 'package:hub/shared/utils/validator_util.dart';
import 'package:json_path/fun_sdk.dart'; import 'package:json_path/fun_sdk.dart';
import 'package:rxdart/rxdart.dart'; import 'package:rxdart/rxdart.dart';
@ -87,19 +88,15 @@ class _RegisiterVistorTemplateComponentWidgetState
return false; return false;
} }
if (_model.textController1.text.isEmpty || if (_model.textController1.text.isEmpty || _model.textController1.text == '') {
_model.textController1.text == '') {
return false; return false;
} }
if (_model.dropDownValue == null || if (_model.dropDownValue == null || _model.dropDownValue!.isEmpty || _model.dropDownValue == '') {
_model.dropDownValue!.isEmpty ||
_model.dropDownValue == '') {
return false; return false;
} }
if (_model.textController2.text.isEmpty || if (_model.textController2.text.isEmpty || _model.textController2.text == '') {
_model.textController2.text == '') {
return false; return false;
} }
@ -107,6 +104,10 @@ class _RegisiterVistorTemplateComponentWidgetState
return false; return false;
} }
if (_model.textController4.text.isNotEmpty && _model.textController4.text != '' && ValidatorUtil.isValidEmail(_model.textController4.text) == false) {
return false;
}
return true; return true;
} }
@ -129,7 +130,6 @@ class _RegisiterVistorTemplateComponentWidgetState
), ),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Form( child: Form(
// key: UniqueKey(),
autovalidateMode: AutovalidateMode.onUserInteraction, autovalidateMode: AutovalidateMode.onUserInteraction,
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -138,8 +138,7 @@ class _RegisiterVistorTemplateComponentWidgetState
Align( Align(
alignment: const AlignmentDirectional(-1.0, 0.0), alignment: const AlignmentDirectional(-1.0, 0.0),
child: Padding( child: Padding(
padding: const EdgeInsetsDirectional.fromSTEB( padding: const EdgeInsetsDirectional.fromSTEB(20.0, 0.0, 0.0, 15.0),
20.0, 30.0, 0.0, 15.0),
child: Text( child: Text(
FFLocalizations.of(context).getText( FFLocalizations.of(context).getText(
'zazj5d8b' /* Preencha o formulário com os d... */, 'zazj5d8b' /* Preencha o formulário com os d... */,
@ -368,8 +367,7 @@ class _RegisiterVistorTemplateComponentWidgetState
), ),
maxLines: null, maxLines: null,
keyboardType: TextInputType.name, keyboardType: TextInputType.name,
validator: validator: _model.textController1Validator.asValidator(context),
_model.textController1Validator.asValidator(context),
), ),
), ),
Padding( Padding(
@ -455,7 +453,9 @@ class _RegisiterVistorTemplateComponentWidgetState
], ],
), ),
), ),
Builder( Padding(
padding: const EdgeInsetsDirectional.fromSTEB(24.0, 0.0, 24.0, 0.0),
child: Builder(
builder: (context) { builder: (context) {
if ((_model.uploadedLocalFile.bytes?.isNotEmpty ?? false)) { if ((_model.uploadedLocalFile.bytes?.isNotEmpty ?? false)) {
return InkWell( return InkWell(
@ -485,7 +485,7 @@ class _RegisiterVistorTemplateComponentWidgetState
return Stack( return Stack(
children: [ children: [
Align( Align(
alignment: const AlignmentDirectional(0.01, 0.0), alignment: const AlignmentDirectional(0.0, 0.0),
child: FFButtonWidget( child: FFButtonWidget(
onPressed: () async { onPressed: () async {
final selectedMedia = final selectedMedia =
@ -549,10 +549,9 @@ class _RegisiterVistorTemplateComponentWidgetState
size: 30.0, size: 30.0,
), ),
options: FFButtonOptions( options: FFButtonOptions(
width: 300.0, width: double.infinity,
height: 80.0, height: 120.0,
padding: const EdgeInsetsDirectional.fromSTEB( padding: const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 20.0),
0.0, 0.0, 0.0, 0.0),
iconPadding: iconPadding:
const EdgeInsetsDirectional.fromSTEB( const EdgeInsetsDirectional.fromSTEB(
14.0, 0.0, 0.0, 20.0), 14.0, 0.0, 0.0, 20.0),
@ -584,7 +583,7 @@ class _RegisiterVistorTemplateComponentWidgetState
alignment: const AlignmentDirectional(0.0, 0.0), alignment: const AlignmentDirectional(0.0, 0.0),
child: Padding( child: Padding(
padding: const EdgeInsetsDirectional.fromSTEB( padding: const EdgeInsetsDirectional.fromSTEB(
0.0, 50.0, 0.0, 0.0), 10.0, 65.0, 10.0, 0.0),
child: Text( child: Text(
FFLocalizations.of(context).getText( FFLocalizations.of(context).getText(
'p4ftwxcy' /* Clique para adicionar a foto p... */, 'p4ftwxcy' /* Clique para adicionar a foto p... */,
@ -610,6 +609,7 @@ class _RegisiterVistorTemplateComponentWidgetState
} }
}, },
), ),
),
Align( Align(
alignment: const AlignmentDirectional(-1.0, 0.0), alignment: const AlignmentDirectional(-1.0, 0.0),
child: Padding( child: Padding(
@ -792,13 +792,11 @@ class _RegisiterVistorTemplateComponentWidgetState
FlutterFlowTheme.of(context).bodyMediumFamily), FlutterFlowTheme.of(context).bodyMediumFamily),
), ),
keyboardType: TextInputType.emailAddress, keyboardType: TextInputType.emailAddress,
// validator: validator: _model.textController4Validator.asValidator(context),
// _model.textController4Validator.asValidator(context),
), ),
), ),
Padding( Padding(
padding: padding: const EdgeInsetsDirectional.fromSTEB(0.0, 65.0, 0.0, 0.0),
const EdgeInsetsDirectional.fromSTEB(0.0, 65.0, 0.0, 0.0),
child: FFButtonWidget( child: FFButtonWidget(
onPressed: _isFormValid(context) onPressed: _isFormValid(context)
? () async { ? () async {