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

Merge branch 'feat/fd-1023' into feat/fd-1035

This commit is contained in:
J. A. Messias 2024-12-11 15:33:39 -03:00
parent 3c304d660f 3fde185978
commit d560f09338
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/components/templates_components/card_item_template_component/card_item_template_component_widget.dart
View File

@ -79,7 +79,7 @@ class _CardItemTemplateComponentWidgetState extends State<CardItemTemplateCompon
Expanded( Expanded(
child: Text( child: Text(
text, text,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.fade,
style: FlutterFlowTheme.of(context).bodyMedium.override( style: FlutterFlowTheme.of(context).bodyMedium.override(
fontFamily: FlutterFlowTheme.of(context).bodyMediumFamily, fontFamily: FlutterFlowTheme.of(context).bodyMediumFamily,
fontSize: limitedBodyTextSize, fontSize: limitedBodyTextSize,
@ -171,10 +171,7 @@ class _CardItemTemplateComponentWidgetState extends State<CardItemTemplateCompon
runSpacing: 4, runSpacing: 4,
children: _generateStatus(), children: _generateStatus(),
), ),
] ].addToEnd(const SizedBox(height: 5)).divide(const SizedBox(height: 1)).addToStart(const SizedBox(height: 5)),
.addToEnd(const SizedBox(height: 5))
.divide(const SizedBox(height: 1))
.addToStart(const SizedBox(height: 5)),
), ),
), ),
if (widget.imagePath != null) _generateImage(), if (widget.imagePath != null) _generateImage(),

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

@ -347,10 +347,29 @@ class ProvisionalHistoryState extends State<ProvisionalHistoryPage> {
FFLocalizations.of(context).getVariableText( FFLocalizations.of(context).getVariableText(
ptText: 'Data:', ptText: 'Data:',
enText: '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<Map<String, Color>> _buildStatusHashMap(BuildContext context, dynamic historyItem) { List<Map<String, Color>> _buildStatusHashMap(BuildContext context, dynamic historyItem) {
return [ return [
{ {
@ -377,7 +396,7 @@ class ProvisionalHistoryState extends State<ProvisionalHistoryPage> {
FFLocalizations.of(context).getVariableText( FFLocalizations.of(context).getVariableText(
ptText: 'Convidado', ptText: 'Convidado',
enText: 'Called', enText: 'Called',
): FlutterFlowTheme.of(context).alternate2, ): Colors.blue,
}; };
case 'IN': case 'IN':
return { return {

2
lib/features/history/presentation/widgets/provisional_filter_modal.dart
View File

@ -161,7 +161,7 @@ class _FilterWidgetState extends State<FilterWidget> {
return Center( return Center(
child: Container( child: Container(
width: screenWidth - (screenWidth * 0.35), width: screenWidth - (screenWidth * 0.35),
height: screenWidth - (screenWidth * 0.25), height: screenWidth,
decoration: BoxDecoration( decoration: BoxDecoration(
color: FlutterFlowTheme.of(context).primaryBackground, color: FlutterFlowTheme.of(context).primaryBackground,
borderRadius: BorderRadius.circular(24.0), borderRadius: BorderRadius.circular(24.0),