diff --git a/api/application/helpers/getprocessedjson_helper.php b/api/application/helpers/getprocessedjson_helper.php index eff36ce5..78c68d92 100644 --- a/api/application/helpers/getprocessedjson_helper.php +++ b/api/application/helpers/getprocessedjson_helper.php @@ -2731,6 +2731,14 @@ class GETPROCESSEDJSON $raw_json[$key]['designation_person_met_master'] = $cr[0]['name']; } } + if(isset($value['Relationship']) && $value['Relationship'] != "") + { + $cr = $CI->PD_Model->selectCustomRecords(array('*'),array('relationship_id' =>$value['Relationship'] ),RELATIONSHIPS); + if($cr) + { + $raw_json[$key]['relationship_master'] = $cr[0]['name']; + } + } if(isset($value['Name_of_the_Person_met']) && $value['Name_of_the_Person_met'] != "") { diff --git a/api/application/views/report_templates/JSONTOREPORT_FI_OV_DI.php b/api/application/views/report_templates/JSONTOREPORT_FI_OV_DI.php index 9761e2a5..cb6570ad 100644 --- a/api/application/views/report_templates/JSONTOREPORT_FI_OV_DI.php +++ b/api/application/views/report_templates/JSONTOREPORT_FI_OV_DI.php @@ -310,6 +310,7 @@ defined('BASEPATH') or exit('No direct script access allowed'); echo '

' . 'Applicant ('.$person.') was met at the visited address.' . '

'; } else if (strtoupper($value['is_person_met']) == 'NO') { $designation = str_replace(' of', '', $value['designation_person_met_master']); + if($value['Others_specify']){ $designation = $value['Others_specify']; } echo '

' . '(' . $value['Name_of_the_Person'] . ') (' . $designation . ') was met at the visited address during visit.' . '

'; } if (isset($general_form['general_remark']) && $general_form['general_remark'] != "") { diff --git a/api/application/views/report_templates/JSONTOREPORT_FI_OV_SAL.php b/api/application/views/report_templates/JSONTOREPORT_FI_OV_SAL.php index d86bedbc..e6dc0307 100644 --- a/api/application/views/report_templates/JSONTOREPORT_FI_OV_SAL.php +++ b/api/application/views/report_templates/JSONTOREPORT_FI_OV_SAL.php @@ -349,6 +349,7 @@ defined('BASEPATH') or exit('No direct script access allowed'); echo '

VISIT DETAILS:

'; $Office_visit_data = json_decode($pd_processed_forms[29][0]['processed_json'], true); $ov_value = $Office_visit_data['json']; + // print_r($ov_value);die(); $company_name_sighted = strtoupper($ov_value['was_the_company_name_board_sighted']) == 'YES' ? 'seen' : 'not seen'; $business_activities = strtoupper($ov_value['Was_any_business_activities_observed_during_visit']) == 'YES' ? 'seen' : 'not seen'; @@ -377,28 +378,35 @@ defined('BASEPATH') or exit('No direct script access allowed'); $document_not_seen = array(); if (strtoupper($ov_value['salary_register_was_seen']) == 'YES') { array_push($document_seen, 'Salary Certificate'); - } else if (strtoupper($ov_value['salary_register_was_seen']) == 'NO' && isset($ov_value['Why_documents_are_not_available'])) { - array_push($document_not_seen, $ov_value['Why_documents_are_not_available']); - } + } + // else if (strtoupper($ov_value['salary_register_was_seen']) == 'NO' && isset($ov_value['Why_documents_are_not_available'])) { + // array_push($document_not_seen, $ov_value['Why_documents_are_not_available']); + // } if (strtoupper($ov_value['cash_voucher_was_seen']) == 'YES') { array_push($document_seen, 'Cash Voucher'); - } else if (strtoupper($ov_value['cash_voucher_was_seen']) == 'NO' && isset($ov_value['Why_documents_are_not_available_cash_voucher'])) { - array_push($document_not_seen, $ov_value['Why_documents_are_not_available_cash_voucher']); - } + } + // else if (strtoupper($ov_value['cash_voucher_was_seen']) == 'NO' && isset($ov_value['Why_documents_are_not_available_cash_voucher'])) { + // array_push($document_not_seen, $ov_value['Why_documents_are_not_available_cash_voucher']); + // } if (strtoupper($ov_value['salary_slip_was_seen']) == 'YES') { array_push($document_seen, 'Salary Slip'); - } else if (strtoupper($ov_value['salary_slip_was_seen']) == 'NO' && isset($ov_value['Why_documents_are_not_available_salary_slip'])) { - array_push($document_not_seen, $ov_value['Why_documents_are_not_available_salary_slip']); - } + } + // else if (strtoupper($ov_value['salary_slip_was_seen']) == 'NO' && isset($ov_value['Why_documents_are_not_available_salary_slip'])) { + // array_push($document_not_seen, $ov_value['Why_documents_are_not_available_salary_slip']); + // } if (strtoupper($ov_value['offer_letter_was_seen']) == 'YES') { array_push($document_seen, 'Offer letter'); - } else if ($ov_value['offer_letter_was_seen'] == 'NO' && isset($ov_value['Why_documents_are_not_available_offer_letter'])) { - array_push($document_not_seen, $ov_value['Why_documents_are_not_available_offer_letter']); - } + } + // else if ($ov_value['offer_letter_was_seen'] == 'NO' && isset($ov_value['Why_documents_are_not_available_offer_letter'])) { + // array_push($document_not_seen, $ov_value['Why_documents_are_not_available_offer_letter']); + // } if (strtoupper($ov_value['others_Please_specifys']) == 'YES' && !empty($ov_value['Others_specify'])) { array_push($document_seen, $ov_value['Others_specify']); } + if(isset($ov_value['Why_documents_are_not_available_offer_letter']) && (strtoupper($ov_value['salary_register_was_seen']) == 'NO') && (strtoupper($ov_value['others_Please_specifys']) == 'NO') && (strtoupper($ov_value['offer_letter_was_seen']) == 'NO') && (strtoupper($ov_value['salary_slip_was_seen']) == 'NO') && (strtoupper($ov_value['cash_voucher_was_seen']) == 'NO')) { + array_push($document_not_seen, $ov_value['Why_documents_are_not_available_offer_letter']); + } @@ -417,8 +425,10 @@ defined('BASEPATH') or exit('No direct script access allowed'); echo '
  • Applicant salary is getting paid Via ' . $ov_value['mode_of_getting_salary'] . '.
    • '; echo '
  • Employment Document Sighted: ' . implode('/', $document_seen) . ' were seen during Field visit and photographs of same is available in zipped file enclosed with report.
    • '; - if (!empty($document_not_seen)) { - echo '
  • Documents were not sighted during visit because, ' . implode('/', $document_seen) . '
    • '; + if (!empty($ov_value['Why_documents_are_not_available_offer_letter'])) { + $y_docs = implode('/', $ov_value['Why_documents_are_not_available_offer_letter']); + $Why_documents_are_not_available = preg_replace("/_/i", ' ', $y_docs); + echo '
  • Documents were not sighted during visit because, ' . $Why_documents_are_not_available . '
    • '; } echo '
  • Officer Sighted ' . $ov_value['no_of_employees_sighted_by_PD_officer_during_visit'] . ' employees at the visited premises.'; echo '
  • The Business Name board was ' . $company_name_sighted . ' at the visited address.
    • diff --git a/api/application/views/report_templates/JSONTOREPORT_FI_RV.php b/api/application/views/report_templates/JSONTOREPORT_FI_RV.php index bb539a7c..c17c0a14 100644 --- a/api/application/views/report_templates/JSONTOREPORT_FI_RV.php +++ b/api/application/views/report_templates/JSONTOREPORT_FI_RV.php @@ -310,8 +310,8 @@ defined('BASEPATH') or exit('No direct script access allowed'); $person = isset($value['Name_of_the_Person_met_master']) ? $value['Name_of_the_Person_met_master'] : $value['Name_of_the_Person_met']; echo '

    ' . 'Applicant ('.$person.') was met at the visited address.' . '

    '; } else if (strtoupper($value['is_person_met']) == 'NO') { - $designation = isset($value['designation_person_met_master']) ? str_replace(' of', '', "(".$value['designation_person_met_master'].")") : ""; - echo '

    ' . '(' . $value['Name_of_the_Person'] . ') ' . $designation . ' was met at the visited address during visit.' . '

    '; + $relation = $value['relationship_master']; + echo '

    ' . '(' . $value['Name_of_the_Person'] . ') (' . $relation . ') was met at the visited address during visit.' . '

    '; } if (isset($general_form['general_remark']) && $general_form['general_remark'] != "") { echo '

    ' . $general_form['general_remark'] . '

    ';