From fc57a9f4d01fa75585674bccba874c99db0127e6 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Wed, 8 May 2024 08:29:19 +0000 Subject: [PATCH] FIX_Leave Permission : ps --- .../modules/Leave/controllers/Leave.php | 4 +- .../modules/Leave/views/apply_leave.php | 76 +++++++-------- .../modules/Leave/views/edit_leave.php | 93 +++++++++++-------- 3 files changed, 91 insertions(+), 82 deletions(-) diff --git a/application/modules/Leave/controllers/Leave.php b/application/modules/Leave/controllers/Leave.php index ef34aa7..3df48d8 100644 --- a/application/modules/Leave/controllers/Leave.php +++ b/application/modules/Leave/controllers/Leave.php @@ -246,7 +246,7 @@ public function createLeave() $data['status'] = 'pending'; // $data['created_date'] = date('d-m-Y'); $data['created_date_new'] = date('Y-m-d'); - $data['created_time'] = date('H:i A'); + $data['created_time'] = date('h:i a'); $leave_year = date('Y', strtotime($this->input->post('from_date_new'))); //get employee's leave count @@ -400,7 +400,7 @@ public function editleave() $action['perm_date_new'] = date('Y-m-d', strtotime($this->input->post('perm_date_new'))); $action['created_date'] = date('d-m-Y'); - $action['created_time'] = date('H:i A'); + $action['created_time'] = date('h:i a'); $table="leave_list"; $create_permission = $this->MY_Model->edit_option($action, $id, $table); diff --git a/application/modules/Leave/views/apply_leave.php b/application/modules/Leave/views/apply_leave.php index ecb42ee..b95a743 100644 --- a/application/modules/Leave/views/apply_leave.php +++ b/application/modules/Leave/views/apply_leave.php @@ -451,55 +451,47 @@ function get_all_count(id) {