Merge branch 'dev' of bitbucket.org:jubilian/nhance-enrollment into dev

app/Controllers/EmployeeController.php

@@ -761,16 +761,25 @@ class EmployeeController extends AdminController
     
      }
 
-     public function empby_client_clientbranch($client_id, $branch_id)
+    public function empby_client_clientbranch($client_id, $branch_id, $client_policy_id)
     {
 
-        $results = $this->clientModel->select('employees.id as employee_id, employees.name as employee_name, 
+        $results = $this->clientModel->select('
-                                                employees.relationship, employees.emp_code, 
+                employees.id as employee_id, 
-                                                employees.emp_status, auth_history.user_type')
+                employees.name as employee_name, 
+                employees.relationship, 
+                employees.emp_code, 
+                employees.emp_status, 
+                auth_history.user_type
+            ')
             ->join('employees', $client_id . '= employees.client_id AND ' . $branch_id . '= employees.client_branch_id', 'left')
+            ->join('employee_polices', 'employees.id = employee_polices.employee_id')
             ->join('auth_history', 'employees.id = auth_history.user_id AND "employee" = auth_history.user_type', 'left')
             ->where('employees.is_active', 1)
             ->where('employees.emp_status !=', 'truncated')
+            ->where('employee_polices.client_policy_id', $client_policy_id)
+            ->where('employee_polices.is_active', 1)
+            ->where('employee_polices.status !=', 'truncated')
             ->groupBy('employees.id')
             ->findAll();
 
@@ -802,11 +811,11 @@ class EmployeeController extends AdminController
                     'emp_status' => $employeeEmpStatus,
                     'user_type' => $employeeUserType
                 ];
-              
             }
             $employeeId = $row['employee_id'];
         }
 
+        // print_r($groupedData); die;
 
         return json_encode($groupedData);
     }

app/Views/enrollment_list.php

@@ -314,17 +314,18 @@
 
         var client_id = $('#clients').val();
         var branch_id = $('#branch_id').val();
-        if (client_id == '0' || branch_id == '0') {
+        var client_policy_id = $('#client_policy_id').val();
+        if (client_id == '0' || branch_id == '0' || client_policy_id == '0') {
             Swal.fire({
                 title: "warning!",
-                text: 'Please select the Client and Client Branch.',
+                text: 'Please select the Client, Client Branch and Client Policy.',
                 icon: "warning"
             });
             return false;
         }
 
         $.ajax({
-            url: '<?php echo base_url(); ?>' + '/employee/empby_client_clientbranch/' + client_id + '/' + branch_id,
+            url: '<?php echo base_url(); ?>' + '/employee/empby_client_clientbranch/' + client_id + '/' + branch_id + '/' + client_policy_id,
             method: 'GET',
             headers: {
                 "Content-Type": "application/json",
@@ -359,7 +360,7 @@
                 var loggedIn_count = 0;
                 data.forEach(function(employee, index) {
 
-                    if(employee.emp_status !== 'draft'){
+                    if(employee.emp_status === 'enrolled'){
                         var enrolled = 'Yes';
                         enrolled_count++;
                     }else{  
@@ -370,7 +371,12 @@
                         var loggedIn = 'Yes';
                         loggedIn_count++;
                     }else{ 
+
+                        if (employee.relationship && employee.relationship.toLowerCase() === "self") {
                             var loggedIn = 'No';
+                        }else{
+                            var loggedIn = '-';
+                        }
                     }
 
                     table.row.add([
@@ -485,6 +491,8 @@
 
         
         $('#emp_enrolled_view_click').on('click', function() {
+            
+            console.log($(this).hasClass('click_hover'));
             if ($(this).hasClass('click_hover')) {
                 // $(this).removeClass('click_hover');
                 $('.click_hover').each(function() {
@@ -496,7 +504,7 @@
                     $(this).removeClass('click_hover');
                 });
                 $('#emp_enrolled_view_click').addClass('click_hover');
-                filterTable(3, 'Yes'); // Filter "Enrolled" column (4th column, index 3)
+                filterTable(4, 'Yes'); // Filter "Enrolled" column (4th column, index 3)
             }
         });
 
@@ -512,7 +520,7 @@
                     $(this).removeClass('click_hover');
                 });
                 $('#emp_not_enrolled_view_click').addClass('click_hover');
-                filterTable(3, 'No'); // Filter "Enrolled" column (4th column, index 3)
+                filterTable(4, 'No'); // Filter "Enrolled" column (4th column, index 3)
             }
         });
 
@@ -528,7 +536,7 @@
                     $(this).removeClass('click_hover');
                 });
                 $('#emp_logged_in_view_click').addClass('click_hover');
-                filterTable(4, 'Yes'); // Filter "Logged-In" column (5th column, index 4)
+                filterTable(5, 'Yes'); // Filter "Logged-In" column (5th column, index 4)
             }
         });
 
@@ -544,7 +552,7 @@
                     $(this).removeClass('click_hover');
                 });
                 $('#emp_not_logged_in_view_click').addClass('click_hover');
-                filterTable(4, 'No'); // Filter "Logged-In" column (5th column, index 4)
+                filterTable(5, 'No'); // Filter "Logged-In" column (5th column, index 4)
             }
         });
 
@@ -738,7 +746,6 @@
         });
     });
 
-
     function sendManualReminder(input)
     {
         console.log('sendManualReminder function called');
@@ -819,4 +826,5 @@
         });
 
     }
+
 </script>