Merge pull request #58 from FRE-Informatica/fix/fd-942

FIX/FD-942: Visita Provisória cadastrada como inativa
This commit is contained in:
DanielYukio 2024-11-05 10:25:09 -03:00 committed by GitHub
commit 7905b33ac9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 35 additions and 40 deletions

View File

@ -1 +0,0 @@

View File

@ -1,3 +1,5 @@
import 'dart:developer';
import 'package:flutter/material.dart';
import 'package:hub/backend/api_requests/api_manager.dart';
import 'package:hub/components/templates_components/provisional_schedule_template/provisional_shcedule_template_widget.dart';
@ -34,15 +36,11 @@ class ScheduleProvisionalVisitPageModel extends FlutterFlowModel<ScheduleProvisi
String? Function(BuildContext, String?)? personNameTextControllerValidator;
String? _personNameTextControllerValidator(BuildContext context, String? val) {
if (val == null || val.isEmpty) {
return FFLocalizations.of(context).getText(
'3hqg8buh',
);
return FFLocalizations.of(context).getText('3hqg8buh');
}
if (val.length > 80) {
return FFLocalizations.of(context).getText(
'l0b0zr50',
);
return FFLocalizations.of(context).getText('l0b0zr50');
}
return null;
@ -55,27 +53,24 @@ class ScheduleProvisionalVisitPageModel extends FlutterFlowModel<ScheduleProvisi
if (val == null || val.isEmpty) {
return FFLocalizations.of(context).getText('uzefkuf9');
}
DateTime selectedDateTime;
DateTime currentDateTime = DateTime.now();
selectedDateTime = DateFormat('dd/MM/yyyy HH:mm:ss').parse(val);
DateTime currentDateTime = DateTime.now().add(const Duration(minutes: 59));
selectedDateTime = DateFormat('dd/MM/yyyy HH:mm:ss').parse(dateTimeTextController.text);
try {
selectedDateTime = DateFormat('dd/MM/yyyy HH:mm:ss').parse(val);
log('dateTimeTextController.text: ${dateTimeTextController.text}');
selectedDateTime = DateFormat('dd/MM/yyyy HH:mm:ss').parse(dateTimeTextController.text);
} catch (e) {
return FFLocalizations.of(context).getVariableText(
ptText: 'Formato de data/hora inválido',
enText: 'Invalid date/time format',
ptText: 'Formato de data inválido',
enText: 'Invalid date format',
);
}
if (selectedDateTime.isBefore(currentDateTime)) {
return FFLocalizations.of(context).getVariableText(
ptText: 'A data/hora selecionada é inválida',
enText: 'The selected date/time is invalid',
ptText: 'A data devem ser, no mínimo, uma (1) hora à frente.',
enText: 'The date must be at least one (1) hour ahead.',
);
}
return null;
}
@ -93,7 +88,8 @@ class ScheduleProvisionalVisitPageModel extends FlutterFlowModel<ScheduleProvisi
personNameTextController ??= TextEditingController();
personNameFocusNode ??= FocusNode();
dateTimeTextController ??= TextEditingController();
dateTimeTextController ??= TextEditingController(
text: DateFormat('dd/MM/yyyy HH:mm:ss').format(DateTime.now().add(const Duration(days: 1))));
dateTimeFocusNode ??= FocusNode();
notesTextController ??= TextEditingController();
@ -102,6 +98,18 @@ class ScheduleProvisionalVisitPageModel extends FlutterFlowModel<ScheduleProvisi
init();
}
@override
void dispose() {
personNameFocusNode?.dispose();
personNameTextController?.dispose();
dateTimeFocusNode?.dispose();
dateTimeTextController?.dispose();
notesFocusNode?.dispose();
notesTextController?.dispose();
}
bool isFormValid() {
if (personNameTextController.text == '' || personNameTextController.text.length > 80) {
return false;
@ -112,7 +120,7 @@ class ScheduleProvisionalVisitPageModel extends FlutterFlowModel<ScheduleProvisi
}
DateTime selectedDateTime;
DateTime currentDateTime = DateTime.now();
DateTime currentDateTime = DateTime.now().add(const Duration(minutes: 59));
selectedDateTime = DateFormat('dd/MM/yyyy HH:mm:ss').parse(dateTimeTextController.text);
try {
@ -136,16 +144,4 @@ class ScheduleProvisionalVisitPageModel extends FlutterFlowModel<ScheduleProvisi
ownerUUID = StorageUtil().ownerUUID;
setState?.call();
}
@override
void dispose() {
personNameFocusNode?.dispose();
personNameTextController?.dispose();
dateTimeFocusNode?.dispose();
dateTimeTextController?.dispose();
notesFocusNode?.dispose();
notesTextController?.dispose();
}
}

View File

@ -291,7 +291,10 @@ class _ScheduleProvisionalVisitPageWidgetState extends State<ScheduleProvisional
obscureText: false,
decoration: InputDecoration(
isDense: true,
labelText: FFLocalizations.of(context).getText('8zgsw5so'),
labelText: FFLocalizations.of(context).getVariableText(
ptText: "Data de Validade da Visita",
enText: "Visit Validity Date",
),
labelStyle: FlutterFlowTheme.of(context).bodyMedium.override(
fontFamily: FlutterFlowTheme.of(context).bodyMediumFamily,
letterSpacing: 0.0,
@ -434,7 +437,7 @@ class _ScheduleProvisionalVisitPageWidgetState extends State<ScheduleProvisional
});
}
setState(() {
model.datePicked = model.datePicked?.add(const Duration(hours: 3));
model.datePicked = model.datePicked;
model.dateTimeTextController?.text = dateTimeFormat(
"dd/MM/yyyy HH:mm:ss",
model.datePicked,
@ -562,9 +565,9 @@ class _ScheduleProvisionalVisitPageWidgetState extends State<ScheduleProvisional
onPressed: !model.isFormValid()
? null
: () async {
try {
try {
model.provVisitSchedule = await PhpGroup.postProvVisitSchedulingCall.call(
data: model.dateTimeTextController.text,
data: DateFormat('dd/MM/yyyy HH:mm:ss').format(DateFormat('dd/MM/yyyy HH:mm:ss').parse(model.dateTimeTextController.text).add(const Duration(hours: 3))),
motivo: model.notesTextController.text,
nome: model.personNameTextController.text,
proID: model.ownerUUID,
@ -595,8 +598,7 @@ class _ScheduleProvisionalVisitPageWidgetState extends State<ScheduleProvisional
setState(() {});
} catch (e, s) {
DialogUtil.errorDefault(context);
LogUtil.requestAPIFailed(
"processRequest.php", "", "Cadastrar Visita Provisória", e, s);
LogUtil.requestAPIFailed("processRequest.php", "", "Cadastrar Visita Provisória", e, s);
}
},
showLoadingIndicator: true,

View File

@ -24,7 +24,6 @@ export 'dart:typed_data' show Uint8List;
export 'package:intl/intl.dart';
export 'package:page_transition/page_transition.dart';
export '/app_state.dart';
export 'custom_icons.dart' show FFIcons;
export 'flutter_flow_model.dart';
export 'internationalization.dart' show FFLocalizations;

View File

@ -36,7 +36,6 @@ Future<void> initializeApp() async {
WidgetsFlutterBinding.ensureInitialized();
await _initializeTracking();
await _initializeStorageHelpers();
await _initializeFirebase();
await _initializeNotificationService();
_initializeUrlStrategy();