diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index 9e81f1a9..050437cd 100755 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -97,7 +97,7 @@ class EmployeeController extends AdminController // Convert the status field to an array if it exists in the request data if (isset($filterData['status']) && !empty($filterData['status'])) { - $filterData['status'] = explode(",", $filterData['status']); + // $filterData['status'] = explode(",", $filterData['status']); }else{ $filterData['status'] = []; } @@ -114,6 +114,11 @@ class EmployeeController extends AdminController // log_message('error',json_encode($data['employees'])); // Set getData in $data array with the processed $filterData $data['getData'] = $filterData; + + // return view('employee_list',$data); + $html = view('employee_data_list', $data); + return $this->respond(['status' => true, 'html' => $html], 200); + } // dd($this->employeeModel->getLastQuery()); diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 800f6941..0b26b442 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -3159,7 +3159,7 @@ class EmployeeRestController extends AdminController if ($mail_sent_status->status == 'success') { $sent_message_data['ticket_id'] = $ticket_id; - $sent_message_data['sender'] = 'user'; + $sent_message_data['sender'] = 'staff'; $sent_message_data['emp_mail'] = $mail_sent_status->data->params->mail; $sent_message_data['mail_subject'] = $mail_sent_status->data->params->subject; $sent_message_data['mail_content'] = $mail_sent_status->data->params->message; diff --git a/app/Views/employee_list.php b/app/Views/employee_list.php index 255d8278..7c35a42d 100755 --- a/app/Views/employee_list.php +++ b/app/Views/employee_list.php @@ -135,8 +135,9 @@ table.dataTable tbody td { - + +
@@ -502,24 +503,29 @@ function fetchEmpolyeeList(event) { const queryString = objectToQueryString(queryParams); const apiURL = $('#get-emp-list').attr('href') + "?" + queryString; // console.log(apiURL); - window.location.href = apiURL; + // window.location.href = apiURL; // var apiURL2 = $('#get-emp-list').attr('href'); // Get href attribute value - // console.log(apiURL); - // $.ajax({ - // url: apiURL, - // method: 'GET', - // data: queryParams, - // success: function(response) { - // // Assuming response is a JSON array - // // displayDataTables(response); - // console.log(response); - // }, - // error: function(xhr, status, error) { - // console.error('Error:', error); - // } - // }); + console.log(apiURL); + $.ajax({ + url: apiURL, + method: 'GET', + data: queryParams, + success: function(response) { + if(response.status == true){ + $('.loader').fadeIn(); + $('.loader-mask').fadeIn(); + $('#employee_table_list').html(response.html); + $('.loader').fadeOut(); + $('.loader-mask').delay(350).fadeOut('slow'); + } + }, + error: function(xhr, status, error) { + console.error('Error:', error); + toastr.error('Failed to fetch Data','Error'); + } + }); } diff --git a/app/Views/notification old.php b/app/Views/notification old.php new file mode 100644 index 00000000..ed5f8ee5 --- /dev/null +++ b/app/Views/notification old.php @@ -0,0 +1,2009 @@ + +
+ +
+
+ +
+ + + +
+

+
+
+ +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ +
+
+ + +     + Edit +
+
+ +
+ +
+ +
+
+ + +     + Edit +
+
+ +
+
+ +
+
+ + +     + Edit +
+
+ +
+
+ +
+
+ + +     + Edit +
+
+ +
+
+ +
+
+ + +     + Edit +
+
+ +
+
+ +
+
+ + +     + Edit +
+
+ +
+
+ +
+
+
+
+ Submit +
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/Views/notification.php b/app/Views/notification.php index cb738661..051d2f98 100755 --- a/app/Views/notification.php +++ b/app/Views/notification.php @@ -14,15 +14,14 @@ min-height: 600px; } -#account_maneger_summary_mail_modal .modal-dialog, -#member_review_and_summary_mail_modal .modal-dialog { +.modal-dialog { max-width: 90% !important; width: 90% !important; } /* Also ensure the modal body has proper height */ -#account_maneger_summary_mail_modal .modal-body, -#member_review_and_summary_mail_modal .modal-body { + +.modal-body { min-height: 600px; padding: 20px; } @@ -34,178 +33,178 @@
- +
-
- +
+
-

+ ?>

-
+
-
-
- - -
-
- - -
+
+
+ +
- -
-
- - -
-
- - -
-
- -
-
- - -     - Edit -
-
- -
- -
- -
-
- - -     - Edit -
-
- -
-
- -
-
- - -     - Edit -
-
- -
-
- -
-
- - -     - Edit -
-
- -
-
- -
-
- - -     - Edit -
-
- -
-
- -
-
- - -     - Edit -
-
- -
-
- -
-
-
-
- Submit -
+
+ +
+
+
+ + +
+
+ + +
+
+ +
+
+ + +     + Edit +
+
+ +
+ +
+ +
+
+ + +     + Edit +
+
+ +
+
+ +
+
+ + +     + Edit +
+
+ +
+
+ +
+
+ + +     + Edit +
+
+ +
+
+ +
+
+ + +     + Edit +
+
+ +
+
+ +
+
+ + +     + Edit +
+
+ +
+
+ +
+
+
+
+ Submit +
+
+
+
@@ -217,7 +216,7 @@
-
+
- - - - - + \ No newline at end of file diff --git a/app/Views/ticket_mail_template.php b/app/Views/ticket_mail_template.php index e36b2718..1100e26a 100644 --- a/app/Views/ticket_mail_template.php +++ b/app/Views/ticket_mail_template.php @@ -191,10 +191,10 @@ table.dataTable tbody td {