Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

Browse Source
This commit is contained in:
aadhavan valli 2024-03-19 11:39:33 +05:30
commit 1efa7306e3
3 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Config/Routes.php
View File

@ -212,11 +212,12 @@ $routes->get("/getEmployeeProfile", "EmployeeRestController::getEmployeeProfile/
$routes->post("/editEmployeeProfile", "EmployeeRestController::editEmployeeProfile");
$routes->post("/employeeUpload", "EmployeeRestController::employeeUpload");
$routes->get("getEmployeeAndDependence", "EmployeeRestController::getEmployeeAndDependence");
$routes->get("getClientPolicy", "EmployeeRestController::getClientPolicy");
$routes->group("employeeRest", ["filter" => "authJWT"], function($routes){
$routes->post("employeeUpload", "EmployeeRestController::employeeUpload");
$routes->get("relationshipList", "EmployeeRestController::relationshipList");
$routes->get("getEmployeeAndDependence", "EmployeeRestController::getEmployeeAndDependence");
$routes->post("editEmployeeAndDependence", "EmployeeRestController::editEmployeeAndDependence");
@ -226,6 +227,7 @@ $routes->group("employeeRest", ["filter" => "authJWT"], function($routes){
$routes->post("createOrUpdateEmployeePolicySiAmount", "EmployeeRestController::createOrUpdateEmployeePolicySiAmount");
$routes->get("deleteDependence", "EmployeeRestController::deleteDependence");
$routes->get("getEmployeeAndDependenceByClientId", "EmployeeRestController::getEmployeeAndDependenceByClientId");
$routes->get("getClientPolicy", "EmployeeRestController::getClientPolicy");
});
$routes->post("sendEmail", "EmployeeRestController::send_email");

57
app/Controllers/EmployeeRestController.php
View File

@ -52,7 +52,7 @@ class EmployeeRestController extends AdminController
$this->policesModel = new PolicesModel();
$this->relationshipModel = new RelationshipModel();
$this->fileModel= new FileModel();
$this->clientPolicyModel= new ClientPolicyModel();
$this->clientPolicyModel = new ClientPolicyModel();
}
@ -211,29 +211,28 @@ class EmployeeRestController extends AdminController
public function getEmployeeAndDependenceByClientId()
{
try {
$empData = $this->employeeModel
->where('client_id', $this->request->getGet('client_id'))
->where('relationship', 'self')
->orderBy('id')
->findAll();
$empData = $this->employeeModel->where('client_id', $this->request->getGet('client_id'))
->where('relationship !=', null)
->orderBy('emp_code')->orderBy('id')->findAll();
$result = [];
// $result = [];
foreach ($empData as $employee) {
$employeeDependence = $this->employeeModel
->where('emp_code', $employee['emp_code'])
->where('relationship !=', 'self')
->findAll();
// foreach ($empData as $employee) {
// $employeeDependence = $this->employeeModel
// ->where('emp_code', $employee['emp_code'])
// ->where('relationship !=', 'self')
// ->findAll();
// Use object notation to access properties and set 'dependence'
$employee['dependence'] = $employeeDependence ?: [];
// // Use object notation to access properties and set 'dependence'
// $employee['dependence'] = $employeeDependence ?: [];
$result[] = $employee;
}
// $result[] = $employee;
// }
// You probably meant to check $result, not $data
if ($result) {
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result], 200);
if ($empData) {
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $empData], 200);
} else {
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 404);
}
@ -245,6 +244,28 @@ class EmployeeRestController extends AdminController
}
public function getClientPolicy()
{
try {
$ClientPolicyData = $this->clientPolicyModel->select('client_policy.id as client_policy_id , client_policy.client_id as client_id, policies.id as policy_id,policies.policy_type_id as policy_type_id, policies.name as policy_name')
->join('policies', 'client_policy.policy_id = policies.id', 'left')
->where('client_policy.client_id', $this->request->getGet('client_id') )
->findAll();
// You probably meant to check $result, not $data
if ($ClientPolicyData) {
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $ClientPolicyData], 200);
} else {
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 404);
}
} catch (\Exception $e) {
return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()], 500);
}
}
public function getEmployeePolicy()
{

2
app/Controllers/RestAuthenticationController.php
View File

@ -176,7 +176,7 @@ class RestAuthenticationController extends AdminController
->where('level_contacts.mobile', $mobile_number )
->find();
$result = JWTToken::encode($hrData);
$result = JWTToken::encode($hrData['0']);
return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
} else {
return $this->respond(['status' => 'failed','code' => 404,'data' => "No data"],404);