From bb46cb91bae7d41b7aceced5e08423f9e070f764 Mon Sep 17 00:00:00 2001 From: velz Date: Fri, 7 Dec 2018 17:41:57 +0530 Subject: [PATCH] GET LATEST BLOB OF PD REPORT --- api/application/config/constants.php | 2 +- api/application/config/routes.php | 1 + api/application/controllers/PD_Controller.php | 34 +++- api/application/docs/sample.pdf | Bin 3077 -> 2331 bytes api/application/docs/temp.html | 172 +----------------- api/application/libraries/AWS_S3.php | 2 +- 6 files changed, 35 insertions(+), 176 deletions(-) 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 90d3ee9cbc483386b89cd28c7ce22784e8edfb46..a6dd659477db903ff3f689b79ce22d47a0c6a86f 100644 GIT binary patch delta 1254 zcmVxDEF*h?ZG&Ylf0UQT6F*h?ZG&Yl?0egQjGc+JRJ_>Vma%Ev{ z3V58QS50r*Mi9OGS4?gRAZ+%VOY|0?ZJO4H+PWn<&@yGQp-6$0BlzEURwP%;<(j2j z*jU&D&b&ACX7=NT5~c)Dq7BDYBpRBhn@?*Hl2E20F_K7~!ukFfDLSelH`1=0# z1wMR-^%wYcZNGn40z=4|?{~+2={qEf=#-W=iff8V3)P+&qCFU$8(Ue8V+&>=E5R)=zDbE%rJBw}N(o#&c_6)Ga=q#~uFY6gHGjrF6v@oL>+i213kfHs&J-(_~ zs*REfW1KtPByJ;Ol()t%^vAwL3k#-NVq<@aY2Hh9bD&N)2kP>6pkA?iP+zx@?XpnQ zjIPpcTC^~u7~5#kP&bJa*zMb|=_Z_98n=;Tlx~78s7HrbVrVeY+8vy4lFNZQxg4lV z*MWL9?m>OILbl67O*6Vmu4&Q2jACq~MMJqXj;NYF%-CgD3~y*k+s2dLB}ZwB;jDi} z5A!`-d-SDlSL}%cq#|hm*;$rChE$hDnp&>g5yOH7=|rf;xU+LSe?`FlLp!SWI@w|3 zYVgJ%lO~0ONCBj?Ks|MVV&72Ijt(v|}vvoR`aTo!zM)?C zn^q*+QVL(xCNZu9Mly9R^}71jSyAD&k8kN-JoEiyzh}II*DUQL41}x&Bm4ymD^TPQ zvxEr;0xU5%FgPGEFfcGMAZ{QEFfcGMFfcJVF*hJEFfcGMAZ{QEFfcGMFfcJWGBuO8 Q3q%SqGcyV$B}Gq03jI?`9smFU delta 2016 zcmV<62Os#G5``GBc>xDDF*Y?bG&7Tc0UQT5F*Y?bG&7T<0egQqI4~eSJ_>Vma%Ev{ z3V58gSWR!-HW0n%S1`8(FjVnF6ouXbv`y3IP{+3Xv9evNX1~}u_X1~i#JzOwpDq|%A<7(10`dE$6=~b z6mZFGq{v2ko0F%fGTmpJv}~TAFHpoV3<(~G5t#~j!accN?ed1e-$7XNCrS6@wyO7F zPw%W5{?jzsvDxgao9y|ST#(1=z9#?Nr$v67Z_{I5m85^X-(P3-prs}YDgw%5PZpnE zJw1KJQ98s=uP?|hZOC<&l_cFB^Ka=fySea$mMRXEqMp#(wA5LWLy@ITM!scre)~us z^5d>czNofoL9Xkx-0lKjWJv?bB2VPE)ggmGMM3VeBdN1P@kpAgDqp_zh2fghes(Y% z<}$lW>zjYZTUD3@l=^7v>8frw#~u9hP-Zor4lYEbSfHZVgZnMN^{&lmTnKA->Rn z6t>W=fX-5Y#gxQ)3y*szW9S%?I<6Z#hDJsQDH5nrDFkUO4pJntxAc(C0FdKUmqnVE z^J9Mv8b)6jjG{2um?x-qqani*ciO8nlq9g7a=rIp;ixs6@1J&Uy>8M9SW4 z6>kRA5obVA?L8=Nx9q(TbK`86g_>4$7IV|4jVtnH>unmaN8z;NdV83mPv1G<$lM%Y zJFQB@ABU4D9MmuL8Ij;+Clu{1cGIoy7~<$Zo2Hf5P#!rmxY>E zbl%FFG;LgwFI#WZ^y&k9yKm0$x38}ABHMJgDMX)uZH5oZmoPQ)worhDj#j;Z*~X{k zFQw0bI{FN#E8l?Po=3eGqHmn-vQX2C&Z2MHv~fkgY`skb`UEV?b{C(a?~p$3;mUvC z-;^zT61JLnP<;#&Qx49&ScRiiFYP(Iiai7B*fXH6dIO4EZccl|-Z6>`;owM(@&c5Df<@QnEun+h37G5Ek#>qu5l6rm$bXSUG2r$~h%x+*Z zWUilQ?4Smc2Jr~8vn+)ir@AcC)N+5`{yA>gs2oqKzT9aW503z7K9t?9w8Ml;Y#hO_ zvo=jQ;RzlgqY!>i9!N;uk&mSP4-F#n84Nc%V!IQ>N#AQ@kcQn4-}7&agU=;A-}VHh zs12R}?2BDUeM9rTl?6%RVwN?(5=E}l68^xCG$LQ}hg|<8Nd=GDJN*FzsBC{Za6b_O){qax{IMMfDG-`T3*2r>ukLlJ^lzLfXVCoN z^!FzOuhS0a3SNSVAc}=w@cMr%t&h8$T&Djnmb-Wo2Qu_&Hb(A3L6O)Mg%^a)s#>33 zvE`x^k7>Y#PZ9i4QHl#_kyp<pUafVz%eG%gJGO(*8Lkn^sA~Va{zMa4^I&ljj5hN>IXcWLS|eTW`~lpmdrpIu?%H4b5mT?vi7a77EX-WOzf1T;I+X zj!V!(&a;$uB-=8HM4GMy 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'); }