From 1419df1ac177313b70e3cff1dde1d8a59b114133 Mon Sep 17 00:00:00 2001 From: Ivan Antunes Date: Tue, 20 Aug 2024 08:31:58 -0300 Subject: [PATCH 1/2] =?UTF-8?q?FIX:=20Prioriza=C3=A7=C3=A3o=20na=20Requisi?= =?UTF-8?q?=C3=A7=C3=A3o=20da=20Solicita=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liberation_history_widget.dart | 62 +++++++++---------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/lib/pages/liberation_history/liberation_history_widget.dart b/lib/pages/liberation_history/liberation_history_widget.dart index d24c4d29..1d400e40 100644 --- a/lib/pages/liberation_history/liberation_history_widget.dart +++ b/lib/pages/liberation_history/liberation_history_widget.dart @@ -218,29 +218,28 @@ class _LiberationHistoryWidgetState extends State { ), icon: const Icon(Icons.done), onPressed: () async { - Navigator.pop(context); - - safeSetState(() { - _requestWrap = []; - _requestFuture = _fetchRequests(); - }); - - var message = await answersRequest.call( + return answersRequest.call( context, liberationHistoryItem['NOT_ID'].toString(), 'L', '', liberationHistoryItem['VTE_ID'].toString(), - ); + ).then((message) { + if (message.isEmpty) { + showSnackbar( + context, + FFLocalizations.of(context).getVariableText(enText: 'Successfully resolved visit', ptText: 'Visita resolvida com sucesso'), false); + } else { + showSnackbar(context, message, true); + } - if (message.isEmpty) { - showSnackbar( - context, - FFLocalizations.of(context).getVariableText(enText: 'Successfully resolved visit', ptText: 'Visita resolvida com sucesso'), false); - } else { - showSnackbar(context, message, true); - } + safeSetState(() { + _requestWrap = []; + _requestFuture = _fetchRequests(); + }); + Navigator.pop(context); + }); }, ), if (liberationHistoryItem['NOT_STATUS'] == 'S') @@ -260,29 +259,28 @@ class _LiberationHistoryWidgetState extends State { ), icon: const Icon(Icons.close), onPressed: () async { - Navigator.pop(context); - - safeSetState(() { - _requestWrap = []; - _requestFuture = _fetchRequests(); - }); - - var message = await answersRequest.call( + return answersRequest.call( context, liberationHistoryItem['NOT_ID'].toString(), 'B', '', liberationHistoryItem['VTE_ID'].toString(), - ); + ).then((message) { + if (message.isEmpty) { + showSnackbar( + context, + FFLocalizations.of(context).getVariableText(enText: 'Successfully resolved visit', ptText: 'Visita resolvida com sucesso'), false); + } else { + showSnackbar(context, message, true); + } - if (message.isEmpty) { - showSnackbar( - context, - FFLocalizations.of(context).getVariableText(enText: 'Successfully resolved visit', ptText: 'Visita resolvida com sucesso'), false); - } else { - showSnackbar(context, message, true); - } + safeSetState(() { + _requestWrap = []; + _requestFuture = _fetchRequests(); + }); + Navigator.pop(context); + }); }, ) ], From 40b26d03088a76c4de8562c2f761ac7c31d7ddd7 Mon Sep 17 00:00:00 2001 From: jantunesmesias Date: Wed, 21 Aug 2024 10:30:25 -0300 Subject: [PATCH 2/2] WIP --- .../schedule_complete_visit_page_widget.dart | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_widget.dart b/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_widget.dart index 041c1362..0b7a54be 100644 --- a/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_widget.dart +++ b/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_widget.dart @@ -1,22 +1,15 @@ -import 'dart:developer'; - import 'package:auto_size_text/auto_size_text.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_spinkit/flutter_spinkit.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:hub/actions/actions.dart'; import 'package:hub/backend/api_requests/api_calls.dart'; -import 'package:hub/components/templates_components/card_item_template_component/card_item_template_component_widget.dart'; -import 'package:hub/components/templates_components/details_component/details_component_action.dart'; import 'package:hub/components/templates_components/details_component/details_component_widget.dart'; -import 'package:hub/components/templates_components/visit_details_modal_template_component/visit_details_modal_template_component_widget.dart'; import 'package:hub/components/templates_components/visitor_search_modal_template_component/visitor_search_modal_template_component_widget.dart'; import 'package:hub/flutter_flow/custom_functions.dart'; import 'package:hub/flutter_flow/flutter_flow_drop_down.dart'; import 'package:hub/flutter_flow/flutter_flow_icon_button.dart'; -import 'package:hub/flutter_flow/flutter_flow_model.dart'; import 'package:hub/flutter_flow/flutter_flow_theme.dart'; import 'package:hub/flutter_flow/flutter_flow_util.dart'; import 'package:hub/flutter_flow/flutter_flow_widgets.dart'; @@ -1435,12 +1428,11 @@ Widget scheduleVisit(BuildContext context, ), ), ), - Switch.adaptive( + Switch( value: _model.switchValue!, onChanged: (newValue) async { safeSetState(() => _model.switchValue = newValue); }, - applyCupertinoTheme: false, focusColor: FlutterFlowTheme.of(context).primary, trackColor: WidgetStateProperty.resolveWith( (states) {