emp module dev 24/10 changes 1 -vadivel J
This commit is contained in:
parent
2e1abe5f96
commit
a9d0f350e8
@ -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
|
||||||
|
*/
|
||||||
|
/**
|
||||||
|
* This function is used to save the new Employee form in the database
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
function AddNewEmployee()
|
function AddNewEmployee()
|
||||||
{
|
{
|
||||||
@ -365,16 +399,15 @@ class Employeedetails extends BaseController
|
|||||||
$this->empFiles->save([
|
$this->empFiles->save([
|
||||||
'file_name' => $fileNames[$index], // User-entered file name
|
'file_name' => $fileNames[$index], // User-entered file name
|
||||||
'emp_file' => $newName, // New file name
|
'emp_file' => $newName, // New file name
|
||||||
'emp_id' => $result,
|
'emp_id' => $result['EmpID'],
|
||||||
'path' => $path
|
'path' => $path
|
||||||
|
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$EmpID = $result;
|
$EmpID = $result['EmpID'];
|
||||||
$Total_Salary = $this->request->getPost('Total_salary');
|
$Total_Salary = $this->request->getPost('Total_salary');
|
||||||
$Basic_Pay = $this->request->getPost('Basic_Pay');
|
$Basic_Pay = $this->request->getPost('Basic_Pay');
|
||||||
$HRA_Rate = $this->request->getPost('HRA_Rate');
|
$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*/
|
||||||
|
/* To Update the employee details*/
|
||||||
|
|
||||||
|
|
||||||
function UpdateEmployee()
|
function UpdateEmployee()
|
||||||
{
|
{
|
||||||
|
|
||||||
$EmpId = $this->request->getPost('employeeid');
|
$EmpId = $this->request->getGet('empId');
|
||||||
|
|
||||||
$EmpId = $this->request->getPost('employeeid');
|
|
||||||
$PictureName = $this->request->getPost('Image');
|
$PictureName = $this->request->getPost('Image');
|
||||||
$ModifyPictureName = $this->request->getPost('ModifyImage');
|
$ModifyPictureName = $this->request->getPost('ModifyImage');
|
||||||
$Picture = "";
|
$Picture = "";
|
||||||
@ -853,9 +919,8 @@ class Employeedetails extends BaseController
|
|||||||
$this->empFiles->save([
|
$this->empFiles->save([
|
||||||
'file_name' => $fileNames[$index], // User-entered file name
|
'file_name' => $fileNames[$index], // User-entered file name
|
||||||
'emp_file' => $newName, // New file name
|
'emp_file' => $newName, // New file name
|
||||||
'emp_id' => $result,
|
'emp_id' => $EmpId,
|
||||||
'path' => $path
|
'path' => $path
|
||||||
|
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,4 +21,3 @@ class EmpFilesModel extends Model
|
|||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
?>
|
|
||||||
@ -1003,19 +1003,19 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-md-11">
|
<div class="col-md-11">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-3"><label>Aadhar Number</label> <span
|
<div class="col-md-4"><label>Aadhar Number</label> <span
|
||||||
class="badge">*</span>
|
class="badge">*</span>
|
||||||
<input type="text" id="aadharno" name="aadharno" maxlength="14"
|
<input type="text" id="aadharno" name="aadharno" maxlength="14"
|
||||||
onchange="ValidateAadhar();" class="form-control"
|
onchange="ValidateAadhar();" class="form-control"
|
||||||
onkeypress="return isNumberKey(event)" required>
|
onkeypress="return isNumberKey(event)" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-3">
|
<div class="col-md-4">
|
||||||
<label>File Name</label>
|
<label>Aadhar File Name</label>
|
||||||
<input type="text" id="file_name" name="file_name1" maxlength="255"
|
<input type="text" id="file_name" name="file_name1" maxlength="255"
|
||||||
class="form-control" value="Aadhar">
|
class="form-control" value="Aadhar">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-4">
|
||||||
<label>Select Aadhar File</label>
|
<label>Select Aadhar File</label>
|
||||||
<input type="file" name="emp_file1" class="">
|
<input type="file" name="emp_file1" class="">
|
||||||
</div>
|
</div>
|
||||||
@ -1027,7 +1027,7 @@
|
|||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
||||||
<div class="col-md-3"><label>PAN Number</label>
|
<div class="col-md-4"><label>PAN Number</label>
|
||||||
<input type="text" id="panno" maxlength="10"
|
<input type="text" id="panno" maxlength="10"
|
||||||
style="text-transform:uppercase" name="panno"
|
style="text-transform:uppercase" name="panno"
|
||||||
onchange="validatePAN();" class="form-control"
|
onchange="validatePAN();" class="form-control"
|
||||||
@ -1036,26 +1036,21 @@
|
|||||||
onkeypress="return alpha(event);">
|
onkeypress="return alpha(event);">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-3">
|
<div class="col-md-4">
|
||||||
<label>PAN File Name</label>
|
<label>PAN File Name</label>
|
||||||
<input type="text" id="file_name" name="file_name2" maxlength="255"
|
<input type="text" id="file_name" name="file_name2" maxlength="255"
|
||||||
class="form-control" value="PAN">
|
class="form-control" value="PAN">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-4">
|
||||||
<label>Select PAN File</label>
|
<label>Select PAN File</label>
|
||||||
<input type="file" name="emp_file2" class="">
|
<input type="file" name="emp_file2" class="">
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
||||||
<div class="col-md-3"><label>Passport Number</label>
|
<div class="col-md-4"><label>Passport Number</label>
|
||||||
<input type="text" id="passportno" maxlength="9"
|
<input type="text" id="passportno" maxlength="9"
|
||||||
onchange="ValidatePassport();" name="passportno"
|
onchange="ValidatePassport();" name="passportno"
|
||||||
style="text-transform:uppercase" class="form-control"
|
style="text-transform:uppercase" class="form-control"
|
||||||
@ -1063,44 +1058,39 @@
|
|||||||
The first character cannot be Q, X or Z. (eg:A12 34567)" onkeypress="return alpha(event);">
|
The first character cannot be Q, X or Z. (eg:A12 34567)" onkeypress="return alpha(event);">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-3">
|
<div class="col-md-4">
|
||||||
<label>Passport File Name</label>
|
<label>Passport File Name</label>
|
||||||
<input type="text" id="file_name" name="file_name3" maxlength="255"
|
<input type="text" id="file_name" name="file_name3" maxlength="255"
|
||||||
class="form-control" value="Passport">
|
class="form-control" value="Passport">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-4">
|
||||||
<label>Select Passport File</label>
|
<label>Select Passport File</label>
|
||||||
<input type="file" name="emp_file3" class="">
|
<input type="file" name="emp_file3" class="">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-3"></div>
|
<div class="col-md-4"></div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-4">
|
||||||
<label>Bank PassBok Name</label>
|
<label>Bank PassBok Name</label>
|
||||||
<input type="text" id="file_name" name="file_name4" maxlength="255"
|
<input type="text" id="file_name" name="file_name4" maxlength="255"
|
||||||
class="form-control" value="Bank Passbook">
|
class="form-control" value="Bank Passbook">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-4">
|
||||||
<label>Bank PassBok File</label>
|
<label>Bank PassBok File</label>
|
||||||
<input type="file" name="emp_file4" class="">
|
<input type="file" name="emp_file4" class="">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-3"></div>
|
<div class="col-md-4"></div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-4">
|
||||||
<label>Other Document File Name</label>
|
<label>Other Document File Name</label>
|
||||||
<input type="text" id="file_name" name="file_name5" maxlength="255"
|
<input type="text" id="file_name" name="file_name5" maxlength="255"
|
||||||
class="form-control" value="Other Document">
|
class="form-control" value="Other Document">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-4">
|
||||||
<label>Other Document File </label>
|
<label>Other Document File </label>
|
||||||
<input type="file" name="emp_file5" class="">
|
<input type="file" name="emp_file5" class="">
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user