diff --git a/lib/components/templates_components/card_item_template_component/card_item_template_component_widget.dart b/lib/components/templates_components/card_item_template_component/card_item_template_component_widget.dart index f93d6d8a..9cba811c 100644 --- a/lib/components/templates_components/card_item_template_component/card_item_template_component_widget.dart +++ b/lib/components/templates_components/card_item_template_component/card_item_template_component_widget.dart @@ -79,7 +79,7 @@ class _CardItemTemplateComponentWidgetState extends State { FFLocalizations.of(context).getVariableText( ptText: 'Data:', enText: 'Data:', - ): historyItem['AGP_DT_VISITA'] ?? '', + ): formatDate(historyItem['AGP_DT_VISITA']), + FFLocalizations.of(context).getVariableText( + ptText: 'Observação:', + enText: 'Observation:', + ): formatObs(historyItem['AGP_OBSERVACAO']), }; } + String formatObs(String? obs) { + if (obs == null || obs.isEmpty) { + return FFLocalizations.of(context).getVariableText( + ptText: 'Observação não informada', + enText: 'No observation provided', + ); + } + return obs; + } + + String formatDate(String dateString) { + DateTime dateTime = DateTime.parse(dateString); + return "${dateTime.day.toString().padLeft(2, '0')}/${dateTime.month.toString().padLeft(2, '0')}/${dateTime.year} ${dateTime.hour.toString().padLeft(2, '0')}:${dateTime.minute.toString().padLeft(2, '0')}"; + } + List> _buildStatusHashMap(BuildContext context, dynamic historyItem) { return [ { @@ -377,7 +396,7 @@ class ProvisionalHistoryState extends State { FFLocalizations.of(context).getVariableText( ptText: 'Convidado', enText: 'Called', - ): FlutterFlowTheme.of(context).alternate2, + ): Colors.blue, }; case 'IN': return { diff --git a/lib/features/history/presentation/widgets/provisional_filter_modal.dart b/lib/features/history/presentation/widgets/provisional_filter_modal.dart index 2c5f8472..c06612ab 100644 --- a/lib/features/history/presentation/widgets/provisional_filter_modal.dart +++ b/lib/features/history/presentation/widgets/provisional_filter_modal.dart @@ -161,7 +161,7 @@ class _FilterWidgetState extends State { return Center( child: Container( width: screenWidth - (screenWidth * 0.35), - height: screenWidth - (screenWidth * 0.25), + height: screenWidth, decoration: BoxDecoration( color: FlutterFlowTheme.of(context).primaryBackground, borderRadius: BorderRadius.circular(24.0),