Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
VENKATESHWARAN 2025-02-01 09:17:22 +05:30
commit 42b5039c6e
6 changed files with 3292 additions and 1362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Controllers/EmployeeController.php
View File

@ -97,7 +97,7 @@ class EmployeeController extends AdminController
// Convert the status field to an array if it exists in the request data // Convert the status field to an array if it exists in the request data
if (isset($filterData['status']) && !empty($filterData['status'])) { if (isset($filterData['status']) && !empty($filterData['status'])) {
$filterData['status'] = explode(",", $filterData['status']); // $filterData['status'] = explode(",", $filterData['status']);
}else{ }else{
$filterData['status'] = []; $filterData['status'] = [];
} }
@ -114,6 +114,11 @@ class EmployeeController extends AdminController
// log_message('error',json_encode($data['employees'])); // log_message('error',json_encode($data['employees']));
// Set getData in $data array with the processed $filterData // Set getData in $data array with the processed $filterData
$data['getData'] = $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()); // dd($this->employeeModel->getLastQuery());

2
app/Controllers/EmployeeRestController.php
View File

@ -3159,7 +3159,7 @@ class EmployeeRestController extends AdminController
if ($mail_sent_status->status == 'success') { if ($mail_sent_status->status == 'success') {
$sent_message_data['ticket_id'] = $ticket_id; $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['emp_mail'] = $mail_sent_status->data->params->mail;
$sent_message_data['mail_subject'] = $mail_sent_status->data->params->subject; $sent_message_data['mail_subject'] = $mail_sent_status->data->params->subject;
$sent_message_data['mail_content'] = $mail_sent_status->data->params->message; $sent_message_data['mail_content'] = $mail_sent_status->data->params->message;

38
app/Views/employee_list.php
View File

@ -135,8 +135,9 @@ table.dataTable tbody td {
<?php include('employee_data_list.php');?> <?php // include('employee_data_list.php');?>
<div id="employee_table_list"></div>
<!-- end row --> <!-- end row -->
<div id="loader" class="loader" style="display:none;">SPINNER</div> <div id="loader" class="loader" style="display:none;">SPINNER</div>
@ -502,24 +503,29 @@ function fetchEmpolyeeList(event) {
const queryString = objectToQueryString(queryParams); const queryString = objectToQueryString(queryParams);
const apiURL = $('#get-emp-list').attr('href') + "?" + queryString; const apiURL = $('#get-emp-list').attr('href') + "?" + queryString;
// console.log(apiURL); // console.log(apiURL);
window.location.href = apiURL; // window.location.href = apiURL;
// var apiURL2 = $('#get-emp-list').attr('href'); // Get href attribute value // var apiURL2 = $('#get-emp-list').attr('href'); // Get href attribute value
// console.log(apiURL); console.log(apiURL);
// $.ajax({ $.ajax({
// url: apiURL, url: apiURL,
// method: 'GET', method: 'GET',
// data: queryParams, data: queryParams,
// success: function(response) { success: function(response) {
// // Assuming response is a JSON array if(response.status == true){
// // displayDataTables(response); $('.loader').fadeIn();
// console.log(response); $('.loader-mask').fadeIn();
// }, $('#employee_table_list').html(response.html);
// error: function(xhr, status, error) { $('.loader').fadeOut();
// console.error('Error:', error); $('.loader-mask').delay(350).fadeOut('slow');
// } }
// }); },
error: function(xhr, status, error) {
console.error('Error:', error);
toastr.error('Failed to fetch Data','Error');
}
});
} }

2009
app/Views/notification old.php Normal file
View File

File diff suppressed because it is too large Load Diff

2594
app/Views/notification.php
View File

File diff suppressed because it is too large Load Diff

4
app/Views/ticket_mail_template.php
View File

@ -191,10 +191,10 @@ table.dataTable tbody td {
<select id="ticket_mail_customButton" class="form-control" <select id="ticket_mail_customButton" class="form-control"
style="border:none;right: 6px;width: auto;position: absolute;z-index: 1;top: 17px;height: 32px;float: right;"> style="border:none;right: 6px;width: auto;position: absolute;z-index: 1;top: 17px;height: 32px;float: right;">
<option value="">PlaceHolders</option> <option value="">PlaceHolders</option>
<?php foreach ($placeHolders as $value): ?> <?php foreach ($placeHolders as $key => $value): ?>
<?php // if($value == 'member_name' || $value == 'member_mobile' || $value == 'nhance_logo' || $value == 'client_logo' || $value == 'app_link' || $value == 'client_name'){ ?>member_mobile <?php // if($value == 'member_name' || $value == 'member_mobile' || $value == 'nhance_logo' || $value == 'client_logo' || $value == 'app_link' || $value == 'client_name'){ ?>member_mobile
<?php $valueChange = str_replace('_', ' ', $value); $valueChange = ucwords($valueChange); ?> <?php $valueChange = str_replace('_', ' ', $value); $valueChange = ucwords($valueChange); ?>
<option value="((<?php echo $value; ?>))"><?php echo $valueChange; ?> <option value="<?php echo $key; ?>"><?php echo $valueChange; ?></option>
</option> </option>
<?php //} ?> <?php //} ?>
<?php endforeach; ?> <?php endforeach; ?>