From d08cb10e0941964ac19ebc6e14e0901839fc0896 Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Wed, 20 Mar 2024 16:13:51 +0530 Subject: [PATCH] CHANGE_EMPLOYEE_REST_FILE_UPLOAD_EMP_STATUS_KEY : AADHAVAN --- app/Controllers/ClientController.php | 24 +++++++++++++-- app/Controllers/EmployeeRestController.php | 35 ++++++++++++---------- app/Views/policy_gmc_terms.php | 5 +++- app/Views/policy_gpa_terms.php | 4 +-- 4 files changed, 48 insertions(+), 20 deletions(-) diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index 87f633fa..392f362e 100644 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -834,6 +834,8 @@ class ClientController extends AdminController $client_policy_id = $this->request->getGet('client_policy_id'); $record = $this->clientPolicyModel->where('id', $client_policy_id)->first(); + $family_floater=json_decode($record['policy_terms'])->family_floater; + $emp_count = $this->employeeModel ->join('client_policy cp',"employees.client_id = cp.client_id") ->join('employee_polices ep',"cp.id = ep.client_policy_id AND employees.id = ep.employee_id") ->where("employees.client_id",$record['client_id']) @@ -864,11 +866,29 @@ class ClientController extends AdminController $premiumData = $this->policyPremium2Model->where(['client_id' => $record['client_id'], 'client_policy_id' => $client_policy_id, 'is_active' => 1])->findAll(); } // echo '
';
-        // print_r($results);
+        // echo $family_floater;
+        $resultss = [];
+        if ($family_floater == 1) {
+
+            foreach ($results as $index => $record) {
+                if ($index == '8' || $index == '7') {
+                     // Clearing the $results array
+                    $resultss[$index] = $record; 
+                }
+            }
+        }else{
+            foreach ($results as $index => $record) {
+                if ($index == '0' || $index == '1' || $index == '2' || $index == '3' || $index == '4' || $index == '5' || $index == '6') {
+                    // Clearing the $results array
+                   $resultss[$index] = $record; 
+               }
+            }
+        }
+
         // print_r($data[0]->policy_type); die;
                     // echo "hello";
             // return json_encode($premiumData);
-        return $this->respond(['status' => true,'code' => 200,'data' => $results, 'premiumData' => json_encode($premiumData), 'count' => $emp_count, 'policy_name' => $policy_name], 200);
+        return $this->respond(['status' => true,'code' => 200,'data' => $resultss, 'premiumData' => json_encode($premiumData), 'count' => $emp_count, 'policy_name' => $policy_name,], 200);
 
     }
 
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index cb0cc648..dd0f951b 100644
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -567,6 +567,8 @@ class EmployeeRestController extends AdminController
             $emp_code =isset($extra['1'][$index]) ? $extra['1'][$index] : 0;
             $name = $extra['2'][$index];
 
