From 23e1fed349494a28a93390556bae7b48b40fe37d Mon Sep 17 00:00:00 2001
From: Elham Rababh <elham.a.rababah@gmail.com>
Date: Sun, 16 Jan 2022 10:55:40 +0200
Subject: [PATCH] fix issues

---
 lib/screens/procedures/ProcedureCard.dart | 4 ++--
 lib/util/date-utils.dart                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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() +
           " " +