fix rebase

This commit is contained in:
jantunesmesias 2024-08-21 11:24:55 -03:00
parent 4c3f0dd014
commit a15ef73061
8 changed files with 80 additions and 160 deletions

View File

@ -416,9 +416,8 @@ Future<bool> checkLocals({
}
}
Future<String> answersRequest(BuildContext context, String? ref, String? task,
Future answersRequest(BuildContext context, String? ref, String? task,
String? response, String? id) async {
try {
ApiCallResponse? respondeSolicitacaoCall;
respondeSolicitacaoCall = await PhpGroup.respondeSolicitacaoCall.call(
@ -431,32 +430,11 @@ Future<String> answersRequest(BuildContext context, String? ref, String? task,
resposta: response,
idVisitante: id,
);
respondeSolicitacaoCall = await PhpGroup.respondeSolicitacaoCall.call(
userUUID: FFAppState().userUUID,
devUUID: FFAppState().devUUID,
cliUUID: FFAppState().cliUUID,
atividade: 'respondeSolicitacao',
referencia: ref,
tarefa: task,
resposta: response,
idVisitante: id,
);
if (respondeSolicitacaoCall.statusCode == 200) {
if (!respondeSolicitacaoCall.jsonBody['error']) {
return '';
return !respondeSolicitacaoCall.jsonBody['error'];
} else {
return respondeSolicitacaoCall.jsonBody['error_msg'].toString();
}
} else {
return FFLocalizations.of(context).getVariableText(
ptText: 'Falha ao Responder Solicitação',
enText: 'Failed to Response Request');
}
} catch (e, s) {
return FFLocalizations.of(context).getVariableText(
ptText: 'Falha ao Responder Solicitação',
enText: 'Failed to Response Request');
return false;
}
}

View File

@ -111,8 +111,8 @@ class _AccessNotificationModalTemplateComponentWidgetState
fadeOutDuration: const Duration(milliseconds: 100),
imageUrl: valueOrDefault<String>(
// widget.type == 'O'
// ? 'https://freaccess.com.br/freaccess/getImage.php?cliID=${FFAppState().cliUUID}&atividade=getFoto&Documento=${widget.id}&tipo=O'
// : 'https://freaccess.com.br/freaccess/getImage.php?cliID=${FFAppState().cliUUID}&atividade=getFoto&Documento=${widget.id}&tipo=E',
// ? 'https://freaccess.com.br/freaccess/getImage.php?cliID=${AppState().cliUUID}&atividade=getFoto&Documento=${widget.id}&tipo=O'
// : 'https://freaccess.com.br/freaccess/getImage.php?cliID=${AppState().cliUUID}&atividade=getFoto&Documento=${widget.id}&tipo=E',
'https://freaccess.com.br/freaccess/getImage.php?cliID=${AppState().cliUUID}&atividade=getFoto&Documento=${widget.id}&tipo=${widget.type}',
'https://storage.googleapis.com/flutterflow-io-6f20.appspot.com/projects/flutter-freaccess-hub-0xgz9q/assets/7ftdetkzc3s0/360_F_64676383_LdbmhiNM6Ypzb3FM4PPuFP9rHe7ri8Ju.jpg',
),

View File

@ -1,7 +1,4 @@
import 'dart:developer';
import 'package:flutter/material.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';
@ -12,7 +9,6 @@ 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';
import 'package:hub/flutter_flow/nav/nav.dart';
import 'package:hub/pages/liberation_history/liberation_history_model.dart';
import 'package:hub/shared/utils/dialog_util.dart';
import 'package:hub/shared/utils/log_util.dart';
import 'package:hub/shared/utils/validator_util.dart';
@ -51,7 +47,7 @@ class _LiberationHistoryWidgetState extends State<LiberationHistoryWidget> {
}
String _imagePath(dynamic request) {
return 'https://freaccess.com.br/freaccess/getImage.php?cliID=${FFAppState().cliUUID}&atividade=getFoto&Documento=${request['VTE_ID'] ?? ''}&tipo=E';
return 'https://freaccess.com.br/freaccess/getImage.php?cliID=${AppState().cliUUID}&atividade=getFoto&Documento=${request['VTE_ID'] ?? ''}&tipo=E';
}
Map<String, String> _labelsHashMap(dynamic request, bool details) {
@ -90,7 +86,7 @@ class _LiberationHistoryWidgetState extends State<LiberationHistoryWidget> {
@override
Widget build(BuildContext context) {
context.watch<FFAppState>();
context.watch<AppState>();
return Scaffold(
key: scaffoldKey,
backgroundColor: FlutterFlowTheme.of(context).primaryBackground,
@ -311,43 +307,44 @@ class _LiberationHistoryWidgetState extends State<LiberationHistoryWidget> {
);
},
).then((_) {
PushNotificationManager _pushNotificationService =
PushNotificationManager();
() {}();
// PushNotificationManager _pushNotificationService =
// PushNotificationManager();
_pushNotificationService.onMessageReceived.listen((received) {
if (received.data['click_action'] == 'cancel_request') {
_pushNotificationService.dispose();
showSnackbar(
context,
FFLocalizations.of(context).getVariableText(
enText: 'Successfully resolved visit',
ptText: 'Visita resolvida com sucesso'),
false);
context.pushReplacementNamed(
'liberationHistory',
extra: <String, dynamic>{
kTransitionInfoKey: const TransitionInfo(
hasTransition: true,
transitionType: PageTransitionType.scale,
alignment: Alignment.bottomCenter,
),
},
);
}
});
}).whenComplete(() {
safeSetState(() {
_requestWrap = [];
_requestFuture = _fetchRequests();
});
}).catchError((e, s) {
DialogUtil.errorDefault(context);
LogUtil.requestAPIFailed(
"proccessRequest.php", "", "Consulta de Solitiações", e, s);
safeSetState(() {
_hasData = false;
_loading = false;
});
// _pushNotificationService.onMessageReceived.listen((received) {
// if (received.data['click_action'] == 'cancel_request') {
// _pushNotificationService.dispose();
// showSnackbar(
// context,
// FFLocalizations.of(context).getVariableText(
// enText: 'Successfully resolved visit',
// ptText: 'Visita resolvida com sucesso'),
// false);
// context.pushReplacementNamed(
// 'liberationHistory',
// extra: <String, dynamic>{
// kTransitionInfoKey: const TransitionInfo(
// hasTransition: true,
// transitionType: PageTransitionType.scale,
// alignment: Alignment.bottomCenter,
// ),
// },
// );
// }
// });
// }).whenComplete(() {
// safeSetState(() {
// _requestWrap = [];
// _requestFuture = _fetchRequests();
// });
// }).catchError((e, s) {
// DialogUtil.errorDefault(context);
// LogUtil.requestAPIFailed(
// "proccessRequest.php", "", "Consulta de Solitiações", e, s);
// safeSetState(() {
// _hasData = false;
// _loading = false;
// });
});
},
);
@ -358,9 +355,9 @@ class _LiberationHistoryWidgetState extends State<LiberationHistoryWidget> {
setState(() => _loading = true);
var response = await PhpGroup.getLiberationsCall
.call(
devUUID: FFAppState().devUUID,
userUUID: FFAppState().userUUID,
cliID: FFAppState().cliUUID,
devUUID: AppState().devUUID,
userUUID: AppState().userUUID,
cliID: AppState().cliUUID,
atividade: 'getSolicitacoes',
)
.first;

View File

@ -16,10 +16,10 @@ class PreferencesPageModel with ChangeNotifier {
final unfocusNode = FocusNode();
Future<void> toggleFingerprint(BuildContext context) async {
// FFAppState().checkBiometrics()
// .then((value) => FFAppState().authenticateBiometric()
// AppState().checkBiometrics()
// .then((value) => AppState().authenticateBiometric()
// .then( (value) {
// FFAppState().fingerprint = !FFAppState().fingerprint;
// AppState().fingerprint = !AppState().fingerprint;
// })
// .whenComplete(() => notifyListeners()));
@ -550,9 +550,9 @@ class PreferencesPageModel with ChangeNotifier {
}
Future<void> togglePass(BuildContext context) async {
// if (FFAppState().pass) {
// FFAppState().pass = false;
// FFAppState().deleteAccessPass();
// if (AppState().pass) {
// AppState().pass = false;
// AppState().deleteAccessPass();
// notifyListeners();
// } else {
await showModalBottomSheet(
@ -614,10 +614,10 @@ class PreferencesPageModel with ChangeNotifier {
),
),
);
// FFAppState().pass = false;
// AppState().pass = false;
}
}).catchError((error, StackTrace) {
// FFAppState().pass = false;
// AppState().pass = false;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
@ -704,10 +704,10 @@ class PreferencesPageModel with ChangeNotifier {
),
),
);
// FFAppState().panic = false;
// AppState().panic = false;
}
}).catchError((e, s) {
// FFAppState().panic = false;
// AppState().panic = false;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(

View File

@ -980,16 +980,16 @@ class _ScheduleProvisionalVisitPageWidgetState
_model.provVisitSchedule = await PhpGroup
.postProvVisitSchedulingCall
.call(
devUUID: FFAppState().devUUID,
userUUID: FFAppState().userUUID,
cliID: FFAppState().cliUUID,
devUUID: AppState().devUUID,
userUUID: AppState().userUUID,
cliID: AppState().cliUUID,
atividade: 'putAgendamentoProv',
data:
_model.dateTimeTextController.text,
motivo: _model.notesTextController.text,
nome: _model
.personNameTextController.text,
proID: FFAppState().ownerUUID,
proID: AppState().ownerUUID,
);
if (PhpGroup.postProvVisitSchedulingCall

View File

@ -168,7 +168,7 @@ class _VisitHistoryWidgetState extends State<VisitHistoryWidget>
Widget _item(BuildContext context, dynamic visitaWrapItem) {
return CardItemTemplateComponentWidget(
imagePath:
'https://freaccess.com.br/freaccess/getImage.php?devUUID=${FFAppState().devUUID}&userUUID=${FFAppState().userUUID}&cliID=${FFAppState().cliUUID}&atividade=getFoto&Documento=${visitaWrapItem['VTE_DOCUMENTO'] ?? ''}&tipo=E',
'https://freaccess.com.br/freaccess/getImage.php?devUUID=${AppState().devUUID}&userUUID=${AppState().userUUID}&cliID=${AppState().cliUUID}&atividade=getFoto&Documento=${visitaWrapItem['VTE_DOCUMENTO'] ?? ''}&tipo=E',
labelsHashMap: {
'${FFLocalizations.of(context).getVariableText(ptText: "Nome", enText: "Name")}:':
visitaWrapItem['VTE_NOME'] ?? '',

View File

@ -174,11 +174,9 @@ packages:
description:
name: cross_file
sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670"
sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670"
url: "https://pub.dev"
source: hosted
version: "0.3.4+2"
version: "0.3.4+2"
crypto:
dependency: transitive
description:
@ -232,11 +230,9 @@ packages:
description:
name: device_info_plus_platform_interface
sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba"
sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba"
url: "https://pub.dev"
source: hosted
version: "7.0.1"
version: "7.0.1"
dropdown_button2:
dependency: "direct main"
description:
@ -274,11 +270,9 @@ packages:
description:
name: ffi
sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
url: "https://pub.dev"
source: hosted
version: "2.1.3"
version: "2.1.3"
file:
dependency: transitive
description:
@ -324,11 +318,9 @@ packages:
description:
name: file_selector_windows
sha256: "2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69"
sha256: "2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69"
url: "https://pub.dev"
source: hosted
version: "0.9.3+2"
version: "0.9.3+2"
firebase_analytics:
dependency: "direct main"
description:
@ -366,21 +358,17 @@ packages:
description:
name: firebase_core_platform_interface
sha256: "3c3a1e92d6f4916c32deea79c4a7587aa0e9dbbe5889c7a16afcf005a485ee02"
sha256: "3c3a1e92d6f4916c32deea79c4a7587aa0e9dbbe5889c7a16afcf005a485ee02"
url: "https://pub.dev"
source: hosted
version: "5.2.0"
version: "5.2.0"
firebase_core_web:
dependency: transitive
description:
name: firebase_core_web
sha256: e8d1e22de72cb21cdcfc5eed7acddab3e99cd83f3b317f54f7a96c32f25fd11e
sha256: e8d1e22de72cb21cdcfc5eed7acddab3e99cd83f3b317f54f7a96c32f25fd11e
url: "https://pub.dev"
source: hosted
version: "2.17.4"
version: "2.17.4"
firebase_crashlytics:
dependency: "direct main"
description:
@ -463,11 +451,9 @@ packages:
description:
name: flutter_expandable_fab
sha256: f4692d1949cda81e10ca0c3e75aea1e14e29ecc12d9328996321b96e9747a955
sha256: f4692d1949cda81e10ca0c3e75aea1e14e29ecc12d9328996321b96e9747a955
url: "https://pub.dev"
source: hosted
version: "2.2.0"
version: "2.2.0"
flutter_inappwebview:
dependency: "direct main"
description:
@ -832,21 +818,17 @@ packages:
description:
name: leak_tracker
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
url: "https://pub.dev"
source: hosted
version: "10.0.5"
version: "10.0.5"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
url: "https://pub.dev"
source: hosted
version: "3.0.5"
version: "3.0.5"
leak_tracker_testing:
dependency: transitive
description:
@ -868,31 +850,25 @@ packages:
description:
name: local_auth
sha256: "434d854cf478f17f12ab29a76a02b3067f86a63a6d6c4eb8fbfdcfe4879c1b7b"
sha256: "434d854cf478f17f12ab29a76a02b3067f86a63a6d6c4eb8fbfdcfe4879c1b7b"
url: "https://pub.dev"
source: hosted
version: "2.3.0"
version: "2.3.0"
local_auth_android:
dependency: transitive
description:
name: local_auth_android
sha256: e99c44ca0bce08f26f25e2a2e07d3b443d69986e1c3acf67c1449f7d847e3625
sha256: e99c44ca0bce08f26f25e2a2e07d3b443d69986e1c3acf67c1449f7d847e3625
url: "https://pub.dev"
source: hosted
version: "1.0.43"
version: "1.0.43"
local_auth_darwin:
dependency: transitive
description:
name: local_auth_darwin
sha256: "7ba5738c874ca2b910d72385d00d2bebad9d4e807612936cf5e32bc01a048c71"
sha256: "7ba5738c874ca2b910d72385d00d2bebad9d4e807612936cf5e32bc01a048c71"
url: "https://pub.dev"
source: hosted
version: "1.4.0"
version: "1.4.0"
local_auth_platform_interface:
dependency: transitive
description:
@ -906,11 +882,9 @@ packages:
description:
name: local_auth_windows
sha256: bc4e66a29b0fdf751aafbec923b5bed7ad6ed3614875d8151afe2578520b2ab5
sha256: bc4e66a29b0fdf751aafbec923b5bed7ad6ed3614875d8151afe2578520b2ab5
url: "https://pub.dev"
source: hosted
version: "1.0.11"
version: "1.0.11"
logging:
dependency: transitive
description:
@ -932,11 +906,9 @@ packages:
description:
name: material_color_utilities
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
url: "https://pub.dev"
source: hosted
version: "0.11.1"
version: "0.11.1"
maybe_just_nothing:
dependency: transitive
description:
@ -950,11 +922,9 @@ packages:
description:
name: meta
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
url: "https://pub.dev"
source: hosted
version: "1.15.0"
version: "1.15.0"
mime:
dependency: transitive
description:
@ -992,11 +962,9 @@ packages:
description:
name: octo_image
sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd"
sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.0"
page_transition:
dependency: "direct main"
description:
@ -1066,11 +1034,9 @@ packages:
description:
name: path_provider_windows
sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
url: "https://pub.dev"
source: hosted
version: "2.3.0"
version: "2.3.0"
percent_indicator:
dependency: "direct main"
description:
@ -1107,20 +1073,18 @@ packages:
dependency: transitive
description:
name: permission_handler_html
sha256: d220eb8476b466d58b161e10b3001d93999010a26228a3fb89c4280db1249546
sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851
url: "https://pub.dev"
source: hosted
version: "0.1.3+1"
version: "0.1.3+2"
permission_handler_platform_interface:
dependency: transitive
description:
name: permission_handler_platform_interface
sha256: fe0ffe274d665be8e34f9c59705441a7d248edebbe5d9e3ec2665f88b79358ea
sha256: fe0ffe274d665be8e34f9c59705441a7d248edebbe5d9e3ec2665f88b79358ea
url: "https://pub.dev"
source: hosted
version: "4.2.2"
version: "4.2.2"
permission_handler_windows:
dependency: transitive
description:
@ -1174,11 +1138,9 @@ packages:
description:
name: qr
sha256: "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445"
sha256: "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445"
url: "https://pub.dev"
source: hosted
version: "3.0.2"
version: "3.0.2"
qr_flutter:
dependency: "direct main"
description:
@ -1381,11 +1343,9 @@ packages:
description:
name: test_api
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
url: "https://pub.dev"
source: hosted
version: "0.7.2"
version: "0.7.2"
timeago:
dependency: "direct main"
description:
@ -1431,11 +1391,9 @@ packages:
description:
name: url_launcher_linux
sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af
sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af
url: "https://pub.dev"
source: hosted
version: "3.2.0"
version: "3.2.0"
url_launcher_macos:
dependency: transitive
description:
@ -1457,31 +1415,25 @@ packages:
description:
name: url_launcher_web
sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e"
sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e"
url: "https://pub.dev"
source: hosted
version: "2.3.3"
version: "2.3.3"
url_launcher_windows:
dependency: transitive
description:
name: url_launcher_windows
sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185"
sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185"
url: "https://pub.dev"
source: hosted
version: "3.1.2"
version: "3.1.2"
uuid:
dependency: "direct overridden"
description:
name: uuid
sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90"
sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90"
url: "https://pub.dev"
source: hosted
version: "4.4.2"
version: "4.4.2"
vector_graphics:
dependency: transitive
description:
@ -1559,11 +1511,9 @@ packages:
description:
name: vm_service
sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
url: "https://pub.dev"
source: hosted
version: "14.2.4"
version: "14.2.4"
web:
dependency: transitive
description:
@ -1576,20 +1526,18 @@ packages:
dependency: "direct main"
description:
name: webview_flutter
sha256: "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522"
sha256: ec81f57aa1611f8ebecf1d2259da4ef052281cb5ad624131c93546c79ccc7736
url: "https://pub.dev"
source: hosted
version: "4.8.0"
version: "4.9.0"
webview_flutter_android:
dependency: transitive
description:
name: webview_flutter_android
sha256: c66651fba15f9d7ddd31daec42da8d6bce46c85610a7127e3ebcb39a4395c3c9
sha256: c66651fba15f9d7ddd31daec42da8d6bce46c85610a7127e3ebcb39a4395c3c9
url: "https://pub.dev"
source: hosted
version: "3.16.6"
version: "3.16.6"
webview_flutter_platform_interface:
dependency: transitive
description:
@ -1619,11 +1567,9 @@ packages:
description:
name: win32_registry
sha256: "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6"
sha256: "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6"
url: "https://pub.dev"
source: hosted
version: "1.1.4"
version: "1.1.4"
xdg_directories:
dependency: transitive
description:

View File

@ -3,8 +3,6 @@ description: A new Flutter project.
publish_to: "none"
publish_to: "none"
version: 1.0.0+3
environment:
@ -88,6 +86,7 @@ dependencies:
video_player_avfoundation: 2.6.1
video_player_platform_interface: 6.2.2
video_player_web: 2.3.1
fluttertoast: ^8.2.8
cupertino_icons: ^1.0.0
flutter_bloc: ^8.1.6