diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index db100ab5..acac7f3b 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -5803,27 +5803,16 @@ class PD_Controller extends REST_Controller } $db_result = $this->PD_Model->selectCustomRecords(array('facecrop'), array('fk_pd_id' => $pdid,'isactive'=>1), PDAPPLICANTSDETAILS); - for ($dinx = 0; $dinx < count($db_result); $dinx++) { - $string = $db_result[$dinx]['facecrop']; - // echo gettype($string); - $my_array[$dinx] = json_decode($string, true); + $fc_array = array(); + if(!empty($db_result)){ + for ($dinx = 0; $dinx < count($db_result); $dinx++) { + $string = $db_result[$dinx]['facecrop']; + // echo gettype($string); + $fc_array[$dinx] = json_decode($string, true); + } } - $data['facecrop'] = $my_array; - // echo gettype($my_array); - // print_r($my_array); - // if (!empty($my_array) && !empty($my_array["FaceMatches"])) { - // $data['faceapi_result'] = $my_array; - // $arr = $my_array["FaceMatches"]; - // log_message('ERROR', "In PD Controller to Make FaceBoundingBox FaceMatches array cnt : " . count($arr)); - // for ($i = 0; $i < count($arr); $i++) { - // $data['bounding_box'][$i] = $arr[$i]['Face']['BoundingBox']; - // $data['bounding_box'][$i]['Similarity'] = $arr[$i]['Similarity']; - // } - // }else{ - // $data['faceapi_result'] = array(); - // $data['bounding_box'] = array(); - // } - + $data['facecrop'] = $fc_array; + // print_r($data['add_on_pd_images']); // die(); @@ -10542,18 +10531,18 @@ class PD_Controller extends REST_Controller log_message('ERROR', $applicants_details[$j]['applicant_name'] . " Facemark Image Generated : " . $applicants_details[$j]['facemark_image_generated']); $string = $applicants_details[$j]['faceapi_result']; // echo gettype($string); - $my_array = json_decode($string, true); - // echo gettype($my_array); - if (!empty($my_array) && !empty($my_array["FaceMatches"])) { - $arr = $my_array["FaceMatches"]; + $faceapi_result_decode = json_decode($string, true); + // echo gettype($faceapi_result_decode); + if (!empty($faceapi_result_decode) && !empty($faceapi_result_decode["FaceMatches"])) { + $arr = $faceapi_result_decode["FaceMatches"]; log_message('ERROR', $applicants_details[$j]['applicant_name'] . " FaceMatched array cnt : " . count($arr)); for ($i = 0; $i < count($arr); $i++) { $bounding_box['compare_image'][$i] = $arr[$i]['Face']['BoundingBox']; $bounding_box['compare_image'][$i]['Similarity'] = $arr[$i]['Similarity']; } } - if (!empty($my_array) && !empty($my_array["SourceImageFace"])) { - $bounding_box['source_image'] = $my_array["SourceImageFace"]['BoundingBox']; + if (!empty($faceapi_result_decode) && !empty($faceapi_result_decode["SourceImageFace"])) { + $bounding_box['source_image'] = $faceapi_result_decode["SourceImageFace"]['BoundingBox']; } $where_condition_array = array('fk_pd_id' => $pdid, 'isactive' => 1,'co_applicant_id'=>$apcntid); diff --git a/api/application/helpers/faceapi_helper.php b/api/application/helpers/faceapi_helper.php index 99bf5959..30489599 100644 --- a/api/application/helpers/faceapi_helper.php +++ b/api/application/helpers/faceapi_helper.php @@ -78,9 +78,11 @@ class faceapi $Similarity_split = explode(".", $Similarity); $Similarity_value = $Similarity_split[0]; list($imagewidth, $imageheight) = getimagesize($destination_path); - if ($Similarity_value >= 70) { // above 70 green + if ($Similarity_value > 80) { // above 81 green $color = imagecolorallocate($img, 0, 153, 0); - } else if ($Similarity_value < 70) { // below 70 red + } else if ($Similarity_value <= 80 && $Similarity_value > 60) { // in between 61 to 80 orange + $color = imagecolorallocate($img, 255, 165, 0); + } else if ($Similarity_value <= 60) { // below 60 red $color = imagecolorallocate($img, 255, 0, 0); } $white = imagecolorallocate($img, 255, 255, 255); @@ -173,8 +175,10 @@ class faceapi $image_data = file_get_contents($destination_path_2); $base64 = base64_encode($image_data); unlink($destination_path_2); + $Similarity_split = explode(".", $Similarity); + $Similarity_value = $Similarity_split[0]; // if($i === null){ - return array('name' => $temp_image_name, 'base64' => $base64, 'Similarity' => $Similarity); + return array('name' => $temp_image_name, 'base64' => $base64, 'Similarity' => $Similarity_value); // }else{ // return array($i => array('name' => $temp_image_name, 'base64' => $base64, 'Similarity' => $Similarity)); // } diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php index 1d700b30..d374ddc3 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php @@ -8,10 +8,6 @@ $loan_word = $pd_master_details[0]['lender_short_name'] != 'CFPL' ? 'Loan' : 'Fa