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

FIX_EMP_UPLOAD_REASON_MODAL : RV

Browse Source
This commit is contained in:
VENKATESHWARAN 2024-04-09 12:49:27 +05:30
parent 871524f55c
commit e5cdc0bb13
13 changed files with 65 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Config/Routes.php
View File

@ -16,7 +16,7 @@ $routes->get('/login', 'LoginController::index');///auth/google
$routes->get('/logout', 'LoginController::logout');
$routes->get('/oauth2callback', 'LoginController::receiveGoogleOAuthResponse');
$routes->get('/auth/google', 'LoginController::initiateGoogleOAuth');
$routes->get('/update-policy', 'ClientController::checkPolicyEndDateUpdateClientPolicyStatusExpired');
$routes->get('/update-emp-policy-status', 'ClientController::updateEmpAndPolicyStatus');
$routes->group("/user", ["filter" => "authMVC"], function($routes){

2
app/Controllers/ClientController.php
View File

@ -109,7 +109,7 @@ class ClientController extends AdminController
}
public function checkPolicyEndDateUpdateClientPolicyStatusExpired(){
public function updateEmpAndPolicyStatus(){
$return = $this->clientPolicyModel->updateStatus();
$this->myLogger->logme('error', 'Client Policy Status Update Count: {data}', ['data' => $return['client']]);

13
app/Helpers/excel_import_export_helper.php
View File

@ -419,6 +419,19 @@ if (!function_exists('remove_underscore_capitalize_first_letter')) {
}
if (!function_exists('formatDateOrReturn')) {
/**
* Formats a given value as a date or returns the original value if it's not a valid date.
*
* This function checks if the provided value is a valid date. If it is, it formats
* the date as 'd-M-Y' (day-month-year) format and returns it. If the value is not
* a valid date, it returns the original value unchanged.
*
* @param mixed $value The value to be formatted as a date or returned unchanged.
* @return string|mixed The formatted date if the value is a valid date, otherwise the original value.
*/
function formatDateOrReturn($value)
{
// Check if the value is a valid date

4
app/Views/client_policy.php
View File

@ -244,7 +244,7 @@ $(document).ready(function() {
<div class="dropdown-menu dropdown-menu-right">
<a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
<a href="#" data-id="${item.id}" id="${search_term}" class="dropdown-item btnPolicyMaster" data-toggle="modal"><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
<a href="#" data-id="${item.id}" id="${search_term}"class="dropdown-item btnPolicyModel" data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rac Rate</a>
<a href="#" data-id="${item.id}" id="${search_term}"class="dropdown-item btnPolicyModel" data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>
`;
if (item.open_for_enrollment == 0) {
policyTable +=
@ -363,7 +363,7 @@ $("#policy_form").submit(function(event) {
<div class="dropdown-menu dropdown-menu-right">
<a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
<a href="#" data-id="${item.id}" id="${search_term}" class="dropdown-item btnPolicyMaster" data-toggle="modal"><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
<a href="#" data-id="${item.id}" id="${search_term}"class="dropdown-item btnPolicyModel" data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rac Rate</a>
<a href="#" data-id="${item.id}" id="${search_term}"class="dropdown-item btnPolicyModel" data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>
<a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnOpenEnroll"><i class="mdi mdi-file-lock mr-2 text-muted font-18 vertical-middle"></i>Open Enrollment</a>
</div>
</div>

39
app/Views/employee_upload.php
View File

@ -297,8 +297,8 @@ function fetchFileError(file_id) {
var file_error_html = "";
for (var key in file_error_data['error_summary']) {
console.log(key);
var err_id = key;
// console.log(key);
var err_id = parseInt(key);
var err_count = file_error_data['error_summary'][key];
switch (err_id) {
case 1:
@ -345,21 +345,26 @@ function fetchFileError(file_id) {
file_error_html += "";
break;
}
file_error_html += (err_id == 1 ?
"<strong>Mandatory values missing</strong> <span class='badge badge-danger float-right'>" +
err_count + "</span>" : (err_id == 2 ?
"<strong>Values not in expected format</strong> <span class='badge badge-danger float-right'>" +
err_count + "</span>" : (err_id == 3 ?
"<strong>Field contains not allowed values</strong> <span class='badge badge-danger float-right'>" +
err_count + "</span>" : (err_id == 4 ?
"<strong>Rule Conflict</strong> <span class='badge badge-danger float-right'>" +
err_count + "</span>" : (err_id == 5 ? "<strong>" +
file_error_data['error_data'] + "</strong>" : (err_id ==
6 ?
"<strong>" + file_error_data['error_data'] +
"</strong>" : ""))))));
// console.log('file_error_html_1', file_error_html)
// file_error_html += (err_id == 1 ?
// "<strong>Mandatory values missing</strong> <span class='badge badge-danger float-right'>" +
// err_count + "</span>" : (err_id == 2 ?
// "<strong>Values not in expected format</strong> <span class='badge badge-danger float-right'>" +
// err_count + "</span>" : (err_id == 3 ?
// "<strong>Field contains not allowed values</strong> <span class='badge badge-danger float-right'>" +
// err_count + "</span>" : (err_id == 4 ?
// "<strong>Rule Conflict</strong> <span class='badge badge-danger float-right'>" +
// err_count + "</span>" : (err_id == 5 ? "<strong>" +
// file_error_data['error_data'] + "</strong>" : (err_id ==
// 6 ?
// "<strong>" + file_error_data['error_data'] +
// "</strong>" : ""))))));
file_error_html += '<br/>';
// }
// // }
// console.log('file_error_html_2', file_error_html)
}
if (err_id != 5 && err_id != 6) {
@ -369,7 +374,7 @@ function fetchFileError(file_id) {
"' target=_blank>click here to more details...</a>" : "");
}
console.log(file_error_html);
// console.log(file_error_html);
$('#file-err-modal').find(".modal-body").html(file_error_html);
return file_error_html;
} catch (error) {

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

@ -6,12 +6,12 @@
<title><?= isset($page_name) ? $page_name : 'NHance'; ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta content="" name="description" />
<meta content="nHANCE" name="nHANCE" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta content="NHANCE" name="NHANCE" />
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<!-- App favicon -->
<link rel="shortcut icon" href="<?= base_url()."public"; ?>/assets/images/favicon.ico">
<link rel="shortcut icon" href="<?= base_url()."public"; ?>/assets/images/Nhance_Favi.svg">
<!-- plugin css -->
<link href="<?= base_url()."public"; ?>/assets/libs/admin-resources/jquery.vectormap/jquery-jvectormap-1.2.2.css" rel="stylesheet" type="text/css" />
@ -451,18 +451,18 @@
<div class="logo-box">
<a href="https://localhost/nhance/dashboard/view" class="logo logo-dark text-center">
<span class="logo-sm">
<img src="<?= base_url()."public"; ?>/assets/images/n.png" alt="" height="24">
<img src="<?= base_url()."public"; ?>/assets/images/Nhance_Favi.svg" alt="" height="24">
<!-- <span class="logo-lg-text-light">NHANCE</span> -->
</span>
<span class="logo-lg">
<img src="<?= base_url()."public"; ?>/assets/images/logo-dark.png" alt="" height="20">
<img src="<?= base_url()."public"; ?>/assets/images/Nhance_Favi.svg" alt="" height="20">
<!-- <span class="logo-lg-text-light">M</span> -->
</span>
</a>
<a href="https://localhost/nhance/dashboard/view" class="logo logo-light text-center">
<span class="logo-sm">
<img src="<?= base_url()."public"; ?>/assets/images/n.png" alt="" height="24">
<img src="<?= base_url()."public"; ?>/assets/images/Nhance_Favi.svg" alt="" height="24">
</span>
<!-- <span class="logo-lg">
<img src="<?= base_url()."public"; ?>/assets/images/logo-light.png" alt="" height="20">
@ -515,14 +515,13 @@
<a href="<?= base_url('/dashboard/view')?>" class="logo logo-light text-center">
<span class="logo-sm">
<img src="<?= base_url()."public"; ?>/assets/images/n.png" alt="" height="24">
<img src="<?= base_url()."public"; ?>/assets/images/Nhance_Favi_white.png" alt="" width="30" height="30">
</span>
<!-- <span class="logo-lg">
<img src="<?= base_url()."public"; ?>./assets/images/logo-light.png" alt="" height="20">
</span> -->
</a>
</div>
<!-- >>>>>>> 47b829183b576482986f721bd598c48341c0bbec -->
<div class="h-100" data-simplebar>

5
app/Views/login.php
View File

@ -3,13 +3,14 @@
<head>
<meta charset="utf-8" />
<title>nHANCE</title>
<title>NHANCE</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta content="A fully featured CRM" name="description" />
<meta content="Venba info tech" name="author" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<!-- App favicon -->
<link rel="shortcut icon" href="<?= base_url()."public"; ?>/assets/images/favicon.ico">
<link rel="shortcut icon" href="<?= base_url()."public"; ?>/assets/images/Nhance_Favi.svg">
<!-- App css -->
<link href="<?= base_url()."public"; ?>/assets/css/bootstrap-material.min.css" rel="stylesheet" type="text/css"

BIN
public/assets/images/Nhance_Favi.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

5
public/assets/images/Nhance_Favi.svg Normal file
View File

@ -0,0 +1,5 @@
<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M428.357 3.03152C399.835 2.7241 385.421 4.56862 377.14 12.869C365.486 24.551 366.1 42.3814 366.713 50.0669C366.713 72.816 366.713 95.5652 366.713 118.314C366.713 157.972 366.713 197.629 366.713 237.286C366.713 237.901 366.713 243.127 366.713 243.742C366.713 244.049 366.713 244.049 366.713 244.357C366.713 244.664 366.713 244.972 366.713 244.972C366.713 245.587 367.02 245.894 367.02 246.509C368.553 252.042 371.927 256.039 374.993 258.806C412.716 294.466 442.771 321.827 459.638 337.198C465.159 342.117 473.132 348.572 479.879 346.113C487.24 343.346 489.08 331.049 489.693 327.053C489.693 270.488 489.693 213.922 489.693 157.357C489.693 118.007 489.693 83.5758 490 48.2224C490 34.6959 490 19.3248 479.573 9.48735C470.679 2.10925 456.571 3.33894 428.357 3.03152Z" fill="#E26828"/>
<path d="M83.6435 509.968C112.165 510.276 126.579 508.431 134.86 500.438C146.514 489.064 145.9 471.848 145.287 464.163C145.287 442.028 145.287 419.894 145.287 397.76C145.287 359.332 145.287 320.597 145.287 281.862C145.287 281.247 145.287 276.329 145.287 275.406C145.287 275.099 145.287 275.099 145.287 274.791C145.287 274.484 145.287 274.177 145.287 274.177C145.287 273.869 144.98 273.254 144.98 272.947C143.447 267.721 140.073 263.724 137.007 260.958C58.1887 192.71 52.055 184.41 52.055 184.41C46.8414 179.184 38.5609 170.268 31.5072 172.42C26.2936 173.957 23.5334 180.721 22.3067 185.332C22.3067 243.435 22.3067 301.537 22.3067 359.64C22 390.074 22 424.813 22 466.007C22 479.841 22.3067 494.597 32.4273 503.513C41.0144 510.891 55.1219 509.661 83.6435 509.968Z" fill="#E26828"/>
<path d="M274.401 203.47L100.818 14.4061C91.924 4.56862 81.19 3.64636 68.9227 3.64636C43.7746 3.95378 19.2398 -5.57626 22.3067 52.5263L24.4535 91.5687C24.7602 97.4097 27.2136 103.558 31.5072 108.169L294.642 387.922L398.301 501.668C401.675 505.972 406.582 508.431 412.102 508.431C424.983 508.739 442.157 508.431 451.664 508.431C476.813 508.124 489.693 507.509 489.693 477.997L487.24 438.339C486.933 432.498 484.48 426.35 480.186 422.046L274.401 203.47Z" fill="#00999E"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
public/assets/images/Nhance_Favi_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
public/assets/images/Nhance_Favi_white_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
public/assets/images/nhance-loader.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 493 KiB

11
public/assets/images/nhance_white_logo.svg Normal file
View File

@ -0,0 +1,11 @@
<svg width="132" height="28" viewBox="0 0 132 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M54.7983 14.7392C55.1303 14.6604 55.4782 14.8496 55.5888 15.1806C55.8734 15.9846 56.1738 16.7413 56.49 17.5295C56.6956 18.0182 56.3794 18.1285 56.0473 18.3177C54.7193 19.0586 54.2924 20.0675 54.6877 21.3917C54.9406 22.2272 55.5256 22.7001 56.3477 22.842C59.0829 23.378 61.3754 21.5809 61.4703 18.7906C61.5177 16.6625 61.4703 14.5028 61.4386 12.3746C61.4228 11.6022 61.075 11.0189 60.3003 10.814C58.4505 10.3095 56.6798 10.2622 55.1462 11.7283C54.7509 12.1066 54.1027 12.4219 53.5493 12.4534C52.49 12.548 51.4307 12.5007 50.2924 12.485C49.913 12.485 49.6284 12.1224 49.739 11.7598C50.7193 8.68581 52.7746 6.80987 56.0157 6.4473C58.245 6.19507 60.4742 6.25813 62.6402 6.98328C64.7746 7.6769 66.245 9.07991 66.3556 11.3657C66.4821 14.219 66.5137 17.0881 66.324 19.9257C66.0394 24.0559 63.4149 26.0106 59.7469 26.7358C57.6126 27.1614 55.4307 27.2718 53.328 26.4678C51.1462 25.648 49.7549 23.7721 49.6442 21.4705C49.4386 17.7187 51.0671 15.5432 54.7983 14.7392Z" fill="white"/>
<path d="M55.5579 12.611C57.2971 13.1785 58.8307 13.6672 60.3643 14.219C60.6172 14.3135 60.7279 14.5815 60.6172 14.818C60.0164 16.1737 58.7832 18.5699 58.2615 19.5C58.1666 19.6576 57.9295 19.6418 57.8662 19.4684C57.0441 17.356 56.2062 15.2279 55.2892 12.9105C55.2101 12.7214 55.384 12.5637 55.5579 12.611Z" fill="white"/>
<path d="M84.2058 26.9726C82.3085 26.9726 80.7591 25.4277 80.7591 23.536V14.6765C80.7591 13.1474 80.1741 12.2173 78.9884 11.8863C76.9805 11.3345 75.0042 12.9424 75.0042 15.0233V26.6573C75.0042 26.8149 74.8619 26.9726 74.688 26.9726H69.8816C69.2018 26.9726 68.6643 26.4208 68.6643 25.7587V15.7012C68.5694 9.53739 71.6208 6.46338 77.85 6.46338C84.0793 6.46338 87.1781 9.53739 87.1781 15.7012V25.9636C87.1781 26.5154 86.7354 26.9726 86.1662 26.9726H84.2058Z" fill="white"/>
<path d="M108.174 19.8628C108.522 19.8628 108.759 20.1939 108.648 20.5249C107.162 24.8443 104.016 27.0355 99.1303 27.0671C96.0789 27.0671 93.7232 26.137 92.0473 24.2768C90.3714 22.2748 89.5019 19.7367 89.4702 16.6942C89.3754 13.6518 90.1975 11.1768 91.9683 9.26932C93.5967 7.36186 95.9525 6.38448 99.0513 6.38448C102.15 6.28989 104.585 7.21998 106.356 9.17473C107.399 10.2467 108.111 11.5236 108.49 13.0054L108.506 13.0527C108.585 13.368 108.348 13.6675 108.016 13.6675H102.719C102.514 13.6675 102.34 13.5414 102.261 13.3522C101.771 12.1857 100.743 11.6024 99.2094 11.6024C97.0592 11.6024 95.9366 13.2892 95.8892 16.6785C95.8892 19.9889 97.0434 21.7388 99.32 21.9122C99.3359 21.9122 99.3675 21.9122 99.3991 21.9122C100.506 21.8649 101.36 21.5496 101.945 20.9663C102.53 20.2412 103.352 19.8628 104.379 19.8628H108.174Z" fill="white"/>
<path d="M37.9604 6.41589C39.5256 6.21095 41.0592 6.33707 42.577 6.79423C46.1026 7.85043 47.9366 10.7037 48.0157 15.3857V25.8058C48.0157 26.4206 47.5098 26.9408 46.8774 26.9408H42.7193C42.0394 26.9408 41.5019 26.3891 41.5019 25.727V16.2843C41.5019 13.4309 40.237 11.9806 37.7232 11.9806C35.2094 11.9806 33.9604 13.4152 34.0078 16.2843V25.5693C34.0078 26.3103 33.407 26.9251 32.6481 26.9251H28.7746C28.0789 26.9251 27.5098 26.3576 27.5098 25.6639V1.68664C27.5098 1.13489 27.9683 0.677734 28.5216 0.677734H30.8457C32.6007 0.677734 34.0236 2.09651 34.0236 3.84633V7.88196C34.0236 8.02383 34.1817 8.10265 34.2924 8.00807C35.2884 7.21986 36.5058 6.68388 37.9604 6.41589Z" fill="white"/>
<path d="M124.048 12.0597C124.601 11.6341 123.352 10.972 123.083 10.8144C121.36 9.9158 119.241 10.4203 117.708 11.4449C114.308 13.7623 114.53 20.0837 118.451 21.7232C121.391 22.9685 125.281 21.6916 126.356 18.5388C126.451 18.2866 126.546 18.0343 126.609 17.7506C126.688 17.4984 126.925 17.3092 127.194 17.3092H128.348C128.364 17.3092 128.38 17.3092 128.427 17.3092L131.605 17.5299C131.81 17.5457 132 17.6402 132 17.9082V17.924C132 17.9555 131.399 21.4236 129.929 23.268C128.949 24.6395 127.478 25.7115 125.929 26.3105C124.158 27.0041 122.182 26.9411 120.316 26.9411C118.878 26.9411 117.518 26.7204 116.3 26.2632C115.083 25.8061 113.961 25.1124 112.98 24.1981C111.968 23.2523 111.21 22.1803 110.719 20.998C110.229 19.8157 109.992 18.5073 109.992 17.0412C109.992 15.5121 110.198 14.1564 110.609 12.9898C111.004 11.8233 111.636 10.7986 112.459 9.96309C113.281 9.12759 114.134 8.4182 115.051 7.86646C115.953 7.31471 116.901 6.92061 117.882 6.68415C117.992 6.66838 118.103 6.63685 118.198 6.63685C118.245 6.63685 118.324 6.62109 118.387 6.60533C118.466 6.58956 118.53 6.58956 118.625 6.5738C118.704 6.5738 118.751 6.5738 118.83 6.55803C118.878 6.55803 118.957 6.54227 119.036 6.5265C119.115 6.51074 119.178 6.49498 119.257 6.49498C119.447 6.47921 119.605 6.46345 119.795 6.44768C120 6.43192 120.19 6.43192 120.395 6.43192L122.04 6.40039C123.146 6.43192 124.221 6.60532 125.186 6.90484C126.15 7.22013 127.051 7.69305 127.874 8.30785C128.664 8.92266 129.391 9.63204 130.024 10.4045C130.182 10.6094 130.356 10.7986 130.514 11.0193C131.225 11.9494 130.957 13.2736 129.913 13.8411L120.269 19.0275C120 19.1694 118.34 19.7526 117.439 18.5861C116.474 17.3407 116.933 16.1584 117.818 15.654C117.723 15.654 124.048 12.0597 124.048 12.0597Z" fill="white"/>
<path d="M21.7703 0.583382C19.7782 0.567617 18.4976 0.567617 18.5608 3.02683V13.0844C18.5608 13.2105 18.6083 13.3366 18.7506 13.4469L23.7624 17.7663C24.2051 18.1447 25.043 17.9082 25.043 17.4037V2.96377C24.9956 0.23657 23.794 0.61491 21.7703 0.583382Z" fill="white"/>
<path d="M13.8334 11.0667L4.77415 1.24558C4.31565 0.741129 3.74648 0.693837 3.11407 0.693837C1.80182 0.709601 0.521187 0.220912 0.679289 3.23187L0.789961 5.24968C0.805772 5.56496 0.932254 5.86448 1.1536 6.10094L14.8927 20.6197L20.2998 26.5155C20.4896 26.7362 20.7425 26.8623 21.0113 26.8623C21.6911 26.8781 22.5765 26.8623 23.0825 26.8623C24.3947 26.8466 25.0745 26.8151 25.0745 25.2702L24.9481 23.2051C24.9323 22.8898 24.8058 22.5903 24.5844 22.3696L13.8334 11.0667Z" fill="white"/>
<path d="M1.05859 25.5854C1.05859 26.6258 1.64357 27.1302 4.36294 27.0199C7.01907 26.9096 7.57243 26.6416 7.57243 25.6642V15.7012C7.57243 15.4648 7.46176 15.2441 7.25622 15.0864L3.35108 11.7444C2.56057 11.0666 1.09021 11.4922 1.09021 12.3592V25.5854H1.05859Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB