diff --git a/lib/screens/procedures/ProcedureCard.dart b/lib/screens/procedures/ProcedureCard.dart index d89150da..cb59885d 100644 --- a/lib/screens/procedures/ProcedureCard.dart +++ b/lib/screens/procedures/ProcedureCard.dart @@ -213,8 +213,8 @@ class ProcedureCard extends StatelessWidget { children: [ Expanded( child: AppText( - Helpers.convertToTitleCase( - entityList.remarks.toString()) ?? + entityList.remarks!= null?Helpers.convertToTitleCase( + entityList.remarks.toString()) : '', fontSize: 12, ), diff --git a/lib/util/date-utils.dart b/lib/util/date-utils.dart index 7c68d649..282b73b9 100644 --- a/lib/util/date-utils.dart +++ b/lib/util/date-utils.dart @@ -301,7 +301,7 @@ class AppDateUtils { /// get data formatted like 26 Apr 2020 /// [dateTime] convert DateTime to data formatted static String getDayMonthYearDateFormatted(DateTime dateTime, - {bool isArabic = false, bool isMonthShort = false}) { + {bool isArabic = false, bool isMonthShort = true}) { if (dateTime != null) return dateTime.day.toString() + " " +