diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 34426123..041caaa3 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -114,6 +114,7 @@ $routes->group("/client", ["filter" => "authMVC"], function ($routes) {
$routes->group("terms", ["filter" => "authMVC"], function ($routes) {
$routes->post("gpa_create", "ClientController::policyGPATerms");
$routes->post("edit", "ClientController::editClientPolicyPremium");
+ $routes->post("other_terms", "ClientController::otherPolicyTermsFormSubmit");
});
});
@@ -244,6 +245,9 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) {
$routes->get("delete-additional-rack-rate/(:any)", "ClientController::deleteAdditionalRackRate/$1");
$routes->get("check_cd_ac_no/(:any)", "MasterController::checkUniqueCDAccountNumber/$1");
$routes->get("get_cd_ac/(:any)", "ClientController::get_cd_ac/$1");
+ $routes->get("check_policy_type/(:any)", "ClientController::checkPolicyType/$1");
+ $routes->get("getPolicyTerms/(:any)", "ClientController::getPolicyTerms/$1");
+ $routes->get("getPolicyTermsFormJson/(:any)", "ClientController::getPolicyTermsFormJson/$1");
});
$routes->cli('cli/processjob', 'JobWorker::processJob');
diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 2dbe4d60..13be8344 100644
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -32,6 +32,8 @@ use App\Models\EmployeeModel;
use App\Models\EmployeePolicyModel;
use App\Models\NotificationModel;
use App\Models\CDMasterModel;
+use App\Models\PolicyTypeModel;
+
@@ -65,13 +67,14 @@ class ClientController extends AdminController
protected $employeePolicyModel;
protected $notificationModel;
protected $CDMasterModel;
+ protected $policyTypeModel;
public function __construct()
{
set_session_context('Client');
$this->myLogger = \Config\Services::mylogger();
-
+
$this->clientModel = new ClientModel();
$this->userModel = new UserModel();
$this->clientBranchModel = new ClientBranchModel();
@@ -93,8 +96,10 @@ class ClientController extends AdminController
$this->policyPremium2Model = new PolicyPremium2Model();
$this->employeeModel = new EmployeeModel();
$this->employeePolicyModel = new EmployeePolicyModel();
- $this->notificationModel = new NotificationModel();
- $this->CDMasterModel = new CDMasterModel();
+ $this->notificationModel = new NotificationModel();
+ $this->CDMasterModel = new CDMasterModel();
+ $this->policyTypeModel = new PolicyTypeModel();
+
@@ -613,22 +618,13 @@ class ClientController extends AdminController
$policy_type_id = $this->request->getPost('policy_type_id');
$client_branch_id = $this->request->getPost('client_branch_id');
-
- $policyCount = $this->clientPolicyModel
- ->where('policy_type_id', $policy_type_id)
- ->where('client_branch_id', $client_branch_id)
- ->countAllResults();
-
- if($policyCount > 0 ){
- $clientPoliceData = $this->clientPolicyModel->getClientPolicyByClientId($this->request->getPost('client_id'));
- return $this->respond(['status' => 'policy_exist','code' => 200,'data' => $clientPoliceData, 'method' => 'CERATE'], 200);
- }
-
- $insurerValue = (string) $this->request->getPost('insurer');
- list($insurerBranchId, $insurerId) = explode('-', $insurerValue);
$client_id = $this->request->getPost('client_id');
+ $insurerValue = (string) $this->request->getPost('insurer');
+ list($insurerBranchId, $insurerId) = explode('-', $insurerValue);
+
+
$data['insurer_branch_id'] = $insurerBranchId;
$data['insurer_id'] = $insurerId;
@@ -911,6 +907,24 @@ class ClientController extends AdminController
$policyPremium = $this->policyPremium1Model->insert($data);
}
+ }else if ($si_or_bp == '2') {
+
+ $premium = str_replace(',', '', $this->request->getPost('gpa_basic_premium[]'));
+ $sum_insure = str_replace(',', '', $this->request->getPost('gpa_basic_si[]'));
+ $basic_pay = str_replace(',', '', $this->request->getPost('basic_pay[]'));
+
+ for ($i = 0; $i < count($premium); $i++) {
+
+ $data['si_or_bp'] = $this->request->getPost('si_or_bp');
+ $data['basic_multiplier'] = str_replace(',', '', $this->request->getPost('basic_multiplier'));
+ $data['multiplier'] = $this->request->getPost('premium_multiplier');
+ $data['basic_pay'] = $basic_pay[$i];
+ $data['si'] = $sum_insure[$i];
+ $data['premium'] = $premium[$i];
+
+ $policyPremium = $this->policyPremium1Model->insert($data);
+ }
+
}else {
$data['premium'] = str_replace(',', '', $this->request->getPost('gpa_basic_premium'));
@@ -1205,19 +1219,11 @@ class ClientController extends AdminController
$emp_count = $this->employeePolicyModel
- ->join('client_policy cp', "cp.id = employee_polices.client_policy_id")
- ->where("employee_polices.client_policy_id", $client_policy_id)
- ->where("employee_polices.status", 'active')
- ->where("employee_polices.is_active", 1)
- ->countAllResults();
-
- // $emp_count = count($data);
-
- // if($emp_count == 0){
- // $emp_count = true;
- // }else{
- // $emp_count = false;
- // }
+ ->join('client_policy cp', "cp.id = employee_polices.client_policy_id")
+ ->where("employee_polices.client_policy_id", $client_policy_id)
+ ->where("employee_polices.status", 'active')
+ ->where("employee_polices.is_active", 1)
+ ->countAllResults();
$data = $this->policesModel->getPolicyPremium($record['policy_id']);
@@ -1225,9 +1231,11 @@ class ClientController extends AdminController
$gmc_pattern = '/gmc/i';
$gpa_pattern = '/gpa/i';
$subject = $data[0]->policy_type;
+ $policy_type_id = $data[0]->id;
+
if (preg_match($gmc_pattern, $subject)) {
$search_term = 'GMC';
- } else if (preg_match($gpa_pattern, $subject)) {
+ } else if (preg_match($gpa_pattern, $subject) || $policy_type_id == 6 || $policy_type_id == 7) {
$search_term = 'GPA';
} else {
$search_term = "";
@@ -1235,7 +1243,7 @@ class ClientController extends AdminController
$results = $this->policyGridModel->like('policy_type', $search_term)->findAll();
- if ($search_term === 'GPA') {
+ if ($search_term === 'GPA' || $policy_type_id == 6 || $policy_type_id == 7) {
$premiumData = $this->policyPremium1Model->where(['client_id' => $record['client_id'], 'client_policy_id' => $client_policy_id, 'is_active' => 1])->findAll();
} else if ($search_term === 'GMC') {
@@ -1246,9 +1254,6 @@ class ClientController extends AdminController
$premiumData = "";
}
-
-
-
// echo '
';
// print_r($premiumData); die;
@@ -1322,7 +1327,7 @@ class ClientController extends AdminController
return $this->respond(['status' => true, 'code' => 200, 'data' => $resultss, 'premiumData' => json_encode($premiumDataa), 'count' => $emp_count, 'policy_name' => $policy_name, 'family_floater' => $family_floater, 'self' => $self, 'client_policy_id' => $client_policy_id], 200);
- } else if ($search_term === 'GPA') {
+ } else if ($search_term === 'GPA' || $policy_type_id == 6 || $policy_type_id == 7) {
return $this->respond(['status' => true, 'code' => 200, 'data' => $results, 'premiumData' => json_encode($premiumData), 'count' => $emp_count, 'policy_name' => $policy_name, 'family_floater' => $family_floater, 'self' => $self, 'client_policy_id' => $client_policy_id], 200);
} else {
@@ -1343,7 +1348,7 @@ class ClientController extends AdminController
$data['sum_insured'] =str_replace(',', '',$this->request->getPost("sum_insured"));
$data['family_floater'] =$this->request->getPost("family_floater") ? $this->request->getPost("family_floater") : 0;
- $data['corporatebuffer'] = $this->request->getPost("corporatebuffer") ? $this->request->getPost("corporatebuffer") : 0;
+ // $data['corporatebuffer'] = $this->request->getPost("corporatebuffer") ? $this->request->getPost("corporatebuffer") : 0;
$data['family_floaters'] = $this->request->getPost("family_floaters") ?? [];
$data['age_ratio']['self']['min'] = $this->request->getPost("self_min_age") ? $this->request->getPost("self_min_age") :0;
@@ -1455,7 +1460,7 @@ class ClientController extends AdminController
$data['bioabsorbablestenttoriclensmultifocallens'] =$this->request->getPost("bioabsorbablestenttoriclensmultifocallens");
$data['roomrentlimit'] =str_replace(',', '',$this->request->getPost("roomrentlimit"));
$data['proportionatedeductionclause'] =str_replace(',', '',$this->request->getPost("proportionatedeductionclause"));
- $data['nursingallowance'] =str_replace(',', '',$this->request->getPost("nursingallowance"));
+ // $data['nursingallowance'] =str_replace(',', '',$this->request->getPost("nursingallowance"));
$data['ailmentcapping'] =str_replace(',', '',$this->request->getPost("ailmentcapping"));
$data['ambulancecharges'] =str_replace(',', '',$this->request->getPost("ambulancecharges"));
$data['airambulance'] =str_replace(',', '',$this->request->getPost("airambulance"));
@@ -1463,6 +1468,12 @@ class ClientController extends AdminController
$data['reasonableandcustomarycharges'] =str_replace(',', '',$this->request->getPost("reasonableandcustomarycharges"));
$data['ayudhtreatmentcover'] =str_replace(',', '',$this->request->getPost("ayudhtreatmentcover"));
+ $data['congenitaldiseasesexternal'] =str_replace(',', '',$this->request->getPost("congenitaldiseasesexternal"));
+ $data['optionalparentalcopay'] =str_replace(',', '',$this->request->getPost("optionalparentalcopay"));
+ $data['posthospitalizationcover'] =str_replace(',', '',$this->request->getPost("posthospitalizationcover"));
+ $data['corporatebuffer'] =str_replace(',', '',$this->request->getPost("corporatebuffer"));
+ $data['sublimitofcorporatebuffer'] =str_replace(',', '',$this->request->getPost("sublimitofcorporatebuffer"));
+
if ($data['ayudhtreatmentcover'] == 1) {
$data['ayushTreatmentCoverData'] = str_replace(',', '',$this->request->getPost("ayushTreatmentCoverData"));
}else{
@@ -1483,6 +1494,7 @@ class ClientController extends AdminController
$data['days_from_dod'] =str_replace(',', '',$this->request->getPost("days_from_dod"));
$data['special_condition_label'] = str_replace(',', '',$this->request->getPost("special_condition_label")) ?? [];
$data['special_condition_input'] = str_replace(',', '',$this->request->getPost("special_condition_input")) ?? [];
+ $data['multiple_sum_insured'] = str_replace(',', '',$this->request->getPost("multiple_sum_insured")) ?? [];
$data['cataract'] =str_replace(',', '',$this->request->getPost("cataract"));
@@ -1537,16 +1549,22 @@ class ClientController extends AdminController
// ->where("employees.emp_status",'active')
// ->countAllResults();
- $emp_count_by_policy = $this->employeePolicyModel->where('client_policy_id',$client_policy_id)->where('is_active',1)->countAllResults();
+ $emp_count_by_policy = $this->employeePolicyModel
+ ->where('client_policy_id',$client_policy_id)
+ ->where("status", 'active')
+ ->where('is_active',1)
+ ->countAllResults();
- // if($emp_count == 0){
- // $emp_count = true;
- // }else{
- // $emp_count = false;
- // }
if ($record) {
- return $this->respond(['Status' => true,'code' => 200,'data' => $record['policy_terms'], 'policy_name' => $policy_name,'policy_addon' => $record['is_addon'], 'emp_count_by_policy'=>$emp_count_by_policy], 200);
+ return $this->respond([
+ 'Status' => true,
+ 'code' => 200,
+ 'data' => $record['policy_terms'],
+ 'policy_name' => $policy_name,
+ 'policy_addon' => $record['is_addon'],
+ 'emp_count_by_policy'=>$emp_count_by_policy],
+ 200);
} else {
return $this->respond(['Status' => false,'code' => 200,'message' => 'Record not found.', 'policy_name' => $policy_name], 200);
}
@@ -1612,6 +1630,8 @@ class ClientController extends AdminController
$data['worldwideCover'] = $this->request->getPost("worldwideCover");
$data['gpa_special_condition_label'] = str_replace(',', '',$this->request->getPost("gpa_special_condition_label")) ?? [];
$data['gpa_special_condition_input'] = str_replace(',', '',$this->request->getPost("gpa_special_condition_input")) ?? [];
+ $data['multiple_sum_insured'] = str_replace(',', '',$this->request->getPost("multiple_sum_insured")) ?? [];
+
$jsonData = json_encode($data);
@@ -2157,4 +2177,70 @@ class ClientController extends AdminController
}
+ public function otherPolicyTermsFormSubmit()
+ {
+
+ $client_policy_id = $this->request->getPost("client_policy_id");
+ $policy_terms = $this->request->getPost("policy_terms");
+
+ $record = $this->clientPolicyModel->where('id', $client_policy_id)->first();
+
+ if ($record) {
+
+ $update = $this->clientPolicyModel->where('id', $client_policy_id)->set('policy_terms', $policy_terms)->update();
+
+ if ($update) {
+ return $this->respond(['status' => true, 'code' => 200, 'message' => 'Data updated successfully', 'client_policy_id' => $client_policy_id], 200);
+ } else {
+ return $this->respond(['status' => false, 'code' => 404, 'message' => 'Failed to update data', 'formdata' => $this->request->getPost()], 200);
+ }
+ } else {
+
+ return $this->respond(['status' => false, 'code' => 404, 'message' => 'Failed to store data. The client policy does not exist', 'formdata' => $this->request->getPost()], 200);
+ }
+ }
+
+
+ public function checkPolicyType($client_policy_id, $policy_type_id, $client_branch_id, $client_id){
+
+ $policyCount = $this->clientPolicyModel
+ ->where('policy_type_id', $policy_type_id)
+ ->where('client_branch_id', $client_branch_id)
+ ->where('client_id', $client_id)
+ ->countAllResults();
+
+ if($policyCount > 0 ){
+ $clientPoliceData = $this->clientPolicyModel->getClientPolicyByClientId($client_id);
+ return $this->respond(['status' => true,'code' => 200, 'count' => $policyCount, 'data' => $clientPoliceData, 'method' => 'CERATE' ,'client_id' => $client_id, 'client_branch_id' => $client_branch_id, 'policy_type_id' => $policy_type_id], 200);
+ }else{
+ return $this->respond(['status' => false,'code' => 200,'client_id' => $client_id, 'client_branch_id' => $client_branch_id, 'policy_type_id' => $policy_type_id], 200);
+ }
+
+ }
+
+
+ public function getPolicyTerms($client_policy_id){
+
+ $policy_terms = $this->clientPolicyModel->where('id', $client_policy_id)->first();
+
+ if(isset($policy_terms['policy_terms']) && $policy_terms['policy_terms'] != null){
+
+ $JSON = json_decode($policy_terms['policy_terms']);
+ $si = $JSON->sum_insured ?? $JSON->sumInsured2;
+ $multi_si = $JSON->multiple_sum_insured;
+ $multi_si[] = $si;
+ }else{
+ $$multi_si = [];
+ }
+
+ return $this->respond(['status' => true, 'data'=>$multi_si], 200);
+ }
+
+
+ public function getPolicyTermsFormJson($policy_type_id){
+
+ $JSON = $this->policyTypeModel->where('id', $policy_type_id)->first();
+ return $this->respond(['status' => true, 'data' => $JSON], 200);
+ }
+
}
\ No newline at end of file
diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php
index 2d0febe4..3cb36091 100644
--- a/app/Controllers/EmpDataServiceController.php
+++ b/app/Controllers/EmpDataServiceController.php
@@ -145,7 +145,8 @@ class EmpDataServiceController extends BaseController
if($cash_balance == null){
- $cash_balance = $this->CDMasterModel->where('client_id', $export_data['client_id'])->where('insurer_id', $insurer_id['insurer_id'])->orderBy('id', 'DESC')->first();
+ $balance = $this->CDMasterModel->where('client_id', $export_data['client_id'])->where('insurer_id', $insurer_id['insurer_id'])->orderBy('id', 'DESC')->first();
+ $cash_balance['balance'] = $balance['opening_bal'];
}
@@ -198,7 +199,7 @@ class EmpDataServiceController extends BaseController
'NAME OF EMP/DEP',
'EMP ID',
'EMP/DEP TYPE',
- 'RELATION',
+ 'RELATIONSHIP CODE',
'DOB',
'GENDER',
'PRE EXISTING AILMENTS',
@@ -683,7 +684,7 @@ class EmpDataServiceController extends BaseController
unset($excel_data[0]);
array_pop($excel_data);
- $inceptionHeader = ['S.No', 'NAME OF EMP/DEP','EMP ID','EMP/DEP TYPE','RELATION','DOB','GENDER','PRE EXISTING AILMENTS','BASIC COVER SI','DATE OF COVERAGE','AGE','RELATIONSHIP','REMARKS','POLICY END DATE','NO OF DAYS','TPA ID','UHID','PREMIUM','PR0 RATA PREMIUM','GST','TOTAL'];
+ $inceptionHeader = ['S.No', 'NAME OF EMP/DEP','EMP ID','EMP/DEP TYPE','RELATIONSHIP CODE','DOB','GENDER','PRE EXISTING AILMENTS','BASIC COVER SI','DATE OF COVERAGE','AGE','RELATIONSHIP','REMARKS','POLICY END DATE','NO OF DAYS','TPA ID','UHID','PREMIUM','PR0 RATA PREMIUM','GST','TOTAL'];
foreach ($inceptionHeader as $key => $value) {
if($excel_header[$key] != $value){
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 61c66278..80571810 100644
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -772,13 +772,9 @@ class EmployeeController extends AdminController
->findAll();
$emp_count = count($data);
-
- if ($data) {
- return $this->respond(['dataStatus' => true, 'code' => 200, 'emp_count' => $emp_count], 200);
- } else {
-
- return $this->respond(['dataStatus' => false, 'code' => 404], 404);
- }
+ $events = ['inception' => 'Inception (Employee + Dependents)', 'addition' => 'Addition (Employee + Dependents)', 'dependent_addition' => 'Dependent Addition (Only Dependents)', 'deletion' => 'Deletion', 'correction' => 'Correction', 'si_enhancement' => 'SI Enhancement'];
+ return $this->respond(['dataStatus' => true, 'code' => 200, 'emp_count' => $emp_count, 'events' => $events, 'client_policy_id' => $id], 200);
+
}
diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php
index ed6bf76e..3be910e8 100644
--- a/app/Controllers/EmployeeServiceController.php
+++ b/app/Controllers/EmployeeServiceController.php
@@ -36,7 +36,7 @@ class EmployeeServiceController extends AdminController
protected $empEndorsementModel;
protected $messageModel;
protected $general_relationships = ['self' => ['name' => 'Self', 'gender' => 'M','age_min' => 18,'age_max' => null], 'spouse' => ['name' => 'Spouse', 'gender' => 'F','age_min' => 18,'age_max' => null], 'son' => ['name' => 'Son', 'gender' => 'M','age_min' => null,'age_max' => 25], 'daughter' => ['name' => 'Daughter', 'gender' => 'F','age_min' => null,'age_max' => 25], 'father' => ['name' => 'Father', 'gender' => 'M','age_min' => 18,'age_max' => null], 'mother' => ['name' => 'Mother', 'gender' => 'F','age_min' => 18,'age_max' => null], 'father-in-law' => ['name' => 'Father in Law', 'gender' => 'M','age_min' => 18,'age_max' => null], 'mother-in-law' => ['name' => 'Mother in Law', 'gender' => 'F','age_min' => 18,'age_max' => null]];
- protected $inception_excel_columns = ['sno'=>['col_idx'=>0,'col_cell_name'=>'A','col_name'=>'S.No','is_mandatory'=>true,'data_type'=>'str','format'=>null,'allowed_values'=>null],'emp_id'=>['col_idx'=>1,'col_cell_name'=>'B','col_name'=>'EMP ID','is_mandatory'=>true,'data_type'=>'str','format'=>null,'allowed_values'=>null],'name_of_emp_dep'=>['col_idx'=>2,'col_cell_name'=>'C','col_name'=>'NAME OF EMP/DEP','is_mandatory'=>true,'data_type'=>'str','format'=>null,'allowed_values'=>null],'dob'=>['col_idx'=>3,'col_cell_name'=>'D','col_name'=>'DOB','is_mandatory'=>['I','A','DA'],'data_type'=>'str','format'=>'d-M-Y','allowed_values'=>null,'custom'=>'check_dob_diff','params'=>['row','relationship','default_age_ratio']],'gender'=>['col_idx'=>4,'col_cell_name'=>'E','col_name'=>'Gender','is_mandatory'=>['I','A','DA'],'data_type'=>'str','format'=>null,'allowed_values'=>['M','F']],'relationship'=>['col_idx'=>5,'col_cell_name'=>'F','col_name'=>'RELATIONSHIP','is_mandatory'=>['I','A','DA'],'data_type'=>'str','format'=>null,'allowed_values'=>null,'custom'=>'check_relationship','params'=>['row','relationship','policy_terms']],'basic_cover_si'=>['col_idx'=>6,'col_cell_name'=>'G','col_name'=>'BASIC COVER SI','is_mandatory'=>['I','A','DA'],'data_type'=>'str','format'=>null,'allowed_values'=>null,'custom' => 'check_si','params' => ['row','policy_terms','slab_details']],'doc'=>['col_idx'=>7,'col_cell_name'=>'H','col_name'=>'Date of Coverage','is_mandatory'=>['A','DA'],'data_type'=>'str','format'=>'d-M-Y','allowed_values'=>null,'params'=>['row']],'doj'=>['col_idx'=>8,'col_cell_name'=>'I','col_name'=>'DOJ','is_mandatory'=>false,'data_type'=>'str','format'=>'d-M-Y','allowed_values'=>null,'custom'=>'check_doj','params'=>['row']],'basic_pay'=>['col_idx'=>9,'col_cell_name'=>'J','col_name'=>'Basic Pay','is_mandatory'=>false,'data_type'=>'str','format'=>null,'allowed_values'=>null,'custom'=>'check_basic_pay','params'=>['row','policy_terms','slab_details']],'band_grade'=>['col_idx'=>10,'col_cell_name'=>'K','col_name'=>'Band/Grade','is_mandatory'=>false,'data_type'=>'str','format'=>null,'allowed_values'=>null,'custom'=>'check_employee_band','params'=>['row','policy_terms','slab_details']],'designation'=>['col_idx'=>11,'col_cell_name'=>'L','col_name'=>'Designation','is_mandatory'=>false,'data_type'=>'str','format'=>null,'allowed_values'=>null],'phone'=>['col_idx'=>12,'col_cell_name'=>'M','col_name'=>'Phone','is_mandatory'=>false,'data_type'=>'str','format'=>null,'allowed_values'=>null,'custom' => 'check_dup_mobileno','params' => ['row','existing_mobilenos']],'email'=>['col_idx'=>13,'col_cell_name'=>'N','col_name'=>'Email','is_mandatory'=>false,'data_type'=>'str','format'=>null,'allowed_values'=>null],'pre_existing_ailments'=>['col_idx'=>14,'col_cell_name'=>'O','col_name'=>'PRE EXISTING AILMENTS','is_mandatory'=>['I','A','DA'],'data_type'=>'str','format'=>null,'allowed_values'=>['0','1']],'change_event'=>['col_idx'=>15,'col_cell_name'=>'P','col_name'=>'Change event','is_mandatory'=>['A','DA','D'],'data_type'=>'str','format'=>null,'allowed_values'=>null],'date_of_exit'=>['col_idx'=>16,'col_cell_name'=>'Q','col_name'=>'Date of exit','is_mandatory'=>['D'],'data_type'=>'str','format'=>'d-M-Y','allowed_values'=>null],'reason_for_exit'=>['col_idx'=>17,'col_cell_name'=>'R','col_name'=>'Reason for exit','is_mandatory'=>['D'],'data_type'=>'str','format'=>null,'allowed_values'=>null]];
+ protected $inception_excel_columns = ['sno'=>['col_idx'=>0,'col_cell_name'=>'A','col_name'=>'S.No','is_mandatory'=>true,'data_type'=>'str','format'=>null,'allowed_values'=>null],'emp_id'=>['col_idx'=>1,'col_cell_name'=>'B','col_name'=>'EMP ID','is_mandatory'=>true,'data_type'=>'str','format'=>null,'allowed_values'=>null],'name_of_emp_dep'=>['col_idx'=>2,'col_cell_name'=>'C','col_name'=>'NAME OF EMP/DEP','is_mandatory'=>true,'data_type'=>'str','format'=>null,'allowed_values'=>null],'dob'=>['col_idx'=>3,'col_cell_name'=>'D','col_name'=>'DOB','is_mandatory'=>['I','A','DA'],'data_type'=>'str','format'=>'d-M-Y','allowed_values'=>null,'custom'=>'check_dob_diff','params'=>['row','relationship','default_age_ratio']],'gender'=>['col_idx'=>4,'col_cell_name'=>'E','col_name'=>'Gender','is_mandatory'=>['I','A','DA'],'data_type'=>'str','format'=>null,'allowed_values'=>['M','F']],'relationship'=>['col_idx'=>5,'col_cell_name'=>'F','col_name'=>'RELATIONSHIP','is_mandatory'=>['I','A','DA'],'data_type'=>'str','format'=>null,'allowed_values'=>null,'custom'=>'check_relationship','params'=>['row','relationship','policy_terms']],'basic_cover_si'=>['col_idx'=>6,'col_cell_name'=>'G','col_name'=>'BASIC COVER SI','is_mandatory'=>null,'data_type'=>'str','format'=>null,'allowed_values'=>null,'custom' => 'check_si','params' => ['row','policy_terms','slab_details']],'doc'=>['col_idx'=>7,'col_cell_name'=>'H','col_name'=>'Date of Coverage','is_mandatory'=>['A','DA'],'data_type'=>'str','format'=>'d-M-Y','allowed_values'=>null,'custom' => 'check_doc','params' => ['row','policy_details']],'doj'=>['col_idx'=>8,'col_cell_name'=>'I','col_name'=>'DOJ','is_mandatory'=>false,'data_type'=>'str','format'=>'d-M-Y','allowed_values'=>null,'custom'=>'check_doj','params'=>['row']],'basic_pay'=>['col_idx'=>9,'col_cell_name'=>'J','col_name'=>'Basic Pay','is_mandatory'=>false,'data_type'=>'str','format'=>null,'allowed_values'=>null,'custom'=>'check_basic_pay','params'=>['row','policy_terms','slab_details']],'band_grade'=>['col_idx'=>10,'col_cell_name'=>'K','col_name'=>'Band/Grade','is_mandatory'=>false,'data_type'=>'str','format'=>null,'allowed_values'=>null,'custom'=>'check_employee_band','params'=>['row','policy_terms','slab_details']],'designation'=>['col_idx'=>11,'col_cell_name'=>'L','col_name'=>'Designation','is_mandatory'=>false,'data_type'=>'str','format'=>null,'allowed_values'=>null],'phone'=>['col_idx'=>12,'col_cell_name'=>'M','col_name'=>'Phone','is_mandatory'=>false,'data_type'=>'str','format'=>null,'allowed_values'=>null,'custom' => 'check_dup_mobileno','params' => ['row','existing_mobilenos']],'email'=>['col_idx'=>13,'col_cell_name'=>'N','col_name'=>'Email','is_mandatory'=>false,'data_type'=>'str','format'=>null,'allowed_values'=>null],'pre_existing_ailments'=>['col_idx'=>14,'col_cell_name'=>'O','col_name'=>'PRE EXISTING AILMENTS','is_mandatory'=>['I','A','DA'],'data_type'=>'str','format'=>null,'allowed_values'=>['0','1']],'change_event'=>['col_idx'=>15,'col_cell_name'=>'P','col_name'=>'Change event','is_mandatory'=>['A','DA','D'],'data_type'=>'str','format'=>null,'allowed_values'=>null],'date_of_exit'=>['col_idx'=>16,'col_cell_name'=>'Q','col_name'=>'Date of exit','is_mandatory'=>['D'],'data_type'=>'str','format'=>'d-M-Y','allowed_values'=>null],'reason_for_exit'=>['col_idx'=>17,'col_cell_name'=>'R','col_name'=>'Reason for exit','is_mandatory'=>['D'],'data_type'=>'str','format'=>null,'allowed_values'=>null]];
protected $deletion_excel_columns = ['sno'=>['col_idx'=>0,'col_cell_name'=>'A','col_name'=>'S.No','is_mandatory'=>true,'data_type'=>'str','format'=>null,'allowed_values'=>null],'emp_id'=>['col_idx'=>1,'col_cell_name'=>'B','col_name'=>'EMP ID','is_mandatory'=>true,'data_type'=>'str','format'=>null,'allowed_values'=>null],'name_of_emp_dep'=>['col_idx'=>2,'col_cell_name'=>'C','col_name'=>'NAME OF EMP/DEP','is_mandatory'=>true,'data_type'=>'str','format'=>null,'allowed_values'=>null],'change_event'=>['col_idx'=>3,'col_cell_name'=>'D','col_name'=>'Change event','is_mandatory'=>['D'],'data_type'=>'str','format'=>null,'allowed_values'=>null],'date_of_exit'=>['col_idx'=>4,'col_cell_name'=>'E','col_name'=>'Date of exit','is_mandatory'=>['D'],'data_type'=>'str','format'=>'d-M-Y','allowed_values'=>null],'reason_for_exit'=>['col_idx'=>5,'col_cell_name'=>'F','col_name'=>'Reason for exit','is_mandatory'=>['D'],'data_type'=>'str','format'=>null,'allowed_values'=>null]];
@@ -350,7 +350,7 @@ class EmployeeServiceController extends AdminController
$relationship = $this->general_relationships;
- if(in_array($file['action'],['inception','addition','dependent_addition']))// the below funcitons are only for I,DA,A
+ if(in_array($file['action'],['inception','addition','dependent_addition','deletion','correction','si_enhancement']))// the below funcitons are only for I,DA,A
{
$employee_data_group_by_family = data_group_by_family($excel_data);
diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php
index ca88b7f1..5dc29d0d 100644
--- a/app/Helpers/excel_util_helper.php
+++ b/app/Helpers/excel_util_helper.php
@@ -143,6 +143,28 @@ if(!function_exists('check_doj'))
}
}
+if(!function_exists('check_doc'))
+{
+
+ function check_doc($row,$policy_details)
+ {
+ if($row['current_action'] != null && $row[7] != null && $row[7] != '' && in_array(strtoupper($row['current_action']), ['A','DA']))// check rule only of action column data available
+ {
+ // dd($policy_details);
+ $date = new DateTime($row[7]);
+ $startDate = new DateTime($policy_details[0]->policy_start_date);
+ $endDate = new DateTime($policy_details[0]->policy_end_date);
+
+ if ($date >= $startDate && $date <= $endDate) {
+ return array('status' => true);
+ } else {
+ return array('status' => false,'error' => 'the given date of coverage is not between policy start/end date');
+ }
+ }
+ else { return array('status' => true); } // in else condition no need to check rule, just return true
+ }
+}
+
if(!function_exists('check_employee_band'))
{
@@ -206,7 +228,7 @@ if(!function_exists('check_si'))
}
// check age slab
- if(in_array(strtoupper($row['current_action']), ['I','A','DA']))
+ if(in_array(strtoupper($row['current_action']), ['I','A','DA']) && strtolower($row['5']) == 'self')
{
if($row[3] != null && DateTime::createFromFormat('d-M-Y', $row[3]) !== false)// dob
{
@@ -236,6 +258,7 @@ if(!function_exists('check_si'))
else
{
$is_age_slab_found = true;// send true if age conditin is not applicable
+ $is_si_found = true;
}//end of check age slab
}// end of for loop
@@ -252,6 +275,12 @@ if(!function_exists('check_si'))
$return_array['error'] = !empty($return_array['error']) ? ($return_array['error'].', '.'Sum insured not configured for this age slab') : 'Sum insured not configured for this age slab';
}
+ if(empty($received_si))
+ {
+ $return_array['status'] = false;
+ $return_array['error'] = "Sum insured value mandantory";
+ }
+
return $return_array;
}
}
@@ -417,6 +446,7 @@ if (!function_exists('name_and_empid_check_in_db'))
$result = ['del' => [],'i' => []];
$client_id = $actionArr['client_id'];
$policy_id = $actionArr['policy_id'];
+ $client_branch_id = $actionArr['client_branch_id'];
$current_action = $actionArr['action'];
foreach ($family_data as $rkey => $row)
@@ -428,6 +458,7 @@ if (!function_exists('name_and_empid_check_in_db'))
->join('employee_polices ep',"cp.id = ep.client_policy_id AND employees.id = ep.employee_id")
->where("cp.id",$policy_id)
->where("employees.client_id",$client_id)
+ ->where("employees.client_branch_id",$client_branch_id)
->where("employees.is_active",1)
->where("employees.emp_status",'active')
->where("ep.is_active",1)
@@ -956,7 +987,7 @@ if (!function_exists('premium_calculation_manager'))
$employee_received_si = $default_si == null ? $emp_data['policy_details']['basic_cover_si'] : $default_si;
foreach ($temp_slab_rates as $skey => $slab_value)
{
- if($slab_value['si'] == $employee_received_si)
+ if($slab_value['si'] == $employee_received_si && (($slab_value['premium_type'] == 1 && ( strtolower($emp_data['relationship']) == 'self' || $emp_data['temp']['additional_rack_rate_acting_self']) ) || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ))
{
$emp_data['policy_details']['basic_cover_si'] = $slab_value['si'];
$emp_data['policy_details']['date_coverage'] = (isset($emp_data['policy_details']['date_coverage']) ? $emp_data['policy_details']['date_coverage'] : $policy_terms['policy_start_date']);
@@ -979,7 +1010,7 @@ if (!function_exists('premium_calculation_manager'))
foreach ($temp_slab_rates as $skey => $slab_value)
{
$age = calculate_days_bw_dates(from_date: $emp_data['dob'])->y;
- if($slab_value['si'] == $employee_received_si && ($slab_value['age_from'] <= $age && $slab_value['age_to'] >= $age))
+ if($slab_value['si'] == $employee_received_si && ($slab_value['age_from'] <= $age && $slab_value['age_to'] >= $age) && (($slab_value['premium_type'] == 1 && ( strtolower($emp_data['relationship']) == 'self' || $emp_data['temp']['additional_rack_rate_acting_self']) ) || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ))
{
// dd($slab_value);
$emp_data['policy_details']['basic_cover_si'] = $slab_value['si'];
@@ -1000,7 +1031,7 @@ if (!function_exists('premium_calculation_manager'))
foreach ($temp_slab_rates as $skey => $slab_value)
{
$age = calculate_days_bw_dates(from_date: $emp_data['dob'])->y;
- if($slab_value['si'] == $employee_received_si && ($slab_value['age_from'] <= $age && $slab_value['age_to'] >= $age))
+ if($slab_value['si'] == $employee_received_si && ($slab_value['age_from'] <= $age && $slab_value['age_to'] >= $age) && (($slab_value['premium_type'] == 1 && ( strtolower($emp_data['relationship']) == 'self' || $emp_data['temp']['additional_rack_rate_acting_self']) ) || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ))
{
$emp_data['policy_details']['basic_cover_si'] = $slab_value['si'];
$emp_data['policy_details']['date_coverage'] = (isset($emp_data['policy_details']['date_coverage']) ? $emp_data['policy_details']['date_coverage'] : $policy_terms['policy_start_date']);
diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php
index 5d8a2070..2dcac592 100644
--- a/app/Models/EmployeePolicyModel.php
+++ b/app/Models/EmployeePolicyModel.php
@@ -76,7 +76,7 @@ class EmployeePolicyModel extends Model
}
// -----------------------------------------------------------------------------------------------------
- public function getEmployeePolicy($client_id,$policy_id,$status, $branch_id)
+ public function getEmployeePolicy($client_id,$policy_id,$status,$branch_id)
{
$result = $this->select(['employee_polices.*','pm.name as policy_name','im.short_name as insurer_short_name','ib.branch_name as insurer_branch_name','ib.branch_code as insurer_branch_code','tpam.name as tpa_name','tpam.short_name as tpa_short_name','tpab.branch_code as tpa_branch_code','cm.client_name','cm.short_name as client_short_name','emp.relationship','emp.relationship_code','emp.change_event','emp.emp_code','emp.name','emp.email_corporate','emp.dob','emp.gender','emp.emp_status','emp.is_active as emp_is_active','emp.mobile as mobile'])
->join('employees emp', 'employee_polices.employee_id = emp.id')
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 00cb1960..e5626a3a 100644
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -7,8 +7,8 @@
-
-
+
+
| Insurer |
Policy |
@@ -157,6 +157,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/Views/policy_gmc_terms.php b/app/Views/policy_gmc_terms.php
index 2b710321..69a89773 100644
--- a/app/Views/policy_gmc_terms.php
+++ b/app/Views/policy_gmc_terms.php
@@ -110,9 +110,12 @@
-
-
+
+
+
+
+
@@ -120,6 +123,8 @@
+
+
@@ -184,21 +189,19 @@
-
-
+
+
+
+
+
+
+
+
+
@@ -315,6 +327,15 @@
+
+
+
+
+
+
+
+
+
@@ -323,6 +344,29 @@
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -615,7 +677,7 @@
// $('input[name="family_floater"]').change(function() {
- // console.log($(this).val());
+ // //console.log($(this).val());
// if ($(this).val() == '1') {
// var element = $(this).parent().next()[0];
// $(element).css("display", "block");
@@ -631,7 +693,7 @@
$('input[name="ayudhtreatmentcover"]').change(function() {
- console.log($(this).val());
+ ////console.log($(this).val());
if ($(this).val() == '1') {
var element = $(this).parent().parent().next()[0];
@@ -645,7 +707,7 @@
$('input[name="cataract"]').change(function() {
- console.log($(this).val());
+ //console.log($(this).val());
if ($(this).val() == '1') {
var element = $(this).parent().parent().next()[0];
@@ -715,7 +777,7 @@
}
if (!isValid) {
- console.log('Form is Empty', 'Warning');
+ //console.log('Form is Empty', 'Warning');
return;
}
@@ -751,7 +813,7 @@
setTimeout(function() {
$('.loader').fadeOut();
$('.loader-mask').delay(350).fadeOut('slow');
- console.log('Something Wrong!', 'warning');
+ //console.log('Something Wrong!', 'warning');
}, 1000);
}
});
@@ -773,14 +835,15 @@
$('body').on('click', '.btnPolicyMaster', function() {
var client_policy_id = $(this).data('id');
- console.log('gmc_client_policy_id :', client_policy_id);
+ //console.log('gmc_client_policy_id :', client_policy_id);
$('#gmc_client_policy_id').val(client_policy_id)
$('.removeDom').remove();
+ $('#gmc_si_add_more').empty();
var gmc_policy_type_id = $(this).attr('id');
- // console.log(gmc_policy_type_id)
+ // //console.log(gmc_policy_type_id)
if (gmc_policy_type_id == 'GMC') {
@@ -798,10 +861,10 @@
client_policy_id: client_policy_id
},
success: function(response) {
- console.log('response', response);
+ //console.log('response', response);
- // console.log('count', response.count);
+ // //console.log('count', response.count);
setTimeout(function() {
$('.loader').fadeOut();
$('.loader-mask').delay(350).fadeOut('slow');
@@ -809,18 +872,18 @@
$('#nameOfThePolicyInGMC').html(' - ' + response.policy_name.name);
$('gmc_emp_count').val(response.count);
- // console.log('count--1', response.count);
+ // //console.log('count--1', response.count);
// $('emp_count').val(response.count)
// if (response && response.hasOwnProperty('count')) {
// if (response.count === false) {
- // console.log('count -- 2', response.count);
- // console.log(document.getElementById('btnGridSubmit1'))
+ // //console.log('count -- 2', response.count);
+ // //console.log(document.getElementById('btnGridSubmit1'))
// $("#btnGridSubmit1").hide();
// $("#myButtonSpecialCondition").hide();
// } else {
// $("#btnGridSubmit1").show();
// $("#myButtonSpecialCondition").show();
- // console.log('count -- ', response.count);
+ // //console.log('count -- ', response.count);
// }
// } else {
// console.error('Response object does not have a "count" property or is invalid.');
@@ -849,13 +912,13 @@
}
}
- console.log('key', key)
+ //console.log('key', key)
let elements = document.getElementsByName(`${key}[]`);
- console.log(elements)
+ //console.log(elements)
if (elements) {
elements.forEach((element, index) => {
- console.log()
+ //console.log()
if(jsonObject[key][index] == undefined){
element.value = " ";
}else{
@@ -865,12 +928,19 @@
}
}
+
+ if (key.includes("multiple_sum_insured")) {
+ jsonObject[key].forEach((value, index) => {
+ appendGMCSIAddMore(value);
+ });
+ }
+
if (key.includes("family_floaters")) {
let checkboxes = document.querySelectorAll(`input[name="${key}[]"]`);
if (jsonObject[key]) {
- console.log(jsonObject[key]);
- // console.log(jsonObject[key]);
+ //console.log(jsonObject[key]);
+ // //console.log(jsonObject[key]);
if (jsonObject[key].childrens) {
$('#children').val(jsonObject[key].childrens);
}
@@ -916,8 +986,11 @@
$('.waiverof1234thyearexclusions').prop('disabled', true);
$('.waiverof30dayswaitingperiod').prop('disabled', true);
$('#prehospitalizationcover').prop('disabled', true);
+ $('#posthospitalizationcover').prop('disabled', true);
$('.congenitaldiseasesinternal').prop('disabled', true);
+ $('#congenitaldiseasesexternal').prop('disabled', true);
$('#copayzonewisecopay').prop('disabled', true);
+ $('#optionalparentalcopay').prop('disabled', true);
$('#bioabsorbablestenttoriclensmultifocallens').prop('disabled', true);
$('#roomrentlimit').prop('disabled', true);
$('#proportionatedeductionclause').prop('disabled', true);
@@ -939,6 +1012,8 @@
$('#moderntreatmentsasperirdai').prop('disabled', true);
$('#days_of_discharge').prop('disabled', true);
$('#days_from_dod').prop('disabled', true);
+ $('#corporatebuffer').prop('disabled', true);
+ $('#sublimitofcorporatebuffer').prop('disabled', true);
setTimeout(function() {
var editor1 = new Jodit('#additionalsicknessbenefit');
@@ -998,7 +1073,7 @@
pTag.innerHTML = jsonObject[key]; // Add your new content inside the
tag
}
}
- // console.log(jsonObject[key]);
+ // //console.log(jsonObject[key]);
} else {
if(jsonObject[key] == undefined){
@@ -1027,7 +1102,8 @@
});
}
$("#sum_insured").trigger("keyup");
-
+ $(".multiple_sum_insured").trigger("keyup");
+
$('.jodit-wysiwyg').each(function() {
$(this).click();
});
@@ -1047,8 +1123,8 @@
$('.spouse-age').css('display','none');
}
- console.log("child ");
- console.log($('#children').val());
+ //console.log("child ");
+ //console.log($('#children').val());
if($('#children').val() != 0){
$('.child-age').css('display','');
@@ -1087,7 +1163,7 @@
setTimeout(function() {
$('.loader').fadeOut();
$('.loader-mask').delay(350).fadeOut('slow');
- console.log('Something Wrong!', 'warning');
+ //console.log('Something Wrong!', 'warning');
}, 1000);
}
});
@@ -1109,8 +1185,8 @@
$('.spouse-age').css('display','none');
}
- console.log("child ");
- console.log($('#children').val());
+ //console.log("child ");
+ //console.log($('#children').val());
if($('#children').val() != 0){
$('.child-age').css('display','');
@@ -1145,8 +1221,11 @@
});
- $("#sum_insured").on("keyup", function() {
- var inputNumber = $(this).val();
+ function si_keup_num_to_word(input) {
+
+ console.log('keyup sum insured');
+ var inputNumber = $(input).val();
+ console.log(inputNumber)
if (inputNumber) {
var result = convertCommaNumberToWords(inputNumber);
@@ -1154,7 +1233,7 @@
} else {
$("#numberToWordGMC").text("");
}
- });
+ };
@@ -1179,7 +1258,7 @@
\ No newline at end of file
diff --git a/app/Views/policy_gpa_terms.php b/app/Views/policy_gpa_terms.php
index 99275624..b19fd8a6 100644
--- a/app/Views/policy_gpa_terms.php
+++ b/app/Views/policy_gpa_terms.php
@@ -90,16 +90,21 @@
-
+
-
+
+
@@ -132,13 +137,13 @@
Min Age:
-
+
|
Max Age:
-
+
|
|
@@ -569,6 +574,12 @@
});
}
}
+
+ if (key.includes("multiple_sum_insured")) {
+ gpaJsonObjectForSpecialCondition[key].forEach((value, index) => {
+ appendGPASIAddMore(value);
+ });
+ }
});
let jsonObject = JSON.parse(res.data);
@@ -634,6 +645,7 @@
}
$("#sumInsured2").trigger("keyup");
+ $('.multiple_sum_insured').trigger("keyup");
$("#totalSumInsured").trigger("keyup");
@@ -651,7 +663,7 @@
});
} else if (gpa_policy_type_id != 'GPA' && gpa_policy_type_id != 'GMC') {
- toastr.warning("This policy has no policy terms.", 'warning');
+ // toastr.warning("This policy has no policy terms.", 'warning');
}
});
@@ -723,6 +735,41 @@
}
});
+ $(".multiple_sum_insured").on("keyup", function() {
+
+ console.log('multiple_sum_insured key up')
+
+ var inputNumber = $(this).val();
+ console.log('inputNumber', inputNumber);
+ if (inputNumber) {
+ var result = convertCommaNumberToWords(inputNumber);
+ console.log(result);
+ $(".numberToWordSumInsured").text(result);
+ } else {
+ $(".numberToWordSumInsured").text("");
+ }
+ });
+
+
+ function numtowordinkeyup(input){
+ console.log('testing......')
+ console.log(input);
+
+ var inputNumber = $(input).val();
+ console.log('inputNumber', inputNumber);
+
+ if (inputNumber) {
+ var result = convertCommaNumberToWords(inputNumber);
+ console.log(result);
+ var $parentRow = $(input).closest('.row');
+ console.log('$parentRow', $parentRow)
+ var $targetDiv = $parentRow.find('.numberToWordSumInsured');
+ $targetDiv.text(result)
+ console.log('$targetDiv', $targetDiv)
+ }
+
+ }
+
$("#totalSumInsured").on("keyup", function() {
var inputNumber = $(this).val();
@@ -735,16 +782,29 @@
});
+ function appendGPASIAddMore(data = null){
+ console.log('function called')
- // function formatNumber(input) {
- // Remove non-numeric characters
- // let value = input.value.replace(/\D/g, '');
+ var html = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
`;
- // Add commas
- // value = Number(value).toLocaleString('en-IN');
-
- // Update the input value
- // input.value = value;
- // }
+ $('#gpa_si_add_more').append(html);
+ }
\ No newline at end of file
diff --git a/app/Views/policy_grid.php b/app/Views/policy_grid.php
index f69a7648..927895d0 100644
--- a/app/Views/policy_grid.php
+++ b/app/Views/policy_grid.php
@@ -6,7 +6,7 @@
@@ -250,14 +250,14 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
var secondaryValue = $(event.target).data('secondary');
- console.log('secondaryValue', secondaryValue)
- console.log(rr_type);
+ //console.log('secondaryValue', secondaryValue)
+ //console.log(rr_type);
if (!secondaryValue) {
secondaryValue = rr_type
}
- console.log('secondaryValue', secondaryValue)
+ //console.log('secondaryValue', secondaryValue)
var grid_container = document.getElementById('grid_content_input');
@@ -280,10 +280,10 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
var selectElement = event.target;
var selectedOption = selectElement.options[selectElement.selectedIndex];
dataIdValue = selectedOption.getAttribute('data-id');
- // console.log('dataIdValue', dataIdValue)
+ // //console.log('dataIdValue', dataIdValue)
}
- console.log(grid_container)
+ //console.log(grid_container)
if (dataIdValue == '1') {
for (var i = 1; i <= 13; i++) {
@@ -348,7 +348,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa