diff --git a/app/Controllers/Employeedetails.php b/app/Controllers/Employeedetails.php index 5769a066..67bd7da9 100755 --- a/app/Controllers/Employeedetails.php +++ b/app/Controllers/Employeedetails.php @@ -691,6 +691,9 @@ class Employeedetails extends BaseController $LastName = $this->request->getPost('LastName'); $FatherName = $this->request->getPost('FatherName'); $DateofBirth = $this->request->getPost('DateofBirth'); + + // dd($DateofBirth); + $ContactNumber = $this->request->getPost('ContactNumber'); $EmailId = $this->request->getPost('emailid'); $comEmailId = $this->request->getPost('comemailid'); @@ -704,6 +707,9 @@ class Employeedetails extends BaseController $desigination = $this->request->getPost('desigination'); $departmentCode = $this->request->getPost('departmentname'); $dateofjoining = $this->request->getPost('dateofjoining'); + + // dd($dateofjoining); + //$Previousexperience = $this->request->getPost('Previousexperience'); $pre_experience = $this->request->getPost('Previousexperience'); @@ -728,9 +734,18 @@ class Employeedetails extends BaseController $ValidTill = $this->request->getPost('ValidTill'); $addinfo = $this->request->getPost('addinfo'); $driverlicense = $this->request->getPost('driverlicense'); + + + // dd($driverlicense); + $driverlicense = $driverlicense !== null && is_string($driverlicense) ? strtoupper($driverlicense) : null; $licenseExpiryDate = $this->request->getPost('LicenseExpiryDate'); $VoterID = $this->request->getPost('voterID'); + + + //dd($VoterID); + + $VoterID = $VoterID !== null && is_string($VoterID) ? strtoupper($VoterID) : null; $pfno = $this->request->getPost('pfno'); $pfno = $pfno !== null && is_string($pfno) ? strtoupper($pfno) : null; @@ -752,16 +767,21 @@ class Employeedetails extends BaseController $UpdatedBY = $this->session->get('userId'); //$licenseExpiryDate = get_date_time_format($licenseExpiryDate); - $DOB = get_date_format($DateofBirth); - $DOJ = get_date_format($dateofjoining); + + + + $DOB = get_date_time_format($DateofBirth); + + $DOJ = get_date_time_format($dateofjoining); + if ($ValidTill != '') { - $Valid = get_date_format($ValidTill); + $Valid = get_date_time_format($ValidTill); } else { $Valid = null; } if ($licenseExpiryDate != '') { - $License_ExpiryDate = get_date_format($licenseExpiryDate); + $License_ExpiryDate = get_date_time_format($licenseExpiryDate); } else { $License_ExpiryDate = null; } diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php index 2242dcb6..078d8ba7 100755 --- a/app/Views/editEmployeenew.php +++ b/app/Views/editEmployeenew.php @@ -951,7 +951,7 @@ if (!empty($EmpDetails)) {
- @@ -962,7 +962,7 @@ if (!empty($EmpDetails)) {