MERGE_TEST_LIVE_ISSUES

app/Controllers/EmployeeRestController.php

@@ -284,6 +284,7 @@ class EmployeeRestController extends AdminController
                         $item->gender = $this->GenderMap($item->relationship , $item->emp_code);
                         $item->dob = $this->convertDateFormatYMD($item->dob);
                         $item->emp_status = 'draft';
+                        $item->is_dependent_modified = 1;
                         $item->band = $this->getSelfBand($item->emp_code,$item->client_id,$item->client_branch_id);
                         // dd($item);
                         $employee = $this->employeeModel->insert($item);
@@ -564,7 +565,7 @@ class EmployeeRestController extends AdminController
 
                     $this->employeeModel->where('id', $this->request->getGet('id') )
                                         ->where('is_active', 1 )
-                                        ->set(['emp_status' => 'truncated', 'is_active' => 0])
+                                        ->set(['emp_status' => 'truncated', 'is_active' => 0, 'is_dependent_modified' => 0])
                                         ->update();
                 }
 

app/Models/EmployeeModel.php

@@ -46,6 +46,7 @@ class EmployeeModel extends Model
         "is_mpin_skipped",
         "is_biometric_enabled",
         "password",
+        "is_dependent_modified",
     ];
 
       // Callbacks

app/Models/EmployeePolicyModel.php

@@ -154,26 +154,29 @@ class EmployeePolicyModel extends Model
                     FROM employees e
                     JOIN employee_polices ep ON e.id = ep.employee_id
                     WHERE e.emp_code = emp.emp_code 
-                    AND e.is_active = 0 
+                    AND (e.is_dependent_modified = 0 OR (e.is_active = 0 AND e.emp_status != 'truncated'))
-                    AND e.emp_status != 'truncated'
                     AND ep.client_policy_id = employee_polices.client_policy_id
                 ) 
                 ELSE NULL 
             END) AS removed_summary",
 
-            "(CASE 
+            "(IF(COALESCE(emp.is_dependent_modified, 0) = 1, 'Newly Added, ', 
-                WHEN emp.relationship != 'Self' AND DATE(emp.created_at) > (
+                CASE 
-                    SELECT DATE(MIN(e_sub.created_at)) 
+                    WHEN emp.relationship != 'Self' 
-                    FROM employees e_sub
+                        AND emp.created_by = (
-                    JOIN employee_polices ep ON e_sub.id = ep.employee_id
+                            SELECT e_sub.id
-                    WHERE e_sub.emp_code = emp.emp_code 
+                            FROM employees e_sub
-                    AND e_sub.relationship = 'Self' 
+                            INNER JOIN employee_polices ep_sub ON e_sub.id = ep_sub.employee_id
-                    AND e_sub.is_active = 1
+                            WHERE e_sub.emp_code = emp.emp_code 
-                    AND ep.client_policy_id = employee_polices.client_policy_id
+                            AND e_sub.relationship = 'Self' 
-                )
+                            AND e_sub.is_active = 1
-                THEN 'Newly Added' 
+                            AND ep_sub.client_policy_id = employee_polices.client_policy_id
-                ELSE NULL 
+                            LIMIT 1
-            END) AS newly_added",
+                        )
+                    THEN 'Newly Added, ' 
+                    ELSE NULL 
+                END
+            )) AS newly_added",
 
             $status_query
         ], false)

app/Views/employee_data_list.php

@@ -200,6 +200,9 @@
                             </td>
                             <td>
                                 <?php 
+                                    if(!empty($employee['newly_added'])){
+                                        echo "<p>" . $employee['newly_added'] . "</p>";
+                                    }
                                     if(!empty($employee['name_first_old']) ){
                                         echo "<p> Name : " . $employee['name_first_old'] . ' => ' . $employee['name_last_new'] . "</p>";
                                     }
@@ -209,9 +212,6 @@
                                     if(!empty($employee['gender_first_old'])){
                                         echo "<p> Gender : " . $employee['gender_first_old'] . ' => ' . $employee['gender_last_new'] . "</p>";
                                     }
-                                    if(!empty($employee['newly_added'])){
-                                        echo "<p>" . $employee['newly_added'] . "</p>";
-                                    }
                                     // if(!empty($employee['removed_count'])){
                                     //     echo "<p>" . $employee['removed_count'] . " People removed </p>";
                                     // }

app/Views/file_list.php

@@ -128,7 +128,7 @@
                                     <a class="dropdown-item" href="<?= base_url("util/download-file-list/") . $file['id']; ?>"><i class="mdi mdi-download mr-2 text-muted font-18 vertical-middle"></i>Download</a>
                                     <a data-id="<?php echo $file['id'] ?>" data-toggle="modal" data-target="#full-width-modal-emp-list" class="dropdown-item view_emp_list" href="#"><i class="mdi mdi-eye mr-2 text-muted font-18 vertical-middle"></i>View</a>
                                     
-                                    <?php if ($file['status'] == 'Success') { ?>
+                                    <?php if ($file['status'] == 'success') { ?>
                                         <a data-id="<?php echo $file['id'] ?>" class="dropdown-item truncate2" href="#"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Truncate</a>
                                     <?php } ?>