jantunesmessias
/
flutter-freaccess-hub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94 from FRE-Informatica/feat/fd-1135 

FIX/FD-1135 - labels de venciment nas consultas Agendamento Provisório e Visita Com…
This commit is contained in:
Ivan Antunes 2025-01-30 11:09:36 -03:00 committed by GitHub
parent 4488253f6d 19b4e655df
commit f736735d22
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/features/history/presentation/pages/provisional_history_page.dart
View File

@ -1,4 +1,5 @@
import 'dart:async'; import 'dart:async';
import 'dart:developer';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_spinkit/flutter_spinkit.dart'; import 'package:flutter_spinkit/flutter_spinkit.dart';
@ -364,8 +365,8 @@ class ProvisionalHistoryState extends State<ProvisionalHistoryPage> {
enText: 'Name:', enText: 'Name:',
): historyItem['AGP_NOME'] ?? '', ): historyItem['AGP_NOME'] ?? '',
FFLocalizations.of(context).getVariableText( FFLocalizations.of(context).getVariableText(
ptText: 'Data:', ptText: 'Vencimento',
enText: 'Data:', enText: 'Expiration',
): formatDate(historyItem['AGP_DT_VISITA']), ): formatDate(historyItem['AGP_DT_VISITA']),
FFLocalizations.of(context).getVariableText( FFLocalizations.of(context).getVariableText(
ptText: 'Observação:', ptText: 'Observação:',
@ -398,14 +399,29 @@ class ProvisionalHistoryState extends State<ProvisionalHistoryPage> {
enText: 'Visitor', enText: 'Visitor',
): FlutterFlowTheme.of(context).alternate2, ): FlutterFlowTheme.of(context).alternate2,
}, },
_getStatusMap(context, historyItem['AGP_STATUS']) _getStatusMap(context, historyItem)
]; ];
} }
Map<String, Color> _getStatusMap(BuildContext context, String status) { Map<String, Color> _getStatusMap(BuildContext context, dynamic json) {
switch (status) { late Map<String, Color> statusColorMap;
log(DateTime.parse(json['AGP_DT_VISITA']).toString());
log(DateTime.now().toString());
final DateTime now = DateTime.now();
final DateTime date = DateTime.parse(json['AGP_DT_VISITA']);
final bool isExpired = now.isAfter(date);
final String statusMap = json['AGP_STATUS'];
switch (statusMap) {
case 'AT': case 'AT':
return { return isExpired
? {
FFLocalizations.of(context).getVariableText(
ptText: 'Vencido',
enText: 'Expired',
): FlutterFlowTheme.of(context).error,
}
: {
FFLocalizations.of(context).getVariableText( FFLocalizations.of(context).getVariableText(
ptText: 'Ativo', ptText: 'Ativo',
enText: 'Active', enText: 'Active',

13
lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart
View File

@ -1,3 +1,5 @@
import 'dart:developer';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hub/components/templates_components/card_item_template_component/card_item_template_component_widget.dart'; import 'package:hub/components/templates_components/card_item_template_component/card_item_template_component_widget.dart';
import 'package:hub/features/backend/index.dart'; import 'package:hub/features/backend/index.dart';
@ -196,6 +198,8 @@ class _VisitHistoryWidgetState extends State<VisitHistoryWidget>
} }
Widget _item(BuildContext context, dynamic visitaWrapItem) { Widget _item(BuildContext context, dynamic visitaWrapItem) {
log(DateTime.now().toString());
log(visitaWrapItem['VAW_DTFIM'].toString());
return CardItemTemplateComponentWidget( return CardItemTemplateComponentWidget(
imagePath: imagePath:
'https://freaccess.com.br/freaccess/getImage.php?devUUID=$devUUID&userUUID=$userUUID&cliID=$cliUUID&atividade=getFoto&Documento=${visitaWrapItem['VTE_DOCUMENTO'] ?? ''}&tipo=E', 'https://freaccess.com.br/freaccess/getImage.php?devUUID=$devUUID&userUUID=$userUUID&cliID=$cliUUID&atividade=getFoto&Documento=${visitaWrapItem['VTE_DOCUMENTO'] ?? ''}&tipo=E',
@ -218,6 +222,15 @@ class _VisitHistoryWidgetState extends State<VisitHistoryWidget>
statusHashMap: [ statusHashMap: [
if (Status.getStatus(visitaWrapItem['VAW_STATUS']) == StatusEnum.active) if (Status.getStatus(visitaWrapItem['VAW_STATUS']) == StatusEnum.active)
{ {
if (visitaWrapItem['VAW_DTFIM'] != '' &&
visitaWrapItem['VAW_DTFIM'] != null)
if (DateTime.now().isAfter(
DateTime.parse(visitaWrapItem['VAW_DTFIM'] as String)))
FFLocalizations.of(context).getVariableText(
ptText: 'Vencido',
enText: 'Expired',
): FlutterFlowTheme.of(context).error
else
FFLocalizations.of(context).getVariableText( FFLocalizations.of(context).getVariableText(
ptText: 'Ativo', ptText: 'Ativo',
enText: 'Active', enText: 'Active',