diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 2c2eee30..09e491fb 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -8714,7 +8714,7 @@ class PD_Controller extends REST_Controller // } $final_data[] = $temp; } else { - $temp_array = array('img_key' => $key, 'img_name' => $value[0], 'fk_form_id' => $value[1],"is_multiple" => $value[2], 'pd_image_alias_name' => "", 'is_name_editable' => $value[3],'content_type'=>($key =='Video' ? "2" : "1")); + $temp_array = array('img_key' => $key, 'img_name' => $value[0], 'fk_form_id' => $value[1],"is_multiple" => $value[2], 'pd_image_alias_name' => "", 'is_name_editable' => $value[3],'content_type'=>(strtoupper($key) =='VIDEO' ? "2" : "1")); $temp_array[($value[2] ? 'img_data' : 'img_url')] = ($value[2] ? array() : '' ); $final_data[] = $temp_array; } @@ -8727,7 +8727,7 @@ class PD_Controller extends REST_Controller // echo "I have CT \n".$value['content_type']; if (!$value['fk_form_id'] && ($value['pd_document_title'] != 'satellite')) { // echo "I have CT if cond \n".$value['content_type']; - $final_data[] = array('img_key' => 'common_image', 'img_name' => $value['pd_document_title'], 'img_url' => $value['doc_url'], 'fk_form_id' => null, 'pd_document_id' => $value['pd_document_id'], 'pd_image_alias_name' => $value['pd_image_alias_name'], 'is_name_editable' => $value['is_name_editable']); + $final_data[] = array('img_key' => 'common_image', 'img_name' => $value['pd_document_title'], 'img_url' => $value['doc_url'], 'fk_form_id' => null, 'pd_document_id' => $value['pd_document_id'], 'pd_image_alias_name' => $value['pd_image_alias_name'], 'is_name_editable' => $value['is_name_editable'],'content_type'=>(strtoupper($key) =='VIDEO' ? "2" : "1")); unset($this->existing_imges[$key]); } elseif ($value['pd_document_title'] != 'satellite' && ($value['fk_form_id'] == 24 || $value['fk_form_id'] == 34)) { // echo "I have CT ifelse cond \n".$value['content_type']; @@ -8746,7 +8746,7 @@ class PD_Controller extends REST_Controller } if ($is_listed) { - $final_data[] = array('img_key' => 'docs_to_be_collected', 'img_name' => $value['pd_document_title'], 'img_url' => $value['doc_url'], 'fk_form_id' => 24, 'is_multiple' => 0, 'pd_document_id' => $value['pd_document_id'], 'pd_image_alias_name' => $value['pd_image_alias_name'], 'is_name_editable' => $value['is_name_editable']); + $final_data[] = array('img_key' => 'docs_to_be_collected', 'img_name' => $value['pd_document_title'], 'img_url' => $value['doc_url'], 'fk_form_id' => 24, 'is_multiple' => 0, 'pd_document_id' => $value['pd_document_id'], 'pd_image_alias_name' => $value['pd_image_alias_name'], 'is_name_editable' => $value['is_name_editable'],'content_type'=>(strtoupper($key) =='VIDEO' ? "2" : "1")); //break; } @@ -8760,17 +8760,17 @@ class PD_Controller extends REST_Controller //add remaining docs_to_be_collected into final array if (is_array($docs_to_be_collected) && count($docs_to_be_collected)) { foreach ($docs_to_be_collected as $key => $value) { - $final_data[] = array('img_key' => 'docs_to_be_collected', 'img_name' => $value['doc_name'], 'img_url' => "", 'fk_form_id' => "24", 'pd_document_id' => $value['pd_document_id'], 'pd_image_alias_name' => $value['pd_image_alias_name'], 'is_name_editable' => $value['is_name_editable']); + $final_data[] = array('img_key' => 'docs_to_be_collected', 'img_name' => $value['doc_name'], 'img_url' => "", 'fk_form_id' => "24", 'pd_document_id' => $value['pd_document_id'], 'pd_image_alias_name' => $value['pd_image_alias_name'], 'is_name_editable' => $value['is_name_editable'],'content_type'=>(strtoupper($key) =='VIDEO' ? "2" : "1")); } } } else { foreach ($this->photo_names as $key => $value) { - $final_data[] = array('img_key' => $key, 'img_name' => $value[0], 'img_url' => "", 'fk_form_id' => $value[1], "is_multiple" => $value[2], 'pd_image_alias_name' => "", 'is_name_editable' => $value[3]); + $final_data[] = array('img_key' => $key, 'img_name' => $value[0], 'img_url' => "", 'fk_form_id' => $value[1], "is_multiple" => $value[2], 'pd_image_alias_name' => "", 'is_name_editable' => $value[3] ,'content_type'=>(strtoupper($key) =='VIDEO' ? "2" : "1")); } if (is_array($docs_to_be_collected) && count($docs_to_be_collected)) { foreach ($docs_to_be_collected as $key => $value) { - $final_data[] = array('img_key' => 'docs_to_be_collected', 'img_name' => $value['doc_name'], 'img_url' => "", 'fk_form_id' => "24", "is_multiple" => 0, 'pd_image_alias_name' => "", 'is_name_editable' => 0); + $final_data[] = array('img_key' => 'docs_to_be_collected', 'img_name' => $value['doc_name'], 'img_url' => "", 'fk_form_id' => "24", "is_multiple" => 0, 'pd_image_alias_name' => "", 'is_name_editable' => 0 ,'content_type'=>(strtoupper($key) =='VIDEO' ? "2" : "1")); } } } @@ -8829,7 +8829,7 @@ class PD_Controller extends REST_Controller return $arr; // unset($this->photo_names['selfie_with_person_met']); // return $arr; - } else if ($current_img_key == 'Video') { + } else if (strtoupper($current_img_key) == 'VIDEO' && str_contains(strtoupper($value['pd_document_title']), 'VIDEO')) { if ($current_img[2]) { // echo "\n in if".$current_img_key; // echo '\n before '.$current_multiple_img_key; @@ -8855,7 +8855,7 @@ class PD_Controller extends REST_Controller if (!array_key_exists($current_img_key, $multiple_img_data)) { $multiple_img_data[$current_img_key] = array('img_key' => $value['pd_document_title'], 'img_name' => $this->photo_names[$value['pd_document_title']][0], 'img_data' => array(array('img_url' => $value['doc_url'], 'img_name' => $value['pd_document_title'], 'pd_document_id' => $value['pd_document_id'], 'pd_image_alias_name' => $value['pd_image_alias_name'], 'is_name_editable' => $value['is_name_editable'])), 'fk_form_id' => $this->photo_names[$value['pd_document_title']][1], 'is_multiple' => $current_img[2], 'pd_image_alias_name' => $value['pd_image_alias_name'], 'is_name_editable' => $this->photo_names[$value['pd_document_title']][3],'content_type'=> $value['content_type']); } else { - $multiple_img_data['VIDEO']['img_data'][] = array('img_url' => $value['doc_url'], 'img_name' => $value['pd_document_title'], 'pd_document_id' => $value['pd_document_id'], 'pd_image_alias_name' => $value['pd_image_alias_name'], 'is_name_editable' => $value['is_name_editable'],'content_type'=> $value['content_type']); + $multiple_img_data[$current_img_key]['img_data'][] = array('img_url' => $value['doc_url'], 'img_name' => $value['pd_document_title'], 'pd_document_id' => $value['pd_document_id'], 'pd_image_alias_name' => $value['pd_image_alias_name'], 'is_name_editable' => $value['is_name_editable']); } } else { $arr = array('img_key' => $value['pd_document_title'], 'img_name' => $value['pd_document_title'], 'img_url' => $value['doc_url'], 'content_type'=> $value['content_type'],'fk_form_id' => $this->photo_names[$value['pd_document_title']][1], 'is_multiple' => $current_img[2], 'pd_document_id' => $value['pd_document_id'], 'pd_image_alias_name' => $value['pd_image_alias_name'], 'is_name_editable' => $value['is_name_editable'],'content_type'=> $value['content_type']);