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-05-12 18:03:58 +05:30
commit 34ae41cfab
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Controllers/EmployeeServiceController.php
View File

@ -2087,12 +2087,14 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){
$relation = 'parent'; $relation = 'parent';
} else if(strtolower(trim($value['relationship'])) === 'son' || strtolower(trim($value['relationship'])) === 'daughter'){ } else if(strtolower(trim($value['relationship'])) === 'son' || strtolower(trim($value['relationship'])) === 'daughter'){
$relation = 'child'; $relation = 'child';
}else if(strtolower(trim($value['relationship'])) === 'father in law' || strtolower(trim($value['relationship'])) === 'mother in law'){ }else if((strtolower(trim($value['relationship'])) === 'father in law' || strtolower(trim($value['relationship'])) === 'mother in law') || (strtolower(trim($value['relationship'])) === 'father-in-law' || strtolower(trim($value['relationship'])) === 'mother-in-law')){
$relation = 'parent_in_law'; $relation = 'parent_in_law';
}else if(strtolower(trim($value['relationship'])) === 'spouse'){ }else if(strtolower(trim($value['relationship'])) === 'spouse'){
$relation = 'spouse'; $relation = 'spouse';
}else{ }else if(strtolower(trim($value['relationship'])) === 'self'){
$relation = 'self'; $relation = 'self';
}else {
$relation = '';
} }
$value['family_floater_key'] = $relation; $value['family_floater_key'] = $relation;

6
app/Helpers/excel_util_helper.php
View File

@ -2210,12 +2210,14 @@ if (!function_exists('generate_family_floater_key')) {
$relation = 'parent'; $relation = 'parent';
} else if (strtolower(trim($relationship)) === 'son' || strtolower(trim($relationship)) === 'daughter') { } else if (strtolower(trim($relationship)) === 'son' || strtolower(trim($relationship)) === 'daughter') {
$relation = 'child'; $relation = 'child';
} else if (strtolower(trim($relationship)) === 'father in Law' || strtolower(trim($relationship)) === 'mother in Law') { }else if((strtolower(trim($relationship)) === 'father in Law' || strtolower(trim($relationship)) === 'mother in Law') || (strtolower(trim($relationship)) === 'father-in-Law' || strtolower(trim($relationship)) === 'mother-in-Law')){
$relation = 'parent_in_law'; $relation = 'parent_in_law';
} else if (strtolower(trim($relationship)) === 'spouse') { } else if (strtolower(trim($relationship)) === 'spouse') {
$relation = 'spouse'; $relation = 'spouse';
} else { } else if(strtolower(trim($relationship)) === 'self'){
$relation = 'self'; $relation = 'self';
}else{
$relation = '';
} }
return $relation; return $relation;