From d2807fdaa6a47a58655c5afff15ac66107e21024 Mon Sep 17 00:00:00 2001 From: FlutterFlow <140657486+FlutterFlowEng@users.noreply.github.com> Date: Thu, 20 Jun 2024 17:58:50 +0000 Subject: [PATCH] Update approve and block visitRequest logic --- ios/Runner.xcodeproj/project.pbxproj | 8 +++--- ...isit_request_template_component_model.dart | 9 ++++-- ...sit_request_template_component_widget.dart | 28 ++++++++++++++++--- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index a761d56f..49e2fbad 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -44,8 +44,8 @@ 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 6436409D27A31CDB00820AF7 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/InfoPlist.strings; sourceTree = ""; }; - 6436409727A31CDD00820AF7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + 6436409627A31CD500820AF7 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/InfoPlist.strings; sourceTree = ""; }; + 6436409C27A31CD700820AF7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ @@ -225,8 +225,8 @@ 6436409C27A31CD800820AF7 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( - 6436409D27A31CDB00820AF7 /* pt */, - 6436409727A31CDD00820AF7 /* en */, + 6436409627A31CD500820AF7 /* pt */, + 6436409C27A31CD700820AF7 /* en */, ); name = InfoPlist.strings; sourceTree = ""; diff --git a/lib/components/templates_components/visit_request_template_component/visit_request_template_component_model.dart b/lib/components/templates_components/visit_request_template_component/visit_request_template_component_model.dart index 874c6e9a..f9c5ed42 100644 --- a/lib/components/templates_components/visit_request_template_component/visit_request_template_component_model.dart +++ b/lib/components/templates_components/visit_request_template_component/visit_request_template_component_model.dart @@ -24,6 +24,10 @@ class VisitRequestTemplateComponentModel FocusNode? textFieldFocusNode4; TextEditingController? textController4; String? Function(BuildContext, String?)? textController4Validator; + // Stores action output result for [Action Block - visitRequestComponentAction] action in IconButton widget. + bool? blockVisitRequest; + // Stores action output result for [Action Block - visitRequestComponentAction] action in IconButton widget. + bool? approveVisitRequest; @override void initState(BuildContext context) {} @@ -44,7 +48,7 @@ class VisitRequestTemplateComponentModel } /// Action blocks. - Future visitRequestComponentAction( + Future visitRequestComponentAction( BuildContext context, { required String? actionValue, required String? refUUID, @@ -69,8 +73,9 @@ class VisitRequestTemplateComponentModel ) == false) { Navigator.pop(context); + return true; } else { - return; + return false; } } } diff --git a/lib/components/templates_components/visit_request_template_component/visit_request_template_component_widget.dart b/lib/components/templates_components/visit_request_template_component/visit_request_template_component_widget.dart index aca3e782..d3bcc956 100644 --- a/lib/components/templates_components/visit_request_template_component/visit_request_template_component_widget.dart +++ b/lib/components/templates_components/visit_request_template_component/visit_request_template_component_widget.dart @@ -391,14 +391,24 @@ class _VisitRequestTemplateComponentWidgetState size: 24.0, ), onPressed: () async { - await _model.visitRequestComponentAction( + var shouldSetState = false; + _model.blockVisitRequest = + await _model.visitRequestComponentAction( context, actionValue: 'B', refUUID: widget.vawRef, responseValue: _model.textController4.text, vteUUID: widget.vteUUID, ); - setState(() {}); + shouldSetState = true; + if (_model.blockVisitRequest == true) { + Navigator.pop(context); + } else { + if (shouldSetState) setState(() {}); + return; + } + + if (shouldSetState) setState(() {}); }, ), FlutterFlowIconButton( @@ -412,14 +422,24 @@ class _VisitRequestTemplateComponentWidgetState size: 24.0, ), onPressed: () async { - await _model.visitRequestComponentAction( + var shouldSetState = false; + _model.approveVisitRequest = + await _model.visitRequestComponentAction( context, actionValue: 'L', refUUID: widget.vawRef, responseValue: _model.textController4.text, vteUUID: widget.vteUUID, ); - setState(() {}); + shouldSetState = true; + if (_model.approveVisitRequest == true) { + Navigator.pop(context); + } else { + if (shouldSetState) setState(() {}); + return; + } + + if (shouldSetState) setState(() {}); }, ), ].divide(const SizedBox(width: 20.0)),