diff --git a/app/Controllers/ClaimController.php b/app/Controllers/ClaimController.php
index ec465db..a90f76c 100644
--- a/app/Controllers/ClaimController.php
+++ b/app/Controllers/ClaimController.php
@@ -83,6 +83,11 @@ class ClaimController extends ResourceController
             }
 
             $data = $builder->get()->getResultArray();
+
+            foreach ($data as $key => $row) {
+                $data[$key]['created_at']  = date('d-m-Y', strtotime($row['created_at']));
+                $data[$key]['updated_at']  = date('d-m-Y', strtotime($row['updated_at']));
+            }
             
             return $this->respond(['status' => 'success', 'code' => 200, 'data' => $data], 200);
         } catch (\Exception $e) {
diff --git a/app/Controllers/EndorsementController.php b/app/Controllers/EndorsementController.php
index 67aff10..f76f6ac 100644
--- a/app/Controllers/EndorsementController.php
+++ b/app/Controllers/EndorsementController.php
@@ -79,6 +79,11 @@ class EndorsementController extends ResourceController
 
             $data = $builder->get()->getResultArray();
 
+            foreach ($data as $key => $row) {
+                $data[$key]['created_at']  = date('d-m-Y', strtotime($row['created_at']));
+                $data[$key]['updated_at']  = date('d-m-Y', strtotime($row['updated_at']));
+            }
+
             return $this->respond(['status' => 'success','code'   => 200,'data'   => $data], 200);
         } catch (\Exception $e) {
             return $this->respond(['status' => 'failed','code'   => 500,'data'   => $e->getMessage()], 500);
diff --git a/app/Controllers/EnquiryController.php b/app/Controllers/EnquiryController.php
index 1581563..0785033 100644
--- a/app/Controllers/EnquiryController.php
+++ b/app/Controllers/EnquiryController.php
@@ -72,6 +72,12 @@ class EnquiryController extends ResourceController
                 $data = $this->enquiryModel->getEnquiry('ALL');
             }
 
+
+            foreach ($data as $key => $row) {
+                $data[$key]['created_on']  = date('d-m-Y', strtotime($row['created_on']));
+                $data[$key]['updated_on']  = date('d-m-Y', strtotime($row['updated_on']));
+            }
+
             if (!empty($from_date) || empty(!$to_date)) {
                 $from_date = DateTime::createFromFormat('Y-m-d 00:00:00', $from_date)->format('d-m-Y');
                 $to_date   = DateTime::createFromFormat('Y-m-d 23:59:59', $to_date)->format('d-m-Y');
diff --git a/app/Controllers/StaffController.php b/app/Controllers/StaffController.php
index b360b77..e8516c9 100644
--- a/app/Controllers/StaffController.php
+++ b/app/Controllers/StaffController.php
@@ -318,13 +318,17 @@ class StaffController extends ResourceController
         $builder->orderBy('login_date', 'ASC');
     
         $records = $builder->get()->getResultArray();
+
+        //get Staff name
+        $staff = $this->StaffModel->where('id',$staffId)->first();
     
         // Format result
         $formatted = [];
         foreach ($records as $row) {
             $formatted[] = [
+                'name'         => $staff['name'],
                 'id'           => $row['id'],
-                'date'         => $row['first_login'] ? date('d, M Y', strtotime($row['first_login'])) : null,
+                'date'         => $row['first_login'] ? date('d-m-Y', strtotime($row['first_login'])) : null,
                 'login_time'   => $row['first_login'] ? date('h:i A', strtotime($row['first_login'])) : null,
                 'logout_time'  => $row['last_logout'] ? date('h:i A', strtotime($row['last_logout'])) : null,
                 'no_of_logged_in_time' => $this->getLoginDuration($row['first_login'], $row['last_logout'])