Merge branch 'new-theme' of bitbucket.org:jubilian/nhance into new-theme

This commit is contained in:
vadivelJ96 2025-09-20 11:37:36 +05:30
commit adc5e741ee
23 changed files with 104 additions and 55 deletions

View File

@ -27,6 +27,7 @@ class AppContentManagementController extends AdminController
public function add_image_index()
{
$this->myLogger->logme('error','Addvertisement Image list function called');
$headerData['tab_name'] = 'Addvertisement Images';
$headerData['page_name'] = 'Addvertisement Images';
$data['addImageList'] = $this->addImgModel->findAll();
@ -86,6 +87,7 @@ class AppContentManagementController extends AdminController
public function frontend_content(){
$data['test'] = $this->feContentModel->findAll();
$headerData['tab_name'] = 'Front-End Content';
$headerData['page_name'] = 'Front-End Content';
echo view('layout/header', $headerData);

View File

@ -914,6 +914,7 @@ class BDSReportController extends AdminController
$data['default_end'] = $default_start->format('d-m-Y');
$data['default_start'] = $default_start->modify('-60 days')->format('d-m-Y');
$data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
$data['tab_name'] = "Renewal Report";
$data['page_name'] = "Renewal Report";
return $this->loadLayout('renewal_search', $data);
} else {
@ -1013,6 +1014,7 @@ class BDSReportController extends AdminController
public function accountMangerStatusBDSReport()
{
$data['tab_name'] = "Account Manager BDS Report";
$data['page_name'] = "Account Manager BDS Report";
$sql = "
@ -1130,6 +1132,7 @@ class BDSReportController extends AdminController
public function getMultiReport($report_type){
$data['tab_name'] = "BDS Report";
$data['page_name'] = "BDS Report";
if ($report_type == 1){

View File

@ -474,7 +474,8 @@ class ClientController extends AdminController
public function index()
{
$this->myLogger->logme('error', 'Client list function called');
$headerData['page_name'] = 'Client List';
$headerData['tab_name'] = 'Client List';
$headerData['page_name'] = 'Clients'; // Both Browser Tab name And Page name are same.
$data['clientList'] = $this->clientModel->getCreatedByUserName();
$data['client_rm'] = $this->clientRMModel->getAllClientRM();
$data['lead_data'] = $this->leadsModel->getLeadForInsertClientList();
@ -599,7 +600,8 @@ class ClientController extends AdminController
public function clientOnboarding()
{
$this->myLogger->logme('error', 'Client Onboarding function called');
$headerData['page_name'] = 'Client Onboarding';
$headerData['tab_name'] = 'Client Onboarding';
$headerData['page_name'] = 'Clients';
$data['entity'] = $this->kycEntityTypeModel->findAll();
$data['kyc_docs'] = $this->kycDocsModel->findAll();
@ -629,8 +631,8 @@ class ClientController extends AdminController
// In your controller
public function deposit($id = null , $requestFrom = null , $policyId = null)
{
$headerData['page_name'] = 'Client Deposit';
$headerData['tab_name'] = 'Client Deposit';
$headerData['page_name'] = 'Clients';
$data['clientName'] = $this->clientModel->where('id', $id)->find();
$data['clientData'] = $this->clientPolicyModel->getinsurerswithclientid($id,$policyId);
@ -671,7 +673,8 @@ class ClientController extends AdminController
];
$data['subTypeOptions'] = $subTypeOptions;
$headerData['page_name'] = 'Client Deposit';
$headerData['tab_name'] = 'Client Deposit';
$headerData['page_name'] = 'Clients';
$loggedInUserID = get_session_userid();
// $data['clientData']= $this->clientPolicyModel->getinsurerswithinsurenceid($insurerId);
if($requestFrom == 'rest')
@ -751,7 +754,8 @@ class ClientController extends AdminController
{
$this->myLogger->logme('error', 'Edit Client Onboarding function called');
$headerData['page_name'] = 'Edit Client Onboarding';
$headerData['tab_name'] = 'Edit Client Onboarding';
$headerData['page_name'] = 'Clients';
$editData['RM'] = $this->userModel->where('is_active', 1)->findAll();
$editData['tpa'] = $this->tpaBranchModel->getTpaBranchesWithTpaNames();

View File

@ -259,7 +259,7 @@ class DashboardController extends AdminController
// dd(get_role_id(),user_team());
// dd($data);
$data['tab_name'] = 'Dashboard';
$data['page_name'] = 'Dashboard';
echo view('layout/header', $data);

View File

@ -307,6 +307,7 @@ class EmployeeController extends AdminController
return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => 'file upload success'], 200);
}
$data['tab_name'] = 'View Inception';
$data['page_name'] = 'View Inception';
//for TPA/insurer upload

View File

@ -142,6 +142,7 @@ class LeadsController extends BaseController
public function viewLeadsList()
{
$data['tab_name'] = 'Leads';
$data['page_name'] = 'Leads';
// Set basic data
@ -746,6 +747,7 @@ class LeadsController extends BaseController
}
$data['question_json'] = $lead_data['question_json'];
$data['tab_name'] = $type == 2 ? 'QCR' : 'RFQ';
$data['page_name'] = $type == 2 ? 'QCR' : 'RFQ';
$data['insurer'] = $this->insurerBranchModel->getInsurerBranchesWithInsurerNames();
$data['userList'] = $this->userModel->getUserListForRFQ();

View File

@ -107,7 +107,8 @@ class MasterController extends AdminController
public function insurerList()
{
$this->myLogger->logme('error','Insurer list function called');
$headerData['page_name'] = 'Insurer List';
$headerData['tab_name'] = 'Insurer List';
$headerData['page_name'] = 'Insurers';
$data['insurerList'] = $this->insurerModel->where('is_active',1)->findAll();
$data['insurer_rm'] = $this->insurerRMModel->getAllClientRM();
// echo '<pre>';
@ -154,7 +155,8 @@ class MasterController extends AdminController
{
$this->myLogger->logme('error','Edit Insurer Onboarding function called');
$headerData['page_name'] = 'Edit Insurer Master';
$headerData['tab_name'] = 'Edit Insurer Master';
$headerData['page_name'] = 'Insurers';
$types = array(
(object) array('id' => 'pvt', 'name' => 'PVT'),
@ -245,7 +247,8 @@ class MasterController extends AdminController
{
$this->myLogger->logme('error','Insurer Onboarding function called');
$headerData['page_name'] = 'Insurer Master';
$headerData['tab_name'] = 'Insurer Master';
$headerData['page_name'] = 'Insurers';
$types = array(
(object) array('id' => 'pvt', 'name' => 'PVT'),
@ -504,7 +507,8 @@ class MasterController extends AdminController
public function tpaList()
{
$this->myLogger->logme('error','TPA list function called');
$headerData['page_name'] = 'TPA List';
$headerData['tab_name'] = 'TPA List';
$headerData['page_name'] = 'TPA';
$data['tpaList'] = $this->tpaModel->where('is_active',1)->findAll();
// $data['insurer_rm'] = $this->insurerRMModel->getAllClientRM();
// echo '<pre>';
@ -550,7 +554,8 @@ class MasterController extends AdminController
{
$this->myLogger->logme('error','TPA Onboarding function called');
$headerData['page_name'] = 'TPA Master';
$headerData['tab_name'] = 'TPA Master';
$headerData['page_name'] = 'TPA';
// print_r($data['types']);die();
@ -664,7 +669,8 @@ class MasterController extends AdminController
{
$this->myLogger->logme('error','Edit TPA Onboarding function called');
$headerData['page_name'] = 'Edit TPA Master';
$headerData['tab_name'] = 'Edit TPA Master';
$headerData['page_name'] = 'TPA';
$tpa_data = $this->tpaModel->where(['id' => $id, 'is_active' => 1])->first();
@ -833,7 +839,8 @@ class MasterController extends AdminController
public function kycList()
{
$this->myLogger->logme('error','KYC list function called');
$headerData['page_name'] = 'KYC List';
$headerData['tab_name'] = 'KYC List';
$headerData['page_name'] = 'KYC';
$data['kycList'] = $this->kycEntityTypeModel->where('is_active',1)->findAll();
// $data['insurer_rm'] = $this->insurerRMModel->getAllClientRM();
// echo '<pre>';
@ -879,7 +886,8 @@ class MasterController extends AdminController
{
$this->myLogger->logme('error','KYC Onboarding function called');
$headerData['page_name'] = 'KYC Master';
$headerData['tab_name'] = 'KYC Master';
$headerData['page_name'] = 'KYC';
// print_r($data['types']);die();
@ -944,7 +952,8 @@ class MasterController extends AdminController
{
$this->myLogger->logme('error','Edit KYC Onboarding function called');
$headerData['page_name'] = 'Edit KYC Master';
$headerData['tab_name'] = 'Edit KYC Master';
$headerData['page_name'] = 'KYC';
$editData['kyc'] = $this->kycEntityTypeModel->where(['id' => $id, 'is_active' => 1])->first();
$editData['kyc_docs'] = $this->kycDocsModel->where(['kyc_type_id' => $id, 'is_active' => 1])->findAll();
@ -1022,7 +1031,8 @@ class MasterController extends AdminController
public function policyTypeList()
{
$this->myLogger->logme('error','Policy Type list function called');
$headerData['page_name'] = 'Policy Type List';
$headerData['tab_name'] = 'Policy Type List';
$headerData['page_name'] = 'Policy Type';
$data['policyList'] = $this->policyTypeModel->where('is_active',1)->findAll();
// $data['insurer_rm'] = $this->insurerRMModel->getAllClientRM();
// echo '<pre>';
@ -1068,7 +1078,8 @@ class MasterController extends AdminController
{
$this->myLogger->logme('error','Policy Type Onboarding function called');
$headerData['page_name'] = 'Policy Type Master';
$headerData['tab_name'] = 'Policy Type Master';
$headerData['page_name'] = 'Policy Type';
// print_r($data['types']);die();
@ -1130,7 +1141,8 @@ class MasterController extends AdminController
{
$this->myLogger->logme('error','Edit KYC Onboarding function called');
$headerData['page_name'] = 'Edit Policy Type';
$headerData['tab_name'] = 'Edit Policy Type';
$headerData['page_name'] = 'Policy Type';
$editData['policytype'] = $this->policyTypeModel->where(['id' => $id, 'is_active' => 1])->first();
$editData['policies'] = $this->policesModel->select('policies.*, insurers.name as insurer_name')
@ -1222,7 +1234,8 @@ class MasterController extends AdminController
//start CD Master list
public function CDMasterList()
{
$data['page_name'] = 'CD Master List';
$data['tab_name'] = 'CD Master List';
$data['page_name'] = 'CD Master';
$data['CD_Master_Data'] = $this->CDMasterModel->getCDMasterList();
$data['insurers'] = $this->insurerModel->where('is_active', 1)->findAll();
$data['insurer_branch'] = $this->insurerBranchModel->where('is_active', 1)->findAll();
@ -1588,8 +1601,8 @@ class MasterController extends AdminController
//Vehicle Master data Function
public function VehicleMasterList()
{
$data['page_name'] = 'Vehicle Master';
{ $data['tab_name'] = 'Vehicle Master';
$data['page_name'] = 'Vehicles';
$data['vehicle_type'] = [
'two_wheeler' => 'Two Wheeler',
'four_wheeler' => 'Four Wheeler',

View File

@ -111,6 +111,7 @@ class PolicyTransactionController extends BaseController
// Policy Transaction Inception
public function viewInception()
{
$data['tab_name'] = 'Policy';
$data['page_name'] = 'Policy';
// Static arrays for dropdowns
@ -1058,6 +1059,7 @@ class PolicyTransactionController extends BaseController
// echo '<pre>';
// !dd($this->getEndorsementDataForEdit(17));
$data['tab_name'] = 'Endorsement';
$data['page_name'] = 'Endorsement';
$data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@ -1748,7 +1750,7 @@ class PolicyTransactionController extends BaseController
//get BDS Reports data old function
public function reportBDSOld()
{
$data['tab_name'] = 'BDS Report';
$data['page_name'] = 'BDS Report';
$data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@ -1810,6 +1812,7 @@ class PolicyTransactionController extends BaseController
public function reportBDS()
{
$data['tab_name'] = 'BDS Report';
$data['page_name'] = 'BDS Report';
$data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@ -1903,6 +1906,7 @@ class PolicyTransactionController extends BaseController
public function reportVarience()
{
$data['tab_name'] = 'Variance Report';
$data['page_name'] = 'Variance Report';
$data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@ -1952,6 +1956,7 @@ class PolicyTransactionController extends BaseController
public function reportBusinessList()
{
$data['tab_name'] = 'Business Report';
$data['page_name'] = 'Business Report';
$data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@ -1992,6 +1997,7 @@ class PolicyTransactionController extends BaseController
public function reportFinanceList()
{
$data['tab_name'] = 'Finance Report';
$data['page_name'] = 'Finance Report';
$data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@ -2032,6 +2038,7 @@ class PolicyTransactionController extends BaseController
public function reportOutstanding()
{
$data['tab_name'] = 'Outstanding Report';
$data['page_name'] = 'Outstanding Report';
$data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@ -2110,6 +2117,7 @@ class PolicyTransactionController extends BaseController
->findAll();
// dd( $this->insurerStatements->getLastQuery());
$data['tab_name'] = 'Statement Upload';
$data['page_name'] = 'Statement Upload';
$this->loadLayout('insurer_statement_list', $data);
@ -2687,8 +2695,8 @@ class PolicyTransactionController extends BaseController
$data['files'] = array_merge($pt_files, $kyc_files, $batch_files, $files);
// dd($data['files']);
}
$data['page_name'] = 'Documents Search';
$data['tab_name'] = 'Documents Search';
$data['page_name'] = 'Documents';
$data['customers'] = $this->clientModel->select('id,client_name,short_name as display_value')->where('is_active', 1)->get()->getResultarray();
$data['policies'] = $this->clientPolicyModel->select("client_policy.id,client_policy.policy_no,policy_type.policy_type,concat(policy_type.policy_type,' - ',client_policy.policy_no) as display_value")

View File

@ -134,6 +134,8 @@ class ThzController extends BaseController
public function ticketList()
{
$data['tab_name'] = "Tickets";
$data['page_name'] = "Tickets";
try {
$returnType = strtolower($this->request->getGet('return_type') ?? 'api');
@ -152,8 +154,6 @@ class ThzController extends BaseController
throw new \RuntimeException('No tickets found', 400);
}
} else {
$data['page_name'] = "Tickets";
$data['ticket_data'] = $tickets;
$data['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['2', '3', '4'])->findAll(); // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu
// 2,3,4 remain person varannum.

View File

@ -362,6 +362,7 @@ class TicketController extends BaseController
$data['modeOFIntimate'] = $this->modeOFIntimate;
$data['priorityType'] = $this->priorityType;
$data['claimType'] = $this->claimType;
$data['tab_name'] = "Claims";
if ($this->request->is('get')) {
$data['page_name'] = "Claims";
$data['claim_status'] = $this->claimStatus->select('id,ticket_type,claim_status')->where('is_active', 1)->findAll();
@ -1744,6 +1745,8 @@ class TicketController extends BaseController
'tat_band_wise' => 'TAT Wise Status Report'
];
//
$data['tab_name'] = "Claim Reports";
$data['page_name'] = "Claims";
$this->loadLayout('ticket_reports', $data);
} else {
$received_data = $this->request->getPost();
@ -2610,7 +2613,8 @@ class TicketController extends BaseController
public function claimDumpUpload()
{
$data['page_name'] = "Claim Dupm Upload";
$data['tab_name'] = "Claim Dupm Upload";
$data['page_name'] = "Claims";
if($this->request->is('get')){

View File

@ -55,7 +55,8 @@ class UserController extends AdminController
public function list()
{
$data['page_name'] = 'User';
$data['tab_name'] = 'Users';
$data['page_name'] = 'Users';
$this->myLogger->logme('error','User list function called');
$data['UserList'] = $this->userModel->getUserList();
// echo '<pre>';

View File

@ -348,11 +348,11 @@ table.dataTable tbody td {
<div class="col-12">
<div class="card">
<div class="card-body maincard">
<div class="row" style="margin-bottom:1rem;">
<!-- <div class="row" style="margin-bottom:1rem;">
<div class="col-6" style="align-self: center;">
<h4 style="position: relative;">Users</h4>
</div>
</div>
</div> -->
<table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="1" id="user-table">
<thead class="bg-light">
<tr>

View File

@ -56,16 +56,16 @@ table.dataTable thead th {
<div class="col-12">
<div class="card">
<div class="card-body maincard">
<div class="row" style="margin-bottom:1rem;">
<!-- <div class="row" style="margin-bottom:1rem;">
<div class="col-6" style="align-self: center;">
<h4 style="position: relative;">CD Master</h4>
</div>
<div class="col-6" style="text-align: right; position: relative;top: 56px;">
<!-- <button type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light"
<!- <button type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light"
data-toggle="modal" data-target="#con-close-modal" data-placement="top" title="Add"
data-trigger="hover">ADD</button> -->
data-trigger="hover">ADD</button> ->
</div>
</div>
</div> -->
<table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap text-custom-black text-custom app-datatable">
<thead class="app-table-head">

View File

@ -1,6 +1,6 @@
<style>
.table th,
/* .table th,
.table td {
padding: 8px;
}
@ -11,7 +11,7 @@ table.dataTable tbody td {
table.dataTable thead th {
padding: 4px 4px !important;
}
} */
.col-12{
@ -74,18 +74,18 @@ table.dataTable thead th {
<div class="col-12">
<div class="card">
<div class="card-body">
<div class="row" style="margin-bottom:1rem;">
<div class="col-6" style="align-self: center;">
<!-- <div class="row" style="margin-bottom:1rem;">-->
<!-- <div class="col-6" style="align-self: center;">
<h4 style="position: relative;">Client</h4>
</div>
</div> -->
<!-- <div class="col-2" style="text-align: right; position: relative;top: 56px; left: 303px;">
<a class="btn btn-primary waves-effect waves-light" onclick="showModal()">Add From Lead</a>
</div>
<div class="col-1" style="text-align: right; position: relative;top: 56px; left: 294px;">
<a href="<?= base_url("client/create"); ?>" type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="" data-placement="top" title="Add" data-trigger="hover">Add</a>
</div> -->
</div>
<table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
<!-- </div>-->
<table data-custom-table-css="table" class="table table-sm m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
id="tickets-table">
<thead class="bg-light">
<tr>

View File

@ -44,11 +44,11 @@
<div class="col-12">
<div class="card">
<div class="card-body maincard">
<div class="row" style="margin-bottom:1rem;">
<!-- <div class="row" style="margin-bottom:1rem;">
<div class="col-6" style="align-self: center;">
<h4 style="position: relative;">Insurers</h4>
</div>
</div>
</div> -->
<table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
id="tickets-table">
<thead class="bg-light">

View File

@ -44,11 +44,11 @@
<div class="col-12">
<div class="card">
<div class="card-body maincard">
<div class="row" style="margin-bottom:1rem;">
<!-- <div class="row" style="margin-bottom:1rem;">
<div class="col-6" style="align-self: center;">
<h4 style="position: relative;">KYC</h4>
</div>
</div>
</div> -->
<table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
id="tickets-table">
<thead class="bg-light">

View File

@ -160,6 +160,16 @@
<script>
$(document).ready(function () {
var defaultTitle = `<h5>Welcome <?= esc(get_session_userdata()->first_name ?? 'NOT SET') ?></h5>`;
var pageName = "<?= esc($page_name ?? '') ?>";
var titleHtml = (pageName && pageName !== "Dashboard")
? `<h5>${pageName}</h5>`
: defaultTitle;
$(".top-navbar-title").html(titleHtml);
$('#collapseOne').on('show.bs.collapse', function () {
// When open
$('#icon').removeClass('mdi-chevron-down').addClass('mdi-chevron-up');

View File

@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<title><?= isset($page_name) ? $page_name : 'NHance'; ?></title>
<title><?= isset($tab_name) ? $tab_name : 'NHance'; ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta content="" name="description" />
<meta content="NHANCE" name="NHANCE" />
@ -1959,7 +1959,7 @@
<!-- End of Top Bar -->
<br>
<!-- <br> -->
<!-- ============================================================== -->

View File

@ -4,6 +4,7 @@
}
</style>
<div class="row" id="lead_filter_div">
<div class="col-12" style="margin-top: -12px;">
<div id="accordion" class="mb-3">

View File

@ -78,11 +78,11 @@
<a href="<?= base_url("master/policy/create"); ?>" type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="" data-placement="top" title="Add" data-trigger="hover">ADD</a>
</div>
</div> -->
<div class="row" style="margin-bottom:1rem;">
<!-- <div class="row" style="margin-bottom:1rem;">
<div class="col-6" style="align-self: center;">
<h4 style="position: relative;">Policy</h4>
</div>
</div>
</div> -->
<table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
id="tickets-table">
<thead class="bg-light">

View File

@ -1,5 +1,5 @@
<div class="row">
<h3 class="ml-3">Claim Reports</h3>
<!-- <h3 class="ml-3">Claim Reports</h3> -->
<div class="col-xl-12">
<div id="accordion" class="mb-3">
<div class="card mb-1">

View File

@ -44,11 +44,11 @@
<div class="col-12">
<div class="card">
<div class="card-body maincard">
<div class="row" style="margin-bottom:1rem;">
<!-- <div class="row" style="margin-bottom:1rem;">
<div class="col-6" style="align-self: center;">
<h4 style="position: relative;">TPA</h4>
</div>
</div>
</div> -->
<table data-custom-table-css="table" class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
id="tickets-table">
<thead class="bg-light">

View File

@ -66,11 +66,11 @@ table.dataTable tbody td {
<div class="col-12">
<div class="card">
<div class="card-body maincard">
<div class="row" style="margin-bottom:1rem;">
<!-- <div class="row" style="margin-bottom:1rem;">
<div class="col-6" style="align-self: center;">
<h4 style="position: relative;">Vehicle Master</h4>
</div>
</div>
</div> -->
<table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
<thead class="bg-light">
<tr>