From a9d0f350e82e89a24627a03f37033d1addafcd05 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Thu, 24 Oct 2024 01:36:26 +0530 Subject: [PATCH] emp module dev 24/10 changes 1 -vadivel J --- app/Controllers/Employeedetails.php | 79 +++- app/Models/EmpFilesModel.php | 1 - app/Views/addEmployeenew.php | 44 +- app/Views/editEmployeenew.php | 710 ++++++++++++++++------------ 4 files changed, 492 insertions(+), 342 deletions(-) diff --git a/app/Controllers/Employeedetails.php b/app/Controllers/Employeedetails.php index 0c9a425f..12c5e7fd 100755 --- a/app/Controllers/Employeedetails.php +++ b/app/Controllers/Employeedetails.php @@ -198,6 +198,40 @@ class Employeedetails extends BaseController /** * This function is used to save the new Employee form in the database */ + /** + * This function is used to save the new Employee form in the database + */ + /** + * This function is used to save the new Employee form in the database + */ + /** + * This function is used to save the new Employee form in the database + */ + /** + * This function is used to save the new Employee form in the database + */ + /** + * This function is used to save the new Employee form in the database + */ + /** + * This function is used to save the new Employee form in the database + */ + /** + * This function is used to save the new Employee form in the database + */ + /** + * This function is used to save the new Employee form in the database + */ + /** + * This function is used to save the new Employee form in the database + */ + /** + * This function is used to save the new Employee form in the database + */ + /** + * This function is used to save the new Employee form in the database + */ + function AddNewEmployee() { @@ -365,16 +399,15 @@ class Employeedetails extends BaseController $this->empFiles->save([ 'file_name' => $fileNames[$index], // User-entered file name 'emp_file' => $newName, // New file name - 'emp_id' => $result, + 'emp_id' => $result['EmpID'], 'path' => $path - ]); } } } - $EmpID = $result; + $EmpID = $result['EmpID']; $Total_Salary = $this->request->getPost('Total_salary'); $Basic_Pay = $this->request->getPost('Basic_Pay'); $HRA_Rate = $this->request->getPost('HRA_Rate'); @@ -627,13 +660,46 @@ class Employeedetails extends BaseController } } + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + /* To Update the employee details*/ + + function UpdateEmployee() { - $EmpId = $this->request->getPost('employeeid'); + $EmpId = $this->request->getGet('empId'); - $EmpId = $this->request->getPost('employeeid'); $PictureName = $this->request->getPost('Image'); $ModifyPictureName = $this->request->getPost('ModifyImage'); $Picture = ""; @@ -853,9 +919,8 @@ class Employeedetails extends BaseController $this->empFiles->save([ 'file_name' => $fileNames[$index], // User-entered file name 'emp_file' => $newName, // New file name - 'emp_id' => $result, + 'emp_id' => $EmpId, 'path' => $path - ]); } } diff --git a/app/Models/EmpFilesModel.php b/app/Models/EmpFilesModel.php index 7fb6f630..78ee5d28 100755 --- a/app/Models/EmpFilesModel.php +++ b/app/Models/EmpFilesModel.php @@ -21,4 +21,3 @@ class EmpFilesModel extends Model ]; } -?> \ No newline at end of file diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php index df24d29d..ce31e4f2 100755 --- a/app/Views/addEmployeenew.php +++ b/app/Views/addEmployeenew.php @@ -1003,19 +1003,19 @@
-
*
-
- +
+
-
+
@@ -1027,7 +1027,7 @@
-
+
-
+
-
+
- - - - - -
+
-
+
-
+
-
+
- - - - -
-
-
+
+
-
+
-
-
+
+
-
+
diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php index 968f746a..58c6632d 100755 --- a/app/Views/editEmployeenew.php +++ b/app/Views/editEmployeenew.php @@ -58,8 +58,8 @@ $uano = ''; $is_management_team = 0; $esi_applicable = 0; $pf_applicable = 0; -$TDS_Rate=''; -$tds_apllicable=0; +$TDS_Rate = ''; +$tds_apllicable = 0; if (!empty($EmpDetails)) { foreach ($EmpDetails as $Emp) { @@ -96,8 +96,8 @@ if (!empty($EmpDetails)) { $IFSCCode = $Emp->IFSCCode; $BankBranchName = $Emp->BankBranchName; $BankAddress = $Emp->BankAddress; - $TDS_Rate=$Emp->TDS_Rate; - $tds_applicable =$Emp->tds_applicable; + $TDS_Rate = $Emp->TDS_Rate; + $tds_applicable = $Emp->tds_applicable; $PassportNo = $Emp->PassportNo; $Passport_Valid_till = $Emp->Passport_Valid_till; if ($Passport_Valid_till != '' && $Passport_Valid_till != '0000-00-00 00:00:00') { @@ -145,6 +145,7 @@ if (!empty($EmpDetails)) { } ?> +
@@ -191,7 +192,7 @@ if (!empty($EmpDetails)) { Proof - +
@@ -207,27 +208,29 @@ if (!empty($EmpDetails)) {
your image - + src="" + alt="your image" style="width: 139px;" /> +
-
+
-
@@ -305,7 +311,8 @@ if (!empty($EmpDetails)) {
* +
@@ -381,7 +389,7 @@ if (!empty($EmpDetails)) {
-
@@ -397,7 +405,7 @@ if (!empty($EmpDetails)) {
- +
@@ -495,8 +503,9 @@ if (!empty($EmpDetails)) {
* - @@ -546,8 +555,9 @@ if (!empty($EmpDetails)) {
* - @@ -569,7 +579,8 @@ if (!empty($EmpDetails)) {
@@ -619,7 +631,7 @@ if (!empty($EmpDetails)) {
- +