diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index e08bf47d..ffb20ee5 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -207,7 +207,7 @@ class Sales_PD_Controller extends REST_Controller { //$view_name = $sales_pd_data[0]['short_name'].'_'.$sales_pd_data[0]['abbr']; $view_name = $sales_pd_data[0]['short_name']; $html_content = $this->load->view('sale_pd_templates/'.$view_name,$view_data,true); - //echo $html_content;die(); + echo $html_content;die(); $pdf_doc = $this->pdfgenerator->generate($html_content, $filename='version', $stream=false, $paper = 'A4', $orientation = "portrait"); //End of PDF Gen using DOM PDF $output_file = $this->external_path ."/sales_pd/" . $sales_pd_id . "/temp.pdf"; @@ -334,14 +334,18 @@ class Sales_PD_Controller extends REST_Controller { if(isset($question['subfield_key'])) { - $temp_array[ $question['question_key'] ] .= $question['subfield_value']; - if(substr_count($temp_array[ $question['question_key'] ], ',')) + $temp_array[ $question['question_key'] ] .= $question['subfield_value'].','; + + } + + $temp_array[ $question['question_key'] ] = substr_replace($temp_array[ $question['question_key'] ],'', strrpos($temp_array[ $question['question_key'] ],','),1); + + if(substr_count($temp_array[ $question['question_key'] ], ',')) { + $temp_array[ $question['question_key'] ] = substr_replace($temp_array[ $question['question_key'] ],' and ', strrpos($temp_array[ $question['question_key'] ],','),1); } - - } } else if($question['is_repeatable'] == 1 ) { @@ -417,6 +421,7 @@ class Sales_PD_Controller extends REST_Controller { } } } + //print_r($final_string);die(); return $final_string; } @@ -431,6 +436,10 @@ class Sales_PD_Controller extends REST_Controller { //$location = $records['location']; $update_fields = array('geo_location' => $records['location']); $this->Sales_PD_Model->updateRecords($update_fields,SALES_PD_DATA,array('sales_pd_id' => $records['fk_sales_pd_id'])); + + //disable previous selfie img + $update_fields = array('isactive' => 0); + $this->Sales_PD_Model->updateRecords($update_fields,SALEPD_DOCS,array('img_name' => 'selfie_with_person_met' )); } $id = $this->Sales_PD_Model->saveRecords($records,SALEPD_DOCS); @@ -491,13 +500,14 @@ class Sales_PD_Controller extends REST_Controller { else { $records['status'] = 'COMPLETED'; - satellite_image::getSatelliteImage($id,2); $id = $this->Sales_PD_Model->updateRecords($records,SALES_PD_DATA,array('sales_pd_id' => $records['sales_pd_id'])); + satellite_image::getSatelliteImage($records['sales_pd_id'],2); } } else { - $id = $this->Sales_PD_Model->updateRecords($records,SALES_PD_DATA,array('sales_pd_id' => $records['sales_pd_id'])); + $id = $this->Sales_PD_Model->updateRecords($records,SALES_PD_DATA,array('sales_pd_id' => $records['sales_pd_id'])); + } } @@ -658,9 +668,76 @@ class Sales_PD_Controller extends REST_Controller { public function getSalesPDSectionData_post() { $records = $this->post('records'); + $section_data = array(); - $section_data = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('sales_pd_id' => $records['sales_pd_id'],'isactive' => 1,'section_id' => $records['section_id']),SALESPD_SECTION_DATA); - //print_r(json_decode($section_data[0]['section_data'],true));die(); + if($records['section_id'] != 9) + { + $section_data = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('sales_pd_id' => $records['sales_pd_id'],'isactive' => 1,'section_id' => $records['section_id']),SALESPD_SECTION_DATA); + //print_r( json_decode($section_data[0]['section_data'],true)); + } + else + { + + $images = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('fk_sales_pd_id' => $records['sales_pd_id'],'img_name !=' => 'satellite','isactive' => 1),SALEPD_DOCS); + //print_r($images);die(); + + $photo_names = array('selfie_with_person_met' => 'Selfie with person met','approach_to_pd_location' => 'Approach to pd location','name_board_seen' => 'Name board seen', 'stock_image' => 'Stock image','workplace_interior_image' => 'Workplace interior image','satellite1' => 'satellite'); + if(count($images)) + { + + $questions = array(); + $questions_group = array(); + + foreach ($images as $key => $value) + { + + $question['is_repeatable'] = ""; + $question['group_title'] = null; + //$question['answer_value'] = $value['img']; + $question['answer_value'] = "IMG"; + $question['question'] = $photo_names [ $value['img_name'] ]; + $question['question_key'] = $value['img_name']; + $question['type'] = 6; + $question['validations'] = []; + $question['raw_validations'] = []; + $question['api_properties'] = null; + $question['answers'] = null; + $question['onchange_properties'] = null; + if($value['img_name'] == 'selfie_with_person_met') + { + $questions[] = $question; + } + else + { + + // $temp['is_repeatable'] = ""; + // $temp['group_title'] = null; + // $temp['group_type'] = 6; + $questions[ $photo_names [ $value['img_name'] ] ] ['is_repeatable'] = 1; + $questions[ $photo_names [ $value['img_name'] ] ] ['group_title'] = $photo_names [ $value['img_name'] ]; + $questions[ $photo_names [ $value['img_name'] ] ] ['group_type'] = 6; + $questions[ $photo_names [ $value['img_name'] ] ] ['question_group']['questions'][] = $question; + } + + } + $temp['questions'] = $questions; + + $temp['section_id'] = 9; + $temp['section_name'] = 'Photography'; + $temp['onsubmit'] = ''; + $temp['sales_pd_id'] = $records['sales_pd_id']; + + + $temp2['section_data'] = json_encode($temp); + + $temp2['id'] = null; + $temp2['sales_pd_id'] = $records['sales_pd_id']; + $temp2['section_id'] = $records['section_id']; + $temp2['status'] = '1'; + $section_data[] = $temp2; + } + } + if($section_data) { $data['dataStatus'] = true;