diff --git a/api/application/config/constants.php b/api/application/config/constants.php index c16a9595..099a3631 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto // define login route name for token verification //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'generatePDReport'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getLatestPDReportBlob'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); diff --git a/api/application/config/routes.php b/api/application/config/routes.php index 44c6b11b..94ba4314 100644 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -166,6 +166,7 @@ $route['calculateAssessedIncome'] = 'PD_Controller/calculateAssessedIncome'; $route['saveAssessedIncomeCalculateMode'] = 'PD_Controller/saveAssessedIncomeCalculateMode'; $route['savePDAdditionalRequiremets'] = 'PD_Controller/savePDAdditionalRequiremets'; $route['generatePDReport'] = 'PD_Controller/generatePDReport'; +$route['getLatestPDReportBlob'] = 'PD_Controller/getLatestPDReportBlob'; //PD Form Related $route['getPDFormDetails'] = 'PD_Controller/getPDFormDetails'; diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 5528173f..6efa26f2 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -2544,6 +2544,32 @@ class PD_Controller extends REST_Controller { } + public function getLatestPDReportBlob_post() + { + $records = $this->post('records'); + $pdid = $records['pd_id']; + + $fields = array('pd_report_latest_version_blob'); + $where_condition_array = array('pd_id'=>$pdid); + $result_array = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDTRIGGER); + if(count($result_array)) + { + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['records'] = $result_array; + $this->response($data,REST_Controller::HTTP_OK); + } + else + { + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_NO_CONTENT; + $data['msg'] = 'No Data Available'; + $this->response($data,REST_Controller::HTTP_OK); + + } + + } + public function generatePDReport_post() { $records = $this->post('records'); @@ -2591,7 +2617,7 @@ class PD_Controller extends REST_Controller { $output_file = APPPATH."/docs/temp.html"; $ifp = fopen( $output_file, 'wb' ); - fwrite( $ifp, $original_template ); + //fwrite( $ifp, $original_template ); fwrite( $ifp, $result_array[0]['content'] ); fclose( $ifp ); //print_r($output_file); @@ -2614,7 +2640,7 @@ class PD_Controller extends REST_Controller { { $where_condition_array = array("pd_id" => $pdid); - $temp_array = array('is_original_report_created'=>1); + $temp_array = array('is_original_report_created'=>1,'pd_report_latest_version_blob'=>$result_array[0]['content']); $id = $this->PD_Model->updateRecords($temp_array,PDTRIGGER,$where_condition_array); $uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname,$key,$time = '3600 seconds'); @@ -2622,7 +2648,7 @@ class PD_Controller extends REST_Controller { { $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = array('pd_report_uri' => $s3result['ObjectURL']); + $data['records'] = array('pd_report_uri' => $uri); $this->response($data,REST_Controller::HTTP_OK); } else @@ -2665,4 +2691,6 @@ class PD_Controller extends REST_Controller { } } + + } \ No newline at end of file diff --git a/api/application/docs/sample.pdf b/api/application/docs/sample.pdf index 90d3ee9c..a6dd6594 100644 Binary files a/api/application/docs/sample.pdf and b/api/application/docs/sample.pdf differ diff --git a/api/application/docs/temp.html b/api/application/docs/temp.html index e0e1bd33..bbf6ef0d 100644 --- a/api/application/docs/temp.html +++ b/api/application/docs/temp.html @@ -1,174 +1,4 @@ -

My html content

Hi {{name_ans}},

-

This is {{name_ans}}, I am form {{age_ans}}, {{assets_mode}} , your Qualification number ({{qualification_ans}}), has been activated,

-

can you please verify with your local branch.

-

Hope will get reply soon!!

-

Regards,

-

{{name_of_the_owner}},

-

Main Raw Materials are Listed Below

-

{{main_raw_materials}}

- -

Suppliers are Listed Below

- - - - - - - - - - - -
{{supplier_name}}{{contact_person}}{{mobile_number}}{{payment_mode}}{{frequency_of_purchase}}
- - -
- - A bar chart showing information - 4 apples; 8 bananas; 15 kiwis; 16 oranges; 23 lemons - - - 4 apples - - - - 8 bananas - - - - 15 kiwis - - - - 16 oranges - - - - 23 lemons - - - - - - - - - -

My html content

Hi Karthi Raj,

+

My html content

Hi Karthi Raj,

This is Karthi Raj, I am form 50, 2 , your Qualification number (2), has been activated,

can you please verify with your local branch.

Hope will get reply soon!!

diff --git a/api/application/libraries/AWS_S3.php b/api/application/libraries/AWS_S3.php index 5110be00..2441339c 100644 --- a/api/application/libraries/AWS_S3.php +++ b/api/application/libraries/AWS_S3.php @@ -21,7 +21,7 @@ class AWS_S3 //echo "listAllBuckets"; $this->S3 = S3Client::factory($this->s3_properties); - // $this->deleteSingleObjFromBucket(); + $this->getAllObjectsInaBucket('lender1','pd1'); }