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:
Srinivas-Saravanan 2025-03-29 13:00:11 +05:30
commit 807aa8758d
3 changed files with 55 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Config/Routes.php
View File

@ -440,6 +440,9 @@ $routes->post("/employeeRest/verifyMpin", "RestAuthenticationController::verifyM
$routes->post("/employeeRest/checkMpin", "RestAuthenticationController::checkMpin");
$routes->post("/employeeRest/verifyEmployeeEmailId", "RestAuthenticationController::verifyEmployeeWithEmailId");
$routes->post("/employeeRest/updateEmpOTP", "RestAuthenticationController::updateEmpOTP");
$routes->post("/employeeRest/updateEmpMPIN", "RestAuthenticationController::updateEmpMPIN");
// $routes->post("/employeeRest/saveMpin", "RestAuthenticationController::saveMpin");
//HR login api's
$routes->post("/employeeRest/verifyHrWithMobileNumber", "RestAuthenticationController::verifyHrWithMobileNumber");

37
app/Controllers/LeadsController.php
View File

@ -868,6 +868,7 @@ class LeadsController extends BaseController
$data = $this->convertJsonForQCR($data, $type);
// dd($data);
}
// dd($data);
$spreadsheet = new Spreadsheet();
$sheet = $spreadsheet->getActiveSheet();
@ -1033,7 +1034,7 @@ class LeadsController extends BaseController
// Merge header cells if it spans multiple subheaders
if ($subHeaderCount > 1) {
$endColumn = chr(ord($startColumn) + $subHeaderCount - 1); // Calculate the end column
$endColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($startColumn) + $subHeaderCount - 1);
$sheet->mergeCells("{$startColumn}{$rowNumber}:{$endColumn}{$rowNumber}");
} else {
$endColumn = $startColumn; // No merge needed if only one subheader
@ -1061,7 +1062,8 @@ class LeadsController extends BaseController
}
// Apply border to the header range
$headerRange = "A{$rowNumber}:" . chr(ord($columnLetter) - 1) . "{$subHeaderRow}";
$prevColumn1 = $this->getPreviousColumn($columnLetter);
$headerRange = "A{$rowNumber}:" . "{$prevColumn1}" . "{$subHeaderRow}";
$sheet->getStyle($headerRange)->applyFromArray([
'borders' => [
'allBorders' => [
@ -1100,7 +1102,8 @@ class LeadsController extends BaseController
$serial_no++;
}
$dataRange = "A" . ($subHeaderRow + 1) . ":" . chr(ord($columnLetter) - 1) . ($rowNumber - 1);
$prevColumn2 = $this->getPreviousColumn($columnLetter);
$dataRange = "A" . ($subHeaderRow + 1) . ":" . "{$prevColumn2}" . ($rowNumber - 1);
$sheet->getStyle($dataRange)->applyFromArray([
'borders' => [
'allBorders' => [
@ -1147,7 +1150,8 @@ class LeadsController extends BaseController
$rowNumber++;
}
$premiumRange = "B" . ($rowNumber - 4) . ":" . chr(ord($columnLetter) - 2) . ($rowNumber - 1);
$prevColumn3 = $this->getPreviousColumn($columnLetter, 2);
$premiumRange = "B" . ($rowNumber - 4) . ":" . "{$prevColumn3}" . ($rowNumber - 1);
// dd($premiumRange);
$sheet->getStyle($premiumRange)->applyFromArray([
'borders' => [
@ -2990,7 +2994,7 @@ class LeadsController extends BaseController
// Merge header cells if it spans multiple subheaders
if ($subHeaderCount > 1) {
$endColumn = chr(ord($startColumn) + $subHeaderCount - 1); // Calculate the end column
$endColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($startColumn) + $subHeaderCount - 1);
$sheet->mergeCells("{$startColumn}{$rowNumber}:{$endColumn}{$rowNumber}");
} else {
$endColumn = $startColumn; // No merge needed if only one subheader
@ -3018,7 +3022,8 @@ class LeadsController extends BaseController
}
// Apply border to the header range
$headerRange = "A{$rowNumber}:" . chr(ord($columnLetter) - 1) . "{$subHeaderRow}";
$prevColumn4 = $this->getPreviousColumn($columnLetter);
$headerRange = "A{$rowNumber}:" . "{$prevColumn4}" . "{$subHeaderRow}";
$sheet->getStyle($headerRange)->applyFromArray([
'borders' => [
'allBorders' => [
@ -3086,8 +3091,8 @@ class LeadsController extends BaseController
}
// dd($columnLetter);
$dataRange = "A" . ($subHeaderRow + 1) . ":" . chr(ord($columnLetter) - 1) . ($rowNumber - 1);
$prevColumn5 = $this->getPreviousColumn($columnLetter);
$dataRange = "A" . ($subHeaderRow + 1) . ":" . "{$prevColumn5}" . ($rowNumber - 1);
$sheet->getStyle($dataRange)->applyFromArray([
'borders' => [
'allBorders' => [
@ -3471,4 +3476,20 @@ class LeadsController extends BaseController
// kint::dump($data);
return $data;
}
// function getPreviousColumn($columnLetter)
// {
// $colIndex = Coordinate::columnIndexFromString($columnLetter);
// if ($colIndex > 1) {
// $colIndex--;
// }
// return Coordinate::stringFromColumnIndex($colIndex);
// }
function getPreviousColumn($columnLetter, $decrement = 1) {
$colIndex = Coordinate::columnIndexFromString($columnLetter);
$colIndex = max(1, $colIndex - $decrement); // ensure column index doesn't go below 1
return Coordinate::stringFromColumnIndex($colIndex);
}
}

23
app/Controllers/RestAuthenticationController.php
View File

@ -178,6 +178,29 @@ class RestAuthenticationController extends AdminController
}
public function updateEmpMPIN()
{
$mobile_number = isset($this->request->getJSON()->mobile_number) ? $this->request->getJSON()->mobile_number : null;
$email_id = isset($this->request->getJSON()->email_id) ? $this->request->getJSON()->email_id : null;
if (isset($mobile_number)) {
$employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->first();
} else {
$employeeData = $this->employeeModel->where('email_corporate', $email_id)->where('relationship', 'self')->first();
}
$mpin = $this->request->getJSON()->mpin;
if ($employeeData) {
$id= $employeeData["id"];
$updateMpin = $this->employeeModel->where('id', $id)->set('mpin', $mpin)->update();
}
return true;
}
public function getVerifiedUserData()
{