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:
VENKATESHWARAN 2024-04-26 11:25:20 +05:30
commit c2fe1af4eb
5 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Config/Routes.php
View File

@ -280,3 +280,9 @@ $routes->group("employeeRest", ["filter" => "authJWT"], function($routes){
$routes->post("sendEmail", "EmployeeRestController::send_email");
// Ticketing System
// Ticketing System End's

3
app/Controllers/DashboardController.php
View File

@ -21,4 +21,7 @@ class DashboardController extends AdminController
echo view('DashBoard');
echo view('layout/footer');
}
}

12
app/Controllers/RestAuthenticationController.php
View File

@ -80,8 +80,8 @@ class RestAuthenticationController extends AdminController
$result = ['user_verification' => true , 'otp'=>$randomNumber];
return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
} else {
$result = ['user_verification' => false];
return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404);
$result = ['user_verification' => false , 'message' => "User not found"];
return $this->respond(['status' => 'failed','code' => 404,'data' => $result],200);
}
} catch (\Throwable $th) {
@ -118,7 +118,7 @@ class RestAuthenticationController extends AdminController
$result = JWTToken::encode($employeeData);
return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
} else {
return $this->respond(['status' => 'failed','code' => 404,'data' => "No data"],404);
return $this->respond(['status' => 'failed','code' => 404,'data' => "Invalid OTP"],200);
}
} catch (\Exception $e) {
return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()],500);
@ -139,8 +139,8 @@ class RestAuthenticationController extends AdminController
$result = ['user_verification' => true , 'otp'=>$randomNumber];
return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
} else {
$result = ['user_verification' => false];
return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404);
$result = ['user_verification' => false , 'message' => "User not found"];
return $this->respond(['status' => 'failed','code' => 404,'data' => $result],200);
}
} catch (\Throwable $th) {
@ -180,7 +180,7 @@ class RestAuthenticationController extends AdminController
$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);
return $this->respond(['status' => 'failed','code' => 404,'data' => "Invalid OTP"],200);
}
} catch (\Exception $e) {
return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()],500);

19
app/Helpers/excel_util_helper.php
View File

@ -247,22 +247,33 @@ if (!function_exists('data_group_by_family'))
function data_group_by_family($emp_data,$data_source = 'excel')
{
$result = [];
// dd($emp_data);
foreach ($emp_data as $rkey => $row)
{
if($data_source == 'excel')
{
if(!check_row_is_empty_or_null($row))
{
$result[$row[1]][] = $row;
if(strtolower($row[5]) == 'self' && isset($result[$row[1]]))
{
array_unshift($result[$row[1]],$row);
}else
{
$result[$row[1]][] = $row;
}
}
}else if($data_source = 'db')
{
$result[$row['emp_code']][] = $row;
if(strtolower($row['relationship']) == 'self' && isset($result[$row['emp_code']]))
{
array_unshift($result[$row['emp_code']],$row);
}else
{
$result[$row['emp_code']][] = $row;
}
}
}
return $result;
}
}

9
app/Views/layout/header.php
View File

@ -602,7 +602,14 @@
</div>
</li>
<li>
<a href="#">
<?php
$sessionData = get_session_userdata();
$currentUrl = base_url();
$parsedUrl = parse_url($currentUrl);
$baseUrl = $parsedUrl['scheme'] . '://' . $parsedUrl['host'] . '/';
$redirectUrl = $baseUrl . 'nhanceTicket/staff/login_done?' . http_build_query(['token' => $sessionData]);
?>
<a href="<?php echo $redirectUrl; ?>" target="_blank">
<i class="mdi mdi-lifebuoy"></i>
<span> Tickets </span>
</a>