diff --git a/lib/features/history/presentation/pages/provisional_history_page.dart b/lib/features/history/presentation/pages/provisional_history_page.dart index 54ef965d..e4bfde25 100644 --- a/lib/features/history/presentation/pages/provisional_history_page.dart +++ b/lib/features/history/presentation/pages/provisional_history_page.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:developer'; import 'package:flutter/material.dart'; import 'package:flutter_spinkit/flutter_spinkit.dart'; @@ -364,8 +365,8 @@ class ProvisionalHistoryState extends State { enText: 'Name:', ): historyItem['AGP_NOME'] ?? '', FFLocalizations.of(context).getVariableText( - ptText: 'Data:', - enText: 'Data:', + ptText: 'Vencimento', + enText: 'Expiration', ): formatDate(historyItem['AGP_DT_VISITA']), FFLocalizations.of(context).getVariableText( ptText: 'Observação:', @@ -398,19 +399,34 @@ class ProvisionalHistoryState extends State { enText: 'Visitor', ): FlutterFlowTheme.of(context).alternate2, }, - _getStatusMap(context, historyItem['AGP_STATUS']) + _getStatusMap(context, historyItem) ]; } - Map _getStatusMap(BuildContext context, String status) { - switch (status) { + Map _getStatusMap(BuildContext context, dynamic json) { + late Map 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': - return { - FFLocalizations.of(context).getVariableText( - ptText: 'Ativo', - enText: 'Active', - ): FlutterFlowTheme.of(context).success, - }; + return isExpired + ? { + FFLocalizations.of(context).getVariableText( + ptText: 'Vencido', + enText: 'Expired', + ): FlutterFlowTheme.of(context).error, + } + : { + FFLocalizations.of(context).getVariableText( + ptText: 'Ativo', + enText: 'Active', + ): FlutterFlowTheme.of(context).success, + }; case 'CO': return { FFLocalizations.of(context).getVariableText( diff --git a/lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart b/lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart index bafb04bb..0c4ddaf1 100644 --- a/lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart +++ b/lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart @@ -1,3 +1,5 @@ +import 'dart:developer'; + import 'package:flutter/material.dart'; import 'package:hub/components/templates_components/card_item_template_component/card_item_template_component_widget.dart'; import 'package:hub/features/backend/index.dart'; @@ -196,6 +198,8 @@ class _VisitHistoryWidgetState extends State } Widget _item(BuildContext context, dynamic visitaWrapItem) { + log(DateTime.now().toString()); + log(visitaWrapItem['VAW_DTFIM'].toString()); return CardItemTemplateComponentWidget( imagePath: 'https://freaccess.com.br/freaccess/getImage.php?devUUID=$devUUID&userUUID=$userUUID&cliID=$cliUUID&atividade=getFoto&Documento=${visitaWrapItem['VTE_DOCUMENTO'] ?? ''}&tipo=E', @@ -218,10 +222,19 @@ class _VisitHistoryWidgetState extends State statusHashMap: [ if (Status.getStatus(visitaWrapItem['VAW_STATUS']) == StatusEnum.active) { - FFLocalizations.of(context).getVariableText( - ptText: 'Ativo', - enText: 'Active', - ): FlutterFlowTheme.of(context).warning, + 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( + ptText: 'Ativo', + enText: 'Active', + ): FlutterFlowTheme.of(context).warning, }, if (Status.getStatus(visitaWrapItem['VAW_STATUS']) == StatusEnum.finished)