fairoj : mergered changes

src/pages/pd-question/pd-question-business-group/pd-question-business-group.ts

@@ -79,13 +79,8 @@ export class PdQuestionBusinessGroupPage {
     // console.log("form_id",details.form_id)
   }
   if(details.form_id==14){
-<<<<<<< HEAD
-    this.navCtrl.push(PdQuestionFinancialInfoPage,{'FormId':details.form_id,'pdDetails':this.pdDetails});
+    this.navCtrl.push(PdQuestionFinancialInfoPage,{'formDetails':details,'pdDetails':this.pdDetails});
     console.log("form_id",details.form_id)
-=======
-    this.navCtrl.push('',{'formDetails':details,'pdDetails':this.pdDetails});
-    // console.log("form_id",details.form_id)
->>>>>>> 58523f626d3fb31e1a5befaed30ae2a532d89141
   }
   if(details.form_id==15){
     this.navCtrl.push(PdQuestionSupplierInfoPage,{'formDetails':details,'pdDetails':this.pdDetails});

src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.html

@@ -7,7 +7,8 @@
 <ion-header>
 
   <ion-navbar color="optblue">
-    <ion-title>Financial Information</ion-title>
+    <!-- <ion-title>Financial Information</ion-title> -->
+    <ion-title>{{formDetails.form_name}}</ion-title>
   </ion-navbar>
 
 </ion-header>

src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.ts

@@ -43,11 +43,14 @@ export class PdQuestionFinancialInfoPage {
   AV_SalesInwords: any=[];
   AV_marginProfitAmtInwords: any=[];
   AV_marginLossAmtInwords: any=[];
+    formDetails: any;
 
   constructor(public navCtrl: NavController, public navParams: NavParams,public aws:AwsServiceProvider,
                       public toast:ToastProvider, public qustCat:QuestionCategoryProvider,public fb:FormBuilder,public cons:ConstantsProvider) {
     this.pdDetails=this.navParams.get('pdDetails');
-    this.FormId=this.navParams.get('FormId');
+    this.formDetails=this.navParams.get('formDetails');
+    this.FormId = this.formDetails.form_id;
+    // this.FormId=this.navParams.get('FormId');
     this.company_id=this.pdDetails.company_id
     this.users=this.aws.getlocale();
     console.log("Pd",this.pdDetails);