Merge pull request #57 from FRE-Informatica/fix/fd-922
FIX/FD-922: Buscar visitante na tela de Visita Completa
This commit is contained in:
commit
116bff94c2
|
@ -95,9 +95,7 @@ class _VisitorSearchModalTemplateComponentWidgetState extends State<VisitorSearc
|
||||||
obscureText: false,
|
obscureText: false,
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
isDense: true,
|
isDense: true,
|
||||||
labelText: FFLocalizations.of(context).getText(
|
labelText: FFLocalizations.of(context).getText('cjlpru1m'),
|
||||||
'cjlpru1m' /* Procure pelo documento do visi... */,
|
|
||||||
),
|
|
||||||
labelStyle: FlutterFlowTheme.of(context).labelMedium.override(
|
labelStyle: FlutterFlowTheme.of(context).labelMedium.override(
|
||||||
fontFamily: FlutterFlowTheme.of(context).labelMediumFamily,
|
fontFamily: FlutterFlowTheme.of(context).labelMediumFamily,
|
||||||
color: FlutterFlowTheme.of(context).primaryText,
|
color: FlutterFlowTheme.of(context).primaryText,
|
||||||
|
@ -105,59 +103,40 @@ class _VisitorSearchModalTemplateComponentWidgetState extends State<VisitorSearc
|
||||||
useGoogleFonts: GoogleFonts.asMap().containsKey(FlutterFlowTheme.of(context).labelMediumFamily),
|
useGoogleFonts: GoogleFonts.asMap().containsKey(FlutterFlowTheme.of(context).labelMediumFamily),
|
||||||
),
|
),
|
||||||
enabledBorder: OutlineInputBorder(
|
enabledBorder: OutlineInputBorder(
|
||||||
borderSide: BorderSide(
|
borderSide: BorderSide(color: FlutterFlowTheme.of(context).accent1, width: 0.5),
|
||||||
color: FlutterFlowTheme.of(context).accent1,
|
|
||||||
width: 0.5,
|
|
||||||
),
|
|
||||||
borderRadius: const BorderRadius.only(
|
borderRadius: const BorderRadius.only(
|
||||||
bottomLeft: Radius.circular(15.0),
|
bottomLeft: Radius.circular(15.0),
|
||||||
bottomRight: Radius.circular(15.0),
|
bottomRight: Radius.circular(15.0),
|
||||||
topLeft: Radius.circular(15.0),
|
topLeft: Radius.circular(15.0),
|
||||||
topRight: Radius.circular(15.0),
|
topRight: Radius.circular(15.0)),
|
||||||
),
|
|
||||||
),
|
),
|
||||||
focusedBorder: OutlineInputBorder(
|
focusedBorder: OutlineInputBorder(
|
||||||
borderSide: BorderSide(
|
borderSide: BorderSide(color: FlutterFlowTheme.of(context).primary, width: 0.5),
|
||||||
color: FlutterFlowTheme.of(context).primary,
|
|
||||||
width: 0.5,
|
|
||||||
),
|
|
||||||
borderRadius: const BorderRadius.only(
|
borderRadius: const BorderRadius.only(
|
||||||
bottomLeft: Radius.circular(15.0),
|
bottomLeft: Radius.circular(15.0),
|
||||||
bottomRight: Radius.circular(15.0),
|
bottomRight: Radius.circular(15.0),
|
||||||
topLeft: Radius.circular(15.0),
|
topLeft: Radius.circular(15.0),
|
||||||
topRight: Radius.circular(15.0),
|
topRight: Radius.circular(15.0)),
|
||||||
),
|
|
||||||
),
|
),
|
||||||
errorBorder: OutlineInputBorder(
|
errorBorder: OutlineInputBorder(
|
||||||
borderSide: BorderSide(
|
borderSide: BorderSide(color: FlutterFlowTheme.of(context).error, width: 0.5),
|
||||||
color: FlutterFlowTheme.of(context).error,
|
|
||||||
width: 0.5,
|
|
||||||
),
|
|
||||||
borderRadius: const BorderRadius.only(
|
borderRadius: const BorderRadius.only(
|
||||||
bottomLeft: Radius.circular(15.0),
|
bottomLeft: Radius.circular(15.0),
|
||||||
bottomRight: Radius.circular(15.0),
|
bottomRight: Radius.circular(15.0),
|
||||||
topLeft: Radius.circular(15.0),
|
topLeft: Radius.circular(15.0),
|
||||||
topRight: Radius.circular(15.0),
|
topRight: Radius.circular(15.0)),
|
||||||
),
|
|
||||||
),
|
),
|
||||||
focusedErrorBorder: OutlineInputBorder(
|
focusedErrorBorder: OutlineInputBorder(
|
||||||
borderSide: BorderSide(
|
borderSide: BorderSide(color: FlutterFlowTheme.of(context).error, width: 0.5),
|
||||||
color: FlutterFlowTheme.of(context).error,
|
|
||||||
width: 0.5,
|
|
||||||
),
|
|
||||||
borderRadius: const BorderRadius.only(
|
borderRadius: const BorderRadius.only(
|
||||||
bottomLeft: Radius.circular(15.0),
|
bottomLeft: Radius.circular(15.0),
|
||||||
bottomRight: Radius.circular(15.0),
|
bottomRight: Radius.circular(15.0),
|
||||||
topLeft: Radius.circular(15.0),
|
topLeft: Radius.circular(15.0),
|
||||||
topRight: Radius.circular(15.0),
|
topRight: Radius.circular(15.0)),
|
||||||
),
|
|
||||||
),
|
),
|
||||||
filled: true,
|
filled: true,
|
||||||
fillColor: FlutterFlowTheme.of(context).primaryBackground,
|
fillColor: FlutterFlowTheme.of(context).primaryBackground,
|
||||||
prefixIcon: Icon(
|
prefixIcon: Icon(Icons.search_outlined, color: FlutterFlowTheme.of(context).accent1),
|
||||||
Icons.search_outlined,
|
|
||||||
color: FlutterFlowTheme.of(context).accent1,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
style: FlutterFlowTheme.of(context).bodyMedium.override(
|
style: FlutterFlowTheme.of(context).bodyMedium.override(
|
||||||
fontFamily: FlutterFlowTheme.of(context).bodyMediumFamily,
|
fontFamily: FlutterFlowTheme.of(context).bodyMediumFamily,
|
||||||
|
@ -166,9 +145,7 @@ class _VisitorSearchModalTemplateComponentWidgetState extends State<VisitorSearc
|
||||||
),
|
),
|
||||||
keyboardType: const TextInputType.numberWithOptions(signed: true),
|
keyboardType: const TextInputType.numberWithOptions(signed: true),
|
||||||
validator: _model.textControllerValidator.asValidator(context),
|
validator: _model.textControllerValidator.asValidator(context),
|
||||||
inputFormatters: [
|
inputFormatters: [FilteringTextInputFormatter.allow(RegExp('[0-9]'))],
|
||||||
FilteringTextInputFormatter.allow(RegExp('[0-9]')),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
if (_model.visitors.isNotEmpty && _model.visitors.isNotEmpty)
|
if (_model.visitors.isNotEmpty && _model.visitors.isNotEmpty)
|
||||||
|
@ -179,9 +156,7 @@ class _VisitorSearchModalTemplateComponentWidgetState extends State<VisitorSearc
|
||||||
Padding(
|
Padding(
|
||||||
padding: const EdgeInsetsDirectional.fromSTEB(16.0, 12.0, 0.0, 0.0),
|
padding: const EdgeInsetsDirectional.fromSTEB(16.0, 12.0, 0.0, 0.0),
|
||||||
child: Text(
|
child: Text(
|
||||||
FFLocalizations.of(context).getText(
|
FFLocalizations.of(context).getText('9coywebh'),
|
||||||
'9coywebh' /* Visitantes encontrados */,
|
|
||||||
),
|
|
||||||
style: FlutterFlowTheme.of(context).labelMedium.override(
|
style: FlutterFlowTheme.of(context).labelMedium.override(
|
||||||
fontFamily: FlutterFlowTheme.of(context).labelMediumFamily,
|
fontFamily: FlutterFlowTheme.of(context).labelMediumFamily,
|
||||||
color: FlutterFlowTheme.of(context).primaryText,
|
color: FlutterFlowTheme.of(context).primaryText,
|
||||||
|
@ -265,10 +240,7 @@ class _VisitorSearchModalTemplateComponentWidgetState extends State<VisitorSearc
|
||||||
padding: const EdgeInsetsDirectional.fromSTEB(12.0, 0.0, 0.0, 0.0),
|
padding: const EdgeInsetsDirectional.fromSTEB(12.0, 0.0, 0.0, 0.0),
|
||||||
child: Text(
|
child: Text(
|
||||||
valueOrDefault<String>(
|
valueOrDefault<String>(
|
||||||
getJsonField(
|
getJsonField(visitorItem, r'''$.VTE_NOME''')?.toString(),
|
||||||
visitorItem,
|
|
||||||
r'''$.VTE_NOME''',
|
|
||||||
)?.toString(),
|
|
||||||
'NOT FOUND',
|
'NOT FOUND',
|
||||||
),
|
),
|
||||||
style: FlutterFlowTheme.of(context).bodyLarge.override(
|
style: FlutterFlowTheme.of(context).bodyLarge.override(
|
||||||
|
@ -286,11 +258,8 @@ class _VisitorSearchModalTemplateComponentWidgetState extends State<VisitorSearc
|
||||||
borderRadius: 20.0,
|
borderRadius: 20.0,
|
||||||
borderWidth: 1.0,
|
borderWidth: 1.0,
|
||||||
buttonSize: 40.0,
|
buttonSize: 40.0,
|
||||||
icon: Icon(
|
icon: Icon(Icons.close,
|
||||||
Icons.close,
|
color: FlutterFlowTheme.of(context).customColor6, size: 20.0),
|
||||||
color: FlutterFlowTheme.of(context).customColor6,
|
|
||||||
size: 20.0,
|
|
||||||
),
|
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
_model.removeFromVisitors(visitorItem);
|
_model.removeFromVisitors(visitorItem);
|
||||||
_model.removeFromDocs(docItem);
|
_model.removeFromDocs(docItem);
|
||||||
|
@ -312,9 +281,7 @@ class _VisitorSearchModalTemplateComponentWidgetState extends State<VisitorSearc
|
||||||
return Container(
|
return Container(
|
||||||
width: 100.0,
|
width: 100.0,
|
||||||
height: 100.0,
|
height: 100.0,
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(color: FlutterFlowTheme.of(context).primaryBackground),
|
||||||
color: FlutterFlowTheme.of(context).primaryBackground,
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -326,14 +293,8 @@ class _VisitorSearchModalTemplateComponentWidgetState extends State<VisitorSearc
|
||||||
children: [
|
children: [
|
||||||
FFButtonWidget(
|
FFButtonWidget(
|
||||||
onPressed: MediaQuery.of(context).viewInsets.bottom > 0
|
onPressed: MediaQuery.of(context).viewInsets.bottom > 0
|
||||||
? () async {
|
? () async => await addVisitor(context).whenComplete(safeSetState(() {}))
|
||||||
await addVisitor(context);
|
: () async => await sendVisitors(context),
|
||||||
|
|
||||||
safeSetState(() {});
|
|
||||||
}
|
|
||||||
: () async {
|
|
||||||
await sendVisitors(context);
|
|
||||||
},
|
|
||||||
text: MediaQuery.of(context).viewInsets.bottom > 0
|
text: MediaQuery.of(context).viewInsets.bottom > 0
|
||||||
? FFLocalizations.of(context).getVariableText(
|
? FFLocalizations.of(context).getVariableText(
|
||||||
enText: 'Add',
|
enText: 'Add',
|
||||||
|
@ -357,23 +318,17 @@ class _VisitorSearchModalTemplateComponentWidgetState extends State<VisitorSearc
|
||||||
GoogleFonts.asMap().containsKey(FlutterFlowTheme.of(context).titleSmallFamily),
|
GoogleFonts.asMap().containsKey(FlutterFlowTheme.of(context).titleSmallFamily),
|
||||||
),
|
),
|
||||||
elevation: 3.0,
|
elevation: 3.0,
|
||||||
borderSide: const BorderSide(
|
borderSide: const BorderSide(color: Colors.transparent, width: 1.0),
|
||||||
color: Colors.transparent,
|
|
||||||
width: 1.0,
|
|
||||||
),
|
|
||||||
borderRadius: const BorderRadius.only(
|
borderRadius: const BorderRadius.only(
|
||||||
bottomLeft: Radius.circular(15),
|
bottomLeft: Radius.circular(15),
|
||||||
bottomRight: Radius.circular(15),
|
bottomRight: Radius.circular(15),
|
||||||
topLeft: Radius.circular(15),
|
topLeft: Radius.circular(15),
|
||||||
topRight: Radius.circular(15),
|
topRight: Radius.circular(15)),
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
const SizedBox(
|
const SizedBox(height: 30.0)
|
||||||
height: 30.0,
|
|
||||||
)
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
@ -381,9 +336,7 @@ class _VisitorSearchModalTemplateComponentWidgetState extends State<VisitorSearc
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> sendVisitors(BuildContext context) async {
|
Future<void> sendVisitors(BuildContext context) async {
|
||||||
await widget.getVisitors?.call(
|
await widget.getVisitors?.call(_model.visitors);
|
||||||
_model.visitors,
|
|
||||||
);
|
|
||||||
log('() => docs: ${_model.docs}');
|
log('() => docs: ${_model.docs}');
|
||||||
await widget.getDocs?.call(_model.docs);
|
await widget.getDocs?.call(_model.docs);
|
||||||
context.pop();
|
context.pop();
|
||||||
|
@ -394,22 +347,16 @@ class _VisitorSearchModalTemplateComponentWidgetState extends State<VisitorSearc
|
||||||
_model.textController?.text = _model.textController.text;
|
_model.textController?.text = _model.textController.text;
|
||||||
_model.textController?.selection = TextSelection.collapsed(offset: _model.textController!.text.length);
|
_model.textController?.selection = TextSelection.collapsed(offset: _model.textController!.text.length);
|
||||||
});
|
});
|
||||||
_model.getVisitorByDoc = await PhpGroup.getVisitorByDocCall.call(
|
_model.getVisitorByDoc =
|
||||||
documento: _model.textController.text,
|
await PhpGroup.getVisitorByDocCall.call(documento: _model.textController.text.replaceFirst(RegExp(r'^0+'), ''));
|
||||||
);
|
|
||||||
|
|
||||||
if (PhpGroup.getVisitorByDocCall.vistanteId(
|
if (PhpGroup.getVisitorByDocCall.vistanteId((_model.getVisitorByDoc?.jsonBody ?? '')) != '0' &&
|
||||||
(_model.getVisitorByDoc?.jsonBody ?? ''),
|
|
||||||
) !=
|
|
||||||
'0' &&
|
|
||||||
PhpGroup.getVisitorByDocCall.error((_model.getVisitorByDoc?.jsonBody ?? '')) == false &&
|
PhpGroup.getVisitorByDocCall.error((_model.getVisitorByDoc?.jsonBody ?? '')) == false &&
|
||||||
PhpGroup.getVisitorByDocCall.vistanteId((_model.getVisitorByDoc?.jsonBody ?? '')) != null) {
|
PhpGroup.getVisitorByDocCall.vistanteId((_model.getVisitorByDoc?.jsonBody ?? '')) != null) {
|
||||||
String newDoc = _model.textController.text;
|
String newDoc = _model.textController.text;
|
||||||
bool existDoc = _model.docs.contains(newDoc);
|
bool existDoc = _model.docs.contains(newDoc);
|
||||||
if (existDoc == false) {
|
if (existDoc == false) {
|
||||||
_model.addToVisitors(PhpGroup.getVisitorByDocCall.visitante(
|
_model.addToVisitors(PhpGroup.getVisitorByDocCall.visitante((_model.getVisitorByDoc?.jsonBody ?? '')));
|
||||||
(_model.getVisitorByDoc?.jsonBody ?? ''),
|
|
||||||
));
|
|
||||||
safeSetState(() {});
|
safeSetState(() {});
|
||||||
_model.addToDocs(_model.textController.text);
|
_model.addToDocs(_model.textController.text);
|
||||||
safeSetState(() {});
|
safeSetState(() {});
|
||||||
|
@ -426,9 +373,7 @@ class _VisitorSearchModalTemplateComponentWidgetState extends State<VisitorSearc
|
||||||
context: context,
|
context: context,
|
||||||
builder: (context) {
|
builder: (context) {
|
||||||
return Dialog(
|
return Dialog(
|
||||||
child: VisitorNotFoundComponentWidget(
|
child: VisitorNotFoundComponentWidget(doc: _model.textController.text),
|
||||||
doc: _model.textController.text,
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
).then((value) => safeSetState(() {
|
).then((value) => safeSetState(() {
|
||||||
|
|
Loading…
Reference in New Issue