+            // print_r("--" . $emp_code. "---");
+            // print_r( $emp_code != 0 );
             if($emp_code != 0 && $name != '' || $name != null){
                 $record = [
                     // 'id' => $id,
@@ -575,12 +577,13 @@ class EmployeeRestController extends AdminController
                     // Check if the 'doj' key exists before accessing it
                     'doj' => $doj_new_format,
                     'gender' => $extra['4'][$index],
-                    'relationship' => $extra['5'][$index],
+                    'relationship' => ucfirst($extra['5'][$index]),
                     'family_floater_key' => $relation,
                     'dob' => $dob_new_format,
                     'email_corporate' => $extra['7'][$index],
                     'mobile'=> $extra['8'][$index],
                     'client_id' => $client_id,
+                    'emp_status'=>'draft'
                     
                 ];
                 $record2 = [
@@ -594,6 +597,7 @@ class EmployeeRestController extends AdminController
         { 
                     $employee = $this->employeeModel->checkExistingEmpEntrollment($dataToInsert[$a]);
                     $emp_id =0;
+
                     if ($employee) {
                         $emp_id =$employee['id'];
                         $id =$emp_id;
@@ -603,17 +607,18 @@ class EmployeeRestController extends AdminController
                             $this->myLogger->logme('error',('Update - ' . $employee['id'].' - '. $employee['emp_code'] .' - '.$employee['name']));
                         }
                     }else{
-                        
-                        $result = $this->employeeModel->insert($dataToInsert[$a]);
-                        $emp_id =$result;
-                        if ($result) {
-                            $emp = $this->employeeModel->where('id', $result)->get()->getResult();
+                        if ($dataToInsert[$a]['emp_code'] != 0) {
+                            $result = $this->employeeModel->insert($dataToInsert[$a]);
+                            $emp_id =$result;
+                            if ($result) {
+                                $emp = $this->employeeModel->where('id', $result)->get()->getResult();
 
-                            $policy_name = $this->employeePolicyModel->where('employee_id', $result)->get()->getResult();;
-                            
-                            
-                            $log_message = 'Insert Employee- '.$dataToInsert[$a]['name'] .'('.$dataToInsert[$a]['emp_code'] .') with PK ';
-                            $this->myLogger->logme('error',('Insert - ' .  $dataToInsert[$a]['emp_code'] .' - '. $dataToInsert[$a]['name']));
+                                $policy_name = $this->employeePolicyModel->where('employee_id', $result)->get()->getResult();;
+                                
+                                
+                                $log_message = 'Insert Employee- '.$dataToInsert[$a]['name'] .'('.$dataToInsert[$a]['emp_code'] .') with PK ';
+                                $this->myLogger->logme('error',('Insert - ' .  $dataToInsert[$a]['emp_code'] .' - '. $dataToInsert[$a]['name']));
+                            }
                         }
                     }
                     $emp_policy_data =[
@@ -644,10 +649,10 @@ class EmployeeRestController extends AdminController
             $data['policy_name']=$policy_name['name'];
             
             $message = view('mail_welcome', $data);
-            if ($dataToInsert[$a]['email_corporate'] != null || $dataToInsert[$a]['email_corporate'] != ''  &&  $dataToInsert[$a]['relationship'] == 'Self') {
-                $job_details  = new Jobs();
-                $r = Jobs::addJob(['job_name' => 'send_email','payload' => ['mail' => $mail, 'subject' => $subject,'message'=> $message]]);    
-            }
+            // if ($dataToInsert[$a]['email_corporate'] != null || $dataToInsert[$a]['email_corporate'] != ''  &&  $dataToInsert[$a]['relationship'] == 'Self') {
+            //     $job_details  = new Jobs();
+            //     $r = Jobs::addJob(['job_name' => 'send_email','payload' => ['mail' => $mail, 'subject' => $subject,'message'=> $message]]);    
+            // }
           
             // print_r($r);//die();
             // $jobWorker = new JobWorker();
diff --git a/app/Views/policy_gmc_terms.php b/app/Views/policy_gmc_terms.php
index e03b3e9d..c1582a88 100644
--- a/app/Views/policy_gmc_terms.php
+++ b/app/Views/policy_gmc_terms.php
@@ -626,6 +626,8 @@ var grid_html = '';
 
 
         var gmc_policy_type_id = $(this).attr('id');
+        
+
         if(gmc_policy_type_id >= '2'){
 
             $('#policyGMCTerms').css('display', '');
@@ -640,11 +642,12 @@ var grid_html = '';
                 method: 'GET',
                 data: {client_policy_id: client_policy_id}, 
                 success: function(response) {
+                    console.log('response',response);
+
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
                     }, 1000);
-                    console.log(response);
                     $('#nameOfThePolicyInGMC').html(' - ' + response.policy_name.name);
                     $('gmc_emp_count').val(response.count);
 
diff --git a/app/Views/policy_gpa_terms.php b/app/Views/policy_gpa_terms.php
index a3745720..c448e10e 100644
--- a/app/Views/policy_gpa_terms.php
+++ b/app/Views/policy_gpa_terms.php
@@ -446,12 +446,12 @@
     $('body').on('click', '.btnPolicyMaster', function () {
 
         var client_policy_id = $(this).data('id');
-        console.log('client_policy_id :' ,client_policy_id);
+        // console.log('client_policy_id :' ,client_policy_id);
 
         $('#gpa_client_policy_id').val(client_policy_id);
 
         var gpa_policy_type_id = $(this).attr('id');
-        console.log('gpa_policy_type_id', gpa_policy_type_id)
+        // console.log('gpa_policy_type_id', gpa_policy_type_id)
 
         if(gpa_policy_type_id == '1'){