Fairoj : RI Changes and Issues fixed

.sourcemaps/0.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/pages/pd-question-rental-dash/pd-question-rental-dash.module.ts","../../src/pages/pd-question-rental-dash/pd-question-rental-dash.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACqB;AAUrE;IAAA;IAA6C,CAAC;IAAjC,8BAA8B;QAR1C,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,0FAAwB;aACzB;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,0FAAwB,CAAC;aACnD;SACF,CAAC;OACW,8BAA8B,CAAG;IAAD,qCAAC;CAAA;AAAH;;;;;;;;;;;;;;;;;;;;;ACZD;AACe;AAEzD;;;;;GAKG;AAOH;IAEE,kCAAmB,OAAsB,EAAS,SAAoB;QAAnD,YAAO,GAAP,OAAO,CAAe;QAAS,cAAS,GAAT,SAAS,CAAW;IACtE,CAAC;IAED,iDAAc,GAAd;QACE,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;IACzD,CAAC;IAPU,wBAAwB;QAJpC,wEAAS,CAAC;YACT,QAAQ,EAAE,8BAA8B;WACG;SAC5C,CAAC;iCAGsE;OAF3D,wBAAwB,CASpC;IAAD,CAAC;AAAA;SATY,wBAAwB,kB","file":"0.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { PdQuestionRentalDashPage } from './pd-question-rental-dash';\n\n@NgModule({\n  declarations: [\n    PdQuestionRentalDashPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(PdQuestionRentalDashPage),\n  ],\n})\nexport class PdQuestionRentalDashPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/pd-question-rental-dash/pd-question-rental-dash.module.ts","import { Component } from '@angular/core';\nimport { IonicPage, NavController, NavParams } from 'ionic-angular';\n\n/**\n * Generated class for the PdQuestionRentalDashPage page.\n *\n * See https://ionicframework.com/docs/components/#navigation for more info on\n * Ionic pages and navigation.\n */\n\n@IonicPage()\n@Component({\n  selector: 'page-pd-question-rental-dash',\n  templateUrl: 'pd-question-rental-dash.html',\n})\nexport class PdQuestionRentalDashPage {\n\n  constructor(public navCtrl: NavController, public navParams: NavParams) {\n  }\n\n  ionViewDidLoad() {\n    console.log('ionViewDidLoad PdQuestionRentalDashPage');\n  }\n\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/pd-question-rental-dash/pd-question-rental-dash.ts"],"sourceRoot":""}

package-lock.json

@@ -2561,7 +2561,7 @@
         "acorn": "1.2.2",
         "foreach": "2.0.5",
         "isarray": "0.0.1",
-        "object-keys": "1.0.11"
+        "object-keys": "1.1.1"
       },
       "dependencies": {
         "isarray": {
@@ -4346,9 +4346,9 @@
       "dev": true
     },
     "object-keys": {
-      "version": "1.0.11",
+      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
     },
     "object.omit": {
       "version": "2.0.1",

package.json

@@ -35,7 +35,7 @@
     "@ionic-native/splash-screen": "4.4.0",
     "@ionic-native/sqlite": "^4.19.0",
     "@ionic-native/status-bar": "^4.16.0",
-    "@ionic/storage": "2.1.3",
+    "@ionic/storage": "^2.1.3",
     "@netbasal/content-loader": "^1.1.0",
     "@types/chart.js": "^2.7.40",
     "amazon-cognito-identity-js": "^3.0.3",

platforms/android/app/build/intermediates/assets/debug/www/build/main.css

@@ -29300,6 +29300,38 @@ page-pd-question-assessed-household .mat-card-content {
   margin-bottom: 0px !important;
 }
 
+page-pd-question-assessed-images .scroll-content {
+  padding: 16px;
+}
+
+page-pd-question-assessed-images .scroll-content {
+  background-color: #eee;
+}
+
+page-pd-question-assessed-images .mat-card {
+  margin-bottom: 15px;
+  border-radius: 10px !important;
+  -webkit-box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
+  box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
+}
+
+page-pd-question-assessed-images .mat-card-content {
+  margin-bottom: 0px !important;
+}
+
+page-pd-question-assessed-images img {
+  padding: 0 5px 0 0;
+  height: 180px;
+}
+
+page-pd-question-assessed-images input {
+  width: 100px;
+  border-radius: 4px;
+  border-color: gray;
+  font-size: 12px;
+  height: 28px;
+}
+
 page-pd-question-assessed-info ion-scroll.scroll-y .scroll-content {
   width: 100%;
   height: 200px;
@@ -29634,6 +29666,19 @@ page-pd-question-business-banking .scroll-content {
   background-color: #eee;
 }
 
+page-pd-question-business-banking img {
+  padding: 0 5px 0 0;
+  height: 180px;
+}
+
+page-pd-question-business-banking input {
+  width: 100px;
+  border-radius: 4px;
+  border-color: gray;
+  font-size: 12px;
+  height: 28px;
+}
+
 page-pd-question-business-info mat-card-title {
   font-weight: bold;
   font-size: 18px;
@@ -29700,6 +29745,19 @@ page-pd-question-business-info .checkbo {
   margin: 15px;
 }
 
+page-pd-question-business-info img {
+  padding: 0 5px 0 0;
+  height: 180px;
+}
+
+page-pd-question-business-info .docName {
+  width: 100px;
+  border-radius: 4px;
+  border-color: gray;
+  font-size: 12px;
+  height: 28px;
+}
+
 page-pd-question-client-info mat-hint {
   font-size: 12px;
 }
@@ -29719,6 +29777,19 @@ page-pd-question-client-info .mat-card-content {
   margin-bottom: 0px !important;
 }
 
+page-pd-question-client-info img {
+  padding: 0 5px 0 0;
+  height: 180px;
+}
+
+page-pd-question-client-info .docName {
+  width: 100px;
+  border-radius: 4px;
+  border-color: gray;
+  font-size: 12px;
+  height: 28px;
+}
+
 page-pd-question-financial-info mat-form-field {
   width: 100%;
 }
@@ -29775,6 +29846,19 @@ page-pd-question-financial-info .mat-input-placeholder {
   white-space: normal;
 }
 
+page-pd-question-financial-info img {
+  padding: 0 5px 0 0;
+  height: 180px;
+}
+
+page-pd-question-financial-info .docName {
+  width: 100px;
+  border-radius: 4px;
+  border-color: gray;
+  font-size: 12px;
+  height: 28px;
+}
+
 page-pd-question-stock-info mat-hint {
   font-size: 12px;
 }
@@ -29811,6 +29895,19 @@ page-pd-question-stock-info mat-select {
   margin: 5px 0;
 }
 
+page-pd-question-stock-info img {
+  padding: 0 5px 0 0;
+  height: 180px;
+}
+
+page-pd-question-stock-info .docName {
+  width: 100px;
+  border-radius: 4px;
+  border-color: gray;
+  font-size: 12px;
+  height: 28px;
+}
+
 page-pd-question-supplier-info mat-hint {
   font-size: 12px;
 }
@@ -29830,6 +29927,19 @@ page-pd-question-supplier-info .mat-card-content {
   margin-bottom: 0px !important;
 }
 
+page-pd-question-supplier-info img {
+  padding: 0 5px 0 0;
+  height: 180px;
+}
+
+page-pd-question-supplier-info .docName {
+  width: 100px;
+  border-radius: 4px;
+  border-color: gray;
+  font-size: 12px;
+  height: 28px;
+}
+
 page-pd-question-current-loans mat-form-field {
   width: 100%;
 }

platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Thu Apr 11 13:00:27 IST 2019
+#Fri Apr 12 13:01:24 IST 2019
 base.0=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\0
 path.0=classes.dex
 renamed.0=classes.dex

platforms/android/app/build/intermediates/incremental/packageDebug/debug/file-input-save-data.txt

@@ -1,5 +1,5 @@
 #Internal package file, do not edit.
-#Thu Apr 11 13:00:28 IST 2019
+#Fri Apr 12 13:01:24 IST 2019
 60.set=ASSET
 52.set=ASSET
 53.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug

platforms/android/app/src/main/assets/www/build/main.css

@@ -29300,6 +29300,38 @@ page-pd-question-assessed-household .mat-card-content {
   margin-bottom: 0px !important;
 }
 
+page-pd-question-assessed-images .scroll-content {
+  padding: 16px;
+}
+
+page-pd-question-assessed-images .scroll-content {
+  background-color: #eee;
+}
+
+page-pd-question-assessed-images .mat-card {
+  margin-bottom: 15px;
+  border-radius: 10px !important;
+  -webkit-box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
+  box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
+}
+
+page-pd-question-assessed-images .mat-card-content {
+  margin-bottom: 0px !important;
+}
+
+page-pd-question-assessed-images img {
+  padding: 0 5px 0 0;
+  height: 180px;
+}
+
+page-pd-question-assessed-images input {
+  width: 100px;
+  border-radius: 4px;
+  border-color: gray;
+  font-size: 12px;
+  height: 28px;
+}
+
 page-pd-question-assessed-info ion-scroll.scroll-y .scroll-content {
   width: 100%;
   height: 200px;
@@ -29634,6 +29666,19 @@ page-pd-question-business-banking .scroll-content {
   background-color: #eee;
 }
 
+page-pd-question-business-banking img {
+  padding: 0 5px 0 0;
+  height: 180px;
+}
+
+page-pd-question-business-banking input {
+  width: 100px;
+  border-radius: 4px;
+  border-color: gray;
+  font-size: 12px;
+  height: 28px;
+}
+
 page-pd-question-business-info mat-card-title {
   font-weight: bold;
   font-size: 18px;
@@ -29700,6 +29745,19 @@ page-pd-question-business-info .checkbo {
   margin: 15px;
 }
 
+page-pd-question-business-info img {
+  padding: 0 5px 0 0;
+  height: 180px;
+}
+
+page-pd-question-business-info .docName {
+  width: 100px;
+  border-radius: 4px;
+  border-color: gray;
+  font-size: 12px;
+  height: 28px;
+}
+
 page-pd-question-client-info mat-hint {
   font-size: 12px;
 }
@@ -29719,6 +29777,19 @@ page-pd-question-client-info .mat-card-content {
   margin-bottom: 0px !important;
 }
 
+page-pd-question-client-info img {
+  padding: 0 5px 0 0;
+  height: 180px;
+}
+
+page-pd-question-client-info .docName {
+  width: 100px;
+  border-radius: 4px;
+  border-color: gray;
+  font-size: 12px;
+  height: 28px;
+}
+
 page-pd-question-financial-info mat-form-field {
   width: 100%;
 }
@@ -29775,6 +29846,19 @@ page-pd-question-financial-info .mat-input-placeholder {
   white-space: normal;
 }
 
+page-pd-question-financial-info img {
+  padding: 0 5px 0 0;
+  height: 180px;
+}
+
+page-pd-question-financial-info .docName {
+  width: 100px;
+  border-radius: 4px;
+  border-color: gray;
+  font-size: 12px;
+  height: 28px;
+}
+
 page-pd-question-stock-info mat-hint {
   font-size: 12px;
 }
@@ -29811,6 +29895,19 @@ page-pd-question-stock-info mat-select {
   margin: 5px 0;
 }
 
+page-pd-question-stock-info img {
+  padding: 0 5px 0 0;
+  height: 180px;
+}
+
+page-pd-question-stock-info .docName {
+  width: 100px;
+  border-radius: 4px;
+  border-color: gray;
+  font-size: 12px;
+  height: 28px;
+}
+
 page-pd-question-supplier-info mat-hint {
   font-size: 12px;
 }
@@ -29830,6 +29927,19 @@ page-pd-question-supplier-info .mat-card-content {
   margin-bottom: 0px !important;
 }
 
+page-pd-question-supplier-info img {
+  padding: 0 5px 0 0;
+  height: 180px;
+}
+
+page-pd-question-supplier-info .docName {
+  width: 100px;
+  border-radius: 4px;
+  border-color: gray;
+  font-size: 12px;
+  height: 28px;
+}
+
 page-pd-question-current-loans mat-form-field {
   width: 100%;
 }

src/app/app.module.ts

@@ -122,6 +122,10 @@ import { ContentLoaderModule } from '@netbasal/content-loader';
 import {PdQuestionAssessedDailyPurchasePage} from '../pages/pd-question/pd-question-assessed-daily-purchase/pd-question-assessed-daily-purchase'
 import {RupeeCurrencyFormatPipe} from '../pipes/rupee-currency-format/rupee-currency-format'
 import {PdQuestionAssessedImagesPage} from '../pages/pd-question/pd-question-assessed-images/pd-question-assessed-images'
+// import {PipesModule} from '../pipes/pipes.module'
+import {IonicStorageModule} from '@Ionic/storage'
+import { StorageProvider } from '../providers/storage/storage';
+import {PdQuestionRentalDashPage} from '../pages/pd-question/pd-question-rental-info/pd-question-rental-dash/pd-question-rental-dash'
 
 @NgModule({
     declarations: [
@@ -175,7 +179,10 @@ import {PdQuestionAssessedImagesPage} from '../pages/pd-question/pd-question-ass
         PdQuestionAssessedSummaryPage,
         PdQuestionAssessedDailyPurchasePage,
         PdQuestionAssessedImagesPage,
-        RupeeCurrencyFormatPipe
+        RupeeCurrencyFormatPipe,
+        PdQuestionRentalDashPage
+        // PipesModule
+        
     ],
     imports: [
         BrowserModule,ReactiveFormsModule,FormsModule,
@@ -213,6 +220,7 @@ import {PdQuestionAssessedImagesPage} from '../pages/pd-question/pd-question-ass
         MatTooltipModule,
         MatStepperModule,HttpClientModule,IonicImageViewerModule,NgxMatSelectSearchModule,
         ContentLoaderModule,
+        IonicStorageModule.forRoot()
         
     ],
     bootstrap: [IonicApp],
@@ -266,7 +274,8 @@ import {PdQuestionAssessedImagesPage} from '../pages/pd-question/pd-question-ass
         PdQuestionSalaryInfoPage,
         PdQuestionAssessedSummaryPage,
         PdQuestionAssessedDailyPurchasePage,
-        PdQuestionAssessedImagesPage
+        PdQuestionAssessedImagesPage,
+        PdQuestionRentalDashPage
        
     ],
     providers: [
@@ -286,7 +295,8 @@ import {PdQuestionAssessedImagesPage} from '../pages/pd-question/pd-question-ass
     CameraProvider,Camera,
     PdPipe,LocationAccuracy,
     LoadingProvider,Geolocation,
-    DatabaseProvider
+    DatabaseProvider,
+    StorageProvider,
     ]
 })
 export class AppModule {}

src/pages/pd-question-category/pd-question-category.ts

@@ -23,7 +23,7 @@ import { PdQuestionPersonalInfoPage } from '../pd-question/pd-question-personal-
 import { PdQuestionStockInfoPage } from '../pd-question/pd-question-business-group/pd-question-stock-info/pd-question-stock-info';
 import { PdQuestionFinancialInfoPage } from '../pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info';
 import { PdQuestionClientInfoPage } from '../pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info';
-import { PdQuestionRentalInfoPage } from '../pd-question/pd-question-rental-info/pd-question-rental-info';
+// import { PdQuestionRentalInfoPage } from '../pd-question/pd-question-rental-info/pd-question-rental-info';
 import { PdQuestionAssessedInfoPage } from '../pd-question/pd-question-assessed-info/pd-question-assessed-info';
 import { PdQuestionAssessedDashPage } from '../pd-question/pd-question-assessed-dash/pd-question-assessed-dash';
 import { PdQuestionLenderRepresentativePage } from '../pd-question/pd-question-lender-representative/pd-question-lender-representative';
@@ -32,6 +32,7 @@ import { PdQuestionNeighbourHoodPage } from '../pd-question/pd-question-neighbou
 import { PdQuestionFinalRemarkPage } from '../pd-question/pd-question-final-remark/pd-question-final-remark';
 import { PdQuestionBusinessPage } from '../pd-question/pd-question-business/pd-question-business'
 import { PdQuestionBusinessGroupPage } from '../pd-question/pd-question-business-group/pd-question-business-group'
+import {PdQuestionRentalDashPage} from '../pd-question/pd-question-rental-info/pd-question-rental-dash/pd-question-rental-dash'
 /**
  * Generated class for the PdQuestionCategoryPage page.
  *
@@ -271,7 +272,7 @@ searchitem:any;
         this.navCtrl.push(PdQuestionClientInfoPage,{'FormId':formName,'pdDetails':this.pdinfo});                                
       }else if(categroyId ==17)
       {
-        this.navCtrl.push(PdQuestionRentalInfoPage,{'FormId':formName,'pdDetails':this.pdinfo});                                
+        this.navCtrl.push(PdQuestionRentalDashPage,{'FormId':formName,'pdDetails':this.pdinfo});                                
         
       }
       else if(categroyId==16)

src/pages/pd-question/pd-question-address/pd-question-address.ts

@@ -11,6 +11,7 @@ import {Camera} from '@ionic-native/camera'
 import {searchValue} from '../search'
 import { takeUntil } from 'rxjs/operators';
 import{LoadingProvider} from '../../../providers/common-provider/loading'
+import {StorageProvider} from '../../../providers/storage/storage'
 /**
  * Generated class for the PdQuestionAddressPage page.
  *
@@ -81,7 +82,7 @@ export class PdQuestionAddressPage {
   constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
     public qustCat:QuestionCategoryProvider,public aws:AwsServiceProvider,
     public toast:ToastProvider,public alerCtrl:AlertController,public constant:ConstantsProvider,
-    public camera:Camera,private loading:LoadingProvider) {
+    public camera:Camera,private loading:LoadingProvider,private storagedb:StorageProvider) {
     
     this.questionDetails = this.navParams.get('questionDetails');
     
@@ -142,6 +143,7 @@ export class PdQuestionAddressPage {
     //this.addUnits();
     console.log("ionViewDidLoad PdQuestionAddressPage")
     this.getaddressForm();  
+  //  this.getaddressFormFromLocal();   //FOR GETTING DATA FROM LOCAL STORAGE IF IT IS TRUE
     this.getPDImages();
     
   }
@@ -326,6 +328,19 @@ countRowsForTextarea(text){
               })
             })
           }
+          // let datas:any=this.pdQuestionAddress.value
+          // datas.pd_id=this.pdDetails.pd_id
+          // datas.form_id=this.FormId.form_id;
+          // datas.active=true;
+          // let form_id=this.FormId.form_id
+          // // let recors={'records':datas}
+          // this.storagedb.insertData(datas).then(res=>{
+          //   let alert=this.toast.setAlert('data',JSON.stringify(res))
+          //   alert.present();
+          //   console.log(res);
+          // })
+          //For Inserting the data locally
+          // this.localInsert(true);
           resolve();
         }
       })
@@ -679,7 +694,7 @@ countRowsForTextarea(text){
       
      
       this.qustCat.saveForm(records).subscribe(data => {
-        
+        console.log(data);
               // let params: any = {};
               // params.pd_id = '250';
               // params.pd_form_id = '250';
@@ -689,7 +704,9 @@ countRowsForTextarea(text){
               // },5000)
               if(data['dataStatus']==true){
                  //TO CHANGE THE FORM STATE 
+
         this.pdQuestionAddress.reset(this.pdQuestionAddress.value);
+        // this.localInsert(false);
                 this.toast.pdTriggerappmessage('Record Saved Successfully');
         setTimeout(()=>{
               this.navCtrl.pop();
@@ -699,10 +716,92 @@ countRowsForTextarea(text){
         this.toast.pdTriggerappmessage('Something went wrong ');
       });
     }
+    getaddressFormFromLocal(){
+      let local_value:any;
+      let data:any={'pd_id':this.pdDetails.pd_id,'form_id':this.FormId.form_id};
+      // data.pd_id=this.pdDetails.pd_id
+      // data.form_id=this.FormId.form_id
+      this.storagedb.retrieveLocalStorage(data).then(res=>{
+        console.log("address get",res)
+        if(res){
+        let val_rec:any={}
+          val_rec.records=res[0]
+        local_value=res[0]
+        console.log("addd",val_rec,"loca",local_value)
+      
+          const control=<FormArray>this.pdQuestionAddress.controls['addresses']
+          this.getaddressDetails = val_rec;
+        
+          if(local_value.active == true){
+            if(this.getaddressDetails.records.addresses ){
+            
+            this.getaddressDetails = this.getaddressDetails.records.addresses;
+
+            if(this.getaddressDetails.length == 0 ){
+              control.push(this.initAddress(''));
+            }
+            else{
+              this.getaddressDetails.forEach((datas,index)=>{
+             
+                this.getCityAndPincodeDetails(datas.state,index,datas.pincode)
+               if(datas.pincode == 1){
+                 this.pincodeValue[index]=datas.pincode_others
+               }//if(val==true){
+               console.log( "Pin" ,this.pincodeValue[index]);
+                let val={
+                  'address': datas.address,
+                  'address_type': datas.address_type,
+                  'address_type_others': datas.address_type_others,
+                  'state': datas.state,
+                  'city': datas.city,
+                  'pincode':datas.pincode,
+                  'pincode_others':datas.pincode_others,
+                  'locality': datas.locality,
+                  'locality_others': datas.locality_others,
+                  // 'locality_mixuse': datas.locality_mixuse,
+                  'pd_location': datas.pd_location,
+                  'comment_locality': datas.comment_locality,
+                  'estimated_area': datas.estimated_area,
+                  'uom': datas.uom,
+                  'uom_others': datas.uom_others
+                }
+               
+                // let selectedAddressType = this.addressTypes.filter(element => element.address_type_id == datas.address_type)[0];
+                // console.log("selected add type",selectedAddressType)
+                if(datas.address_type){
+                  this.selectedAddressType(datas.address_type,index);
+                // this.selectedAddressType(selectedAddressType.address_type,index);
+                if (datas.address_type == 1) {
+                    this.selectedAddressType(datas.address_type_others,index);
+                }
+              }
+                control.push(this.initAddress(val))
+              })
+              this.pdQuestionAddress.controls.address_form_remark.setValue(val_rec.records.address_form_remark);
+            }
+          }
+          else{
+            control.push(this.initAddress(''))
+          }
+        }
+        else{
+          this.getaddressForm()
+        }
+      }
+      else{
+        this.getaddressForm()
+      }
+      
+        
+       
+      })
+     // console.log("add",local_value)
+      
+    }
 
     getaddressForm()
     {
-      
+     
       let res:any;
 
       let records = {'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id}
@@ -1017,4 +1116,16 @@ countRowsForTextarea(text){
         }
       })
     }
+    localInsert(option){
+      let datas:any=this.pdQuestionAddress.value
+      datas.pd_id=this.pdDetails.pd_id
+      datas.form_id=this.FormId.form_id;
+      datas.active=option;
+      // let recors={'records':datas}
+      this.storagedb.insertData(datas).then(res=>{
+        // let alert=this.toast.setAlert('data',JSON.stringify(res))
+        // alert.present();
+        console.log("insert add",res);
+      })
+    }
 }

src/pages/pd-question/pd-question-assessed-daily-sales/pd-question-assessed-daily-sales.html

@@ -75,8 +75,8 @@
                   </mat-form-field>
                   <mat-form-field style="width:100%">
                     <input matInput placeholder="Value" formControlName="frequency_value" (keyup)="salesCalculation(sale_i,item.value);inWords($event.target.value,i,3)">
-                    <mat-hint align="end" style="font-size:12px" *ngIf="tenants.value.frequency_value != ''">{{"&#8377;"}} {{freqAmtInwords[i]}} Only</mat-hint>
                   </mat-form-field>
+                  <mat-label align="end" style="font-size:12px;color:gray" *ngIf="tenants.value.frequency_value != ''">{{"&#8377;"}} {{freqAmtInwords[i]}} Only</mat-label>
                   <mat-form-field style="width: 100%">
                       <input OnlyNumber type="text" matInput placeholder="Annual Value" (keyup)="salesCalculation(sale_i,item.value)" formControlName="sales_value" readonly required>             
                       <mat-hint align="end" style="font-size:12px" *ngIf="tenants.get('sales_value').value != ''">{{"&#8377;"}} {{Value[i]}} Only</mat-hint>

src/pages/pd-question/pd-question-assessed-daily-sales/pd-question-assessed-daily-sales.ts

@@ -439,8 +439,14 @@ changeOptions(indexVal: any,event: any): void{
     let salesChildControl;
     let salesChildControlarr = [];
     dailySalesData.forEach((val, index) => {
- 
+      
-
+      if(val.margin_per != null && val.margin_per != ''){
+        console.log("c",parseInt(val.margin_per).toFixed(2))
+        val.margin_per=parseInt(val.margin_per).toFixed(2)
+      }
+      if(val.margin_value != null && val.margin_value != ''){
+      val.margin_value=parseInt(val.margin_value).toFixed(2)
+      }
       control.push(this.dailySalesWithData(val));
       if(val.margin_value != null){
       this.marginAmtInwords[index]=this.constant.convertNumberToWords(val.margin_value)
@@ -508,8 +514,8 @@ changeOptions(indexVal: any,event: any): void{
         company_id:[this.pdDetails.company_id],
         fk_createdby: [this.users],
         isactive: [true],
-        margin_per: [data.margin_per == null ? '' : (data.margin_per).toFixed(2)],
+        margin_per: [data.margin_per == null ? '' : data.margin_per],
-        margin_value: [data.margin_value == null ? '' :(data.margin_value).toFixed(2)],
+        margin_value: [data.margin_value == null ? '' :data.margin_value],
         comments:[data.comments]
       })
   }

src/pages/pd-question/pd-question-assessed-dash/pd-question-assessed-dash.html

@@ -61,7 +61,7 @@
               <h1 class="htag">SALES</h1>
             </mat-card>
         </ion-col>
-        <ion-col col-6 text-center *ngIf="grossprofit.mode==1">
+        <ion-col col-6 text-center *ngIf="grossprofit.mode==1 && grossprofit.purchase_type ==1">
             <mat-card class="ion-icon-custome" (click)="getViewPage(2)" class="item-ribbon" style="height: 110px;">
                 <span *ngIf="purchaseData;else nopurchaseData"class="ribbon cruzeiro">
                     <span>--</span>
@@ -72,7 +72,21 @@
                   </span>
                   </ng-template>
               <ion-icon class="ion-icon-custome" name="logo-android"></ion-icon>
-               <h1 class="htag">PURCHASE</h1>
+               <h1 class="htag">PURCHASE ITEM WISE</h1>
+            </mat-card>
+        </ion-col>
+        <ion-col col-6 text-center *ngIf="grossprofit.mode==1 && grossprofit.purchase_type ==2">
+            <mat-card class="ion-icon-custome" (click)="getViewPage(2)" class="item-ribbon" style="height: 110px;">
+                <span *ngIf="purchaseBillData;else nopurchaseData"class="ribbon cruzeiro">
+                    <span>--</span>
+                  </span>
+                  <ng-template #nopurchaseData>
+                    <span class="ribbon defalut">
+                    <span>--</span>
+                  </span>
+                  </ng-template>
+              <ion-icon class="ion-icon-custome" name="logo-android"></ion-icon>
+               <h1 class="htag">PURCHASE BILL WISE</h1>
             </mat-card>
         </ion-col>
       <!-- </ion-row> 

src/pages/pd-question/pd-question-assessed-dash/pd-question-assessed-dash.ts

@@ -32,6 +32,7 @@ export class PdQuestionAssessedDashPage {
   businessData: boolean;
   salesData: boolean;
   purchaseData: boolean;
+  purchaseBillData:boolean=false;
   grossprofit: any;
   assessedProcess: boolean;
   users: any;
@@ -147,6 +148,9 @@ else{
               {
                     this.purchaseData = true;
               }
+              if(res['records'].purchase_billwise.length != 0){
+                this.purchaseBillData=true;
+              }
               if(res['records'].sales_items_by_monthwise.length !=0 || res['records'].sales_declared_by_customer.length !=0 || res['records'].sales_calculated_by_itemwise.length !=0)
               {
                   this.salesData = true;

src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.html

@@ -128,7 +128,7 @@
                  <h4>Total of Sales</h4>
                 </ion-col>
                 <ion-col col-6 text-right>
-                 <h5>{{totalAnnualSale_Item_wise}}</h5>
+                 <h5>{{totalAnnualSale_Item_wise | rupeeCurrencyFormat}}</h5>
                 </ion-col>
               </ion-row>
        </mat-expansion-panel>
@@ -287,7 +287,7 @@
                      <h4>Total of purchase</h4>
                     </ion-col>
                     <ion-col col-6 text-right>
-                     <h5>{{totalAnnualpurchase_Item_wise}}</h5>
+                     <h5>{{totalAnnualpurchase_Item_wise | rupeeCurrencyFormat}}</h5>
                     </ion-col>
                   </ion-row>
             </mat-card>
@@ -403,7 +403,7 @@
                    <h4>Total of Expense</h4>
                   </ion-col>
                   <ion-col col-6 text-right>
-                   <h5>{{totalAnnualBusiness_details}}</h5>
+                   <h5>{{totalAnnualBusiness_details | rupeeCurrencyFormat}}</h5>
                   </ion-col>
                 </ion-row>
             
@@ -440,7 +440,7 @@
                    <h4>Total of Expense</h4>
                   </ion-col>
                   <ion-col col-6 text-right>
-                   <h5>{{totalAnnual_House_hold_details}}</h5>
+                   <h5>{{totalAnnual_House_hold_details | rupeeCurrencyFormat}}</h5>
                   </ion-col>
                 </ion-row>
             </mat-card>

src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.ts

@@ -14,6 +14,7 @@ import { PdQuestionAssessedBusinessIncomePage } from '../pd-question-assessed-bu
 
 import {ConstantsProvider} from '../../../providers/constants/constants'
 import {PdQuestionAssessedDailyPurchasePage} from '../pd-question-assessed-daily-purchase/pd-question-assessed-daily-purchase'
+import {RupeeCurrencyFormatPipe} from '../../../pipes/rupee-currency-format/rupee-currency-format'
 
 
 /**
@@ -27,6 +28,7 @@ import {PdQuestionAssessedDailyPurchasePage} from '../pd-question-assessed-daily
 @Component({
   selector: 'page-pd-question-assessed-info',
   templateUrl: 'pd-question-assessed-info.html',
+  providers:[RupeeCurrencyFormatPipe]
 })
 export class PdQuestionAssessedInfoPage {
 

src/pages/pd-question/pd-question-assessed-sales/pd-question-assessed-sales.ts

@@ -311,14 +311,17 @@ export class PdQuestionAssessedSalesPage {
   salesMarginAmtCalculation(indexVal: number,values: any): void {
     let control:any = <FormArray>this.assessedForm.controls['salesCalItemwise'];
     control.controls[indexVal].controls['margin_per'].setValue('');
-    if(values.margin_per_uom!='' && values.margin_per_uom != null){
+   
-      this.inWords(values.margin_per_uom,indexVal,2)
+    if(values.sales_type=="1" && values.margin_per_uom!='' && values.margin_per_uom !=null && values.sales_qty!='' && values.sales_qty!=null && values.fk_frequency_id!='' && values.fk_frequency_id!=null) {
+      let filterFrequencyValue: any = this.m_freqOfPurchase.filter(val =>val.frequency_id==values.fk_frequency_id);
+      let Type1CalculatedValue = parseFloat(values.sales_qty) * parseFloat(values.margin_per_uom) * parseFloat(filterFrequencyValue[0].mutiple_factor);
+      control.controls[indexVal].controls['margin_final_value'].setValue(Type1CalculatedValue.toFixed(2));
+      this.inWords(Type1CalculatedValue.toFixed(2),indexVal,3)
     }
-  
+    else if(values.sales_type=="2" && values.margin_per_uom!='' && values.margin_per_uom!=null && values.rate_per_unit!='' && values.rate_per_unit!=null) {
-    if(values.margin_per_uom!='' && values.sales_qty!='' && values.margin_per_uom!=null && values.sales_qty!=null) {
+      let Type2CalculatedValue = parseFloat(values.rate_per_unit) * parseFloat(values.margin_per_uom);
-      let MarginFinalValue = parseFloat(values.sales_qty) * parseFloat(values.margin_per_uom);
+      control.controls[indexVal].controls['margin_final_value'].setValue(Type2CalculatedValue.toFixed(2));
-      control.controls[indexVal].controls['margin_final_value'].setValue(MarginFinalValue.toFixed(2));
+      this.inWords(Type2CalculatedValue.toFixed(2),indexVal,3)
-      this.inWords(MarginFinalValue.toFixed(0),indexVal,3)
     }
     else {
       control.controls[indexVal].controls['margin_final_value'].setValue('');

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

@@ -462,13 +462,13 @@
                         <mat-label>Description of {{manufacturing.value.main_products}} Manufacturing Process</mat-label>
                         <textarea matInput placeholder="Description" formControlName="description"></textarea>
                     </mat-form-field>
-                    <ion-buttons end>
+                    <ion-buttons >
-                        <ion-col col-3 offset-3>
+                        <ion-col col-1>
                             <button ion-button clear color="optblue" (click)="removeManufacturing(i)">
                                 <ion-icon style="font-size: 22px;" name="md-trash"></ion-icon>
                             </button>
                         </ion-col>
-                        <ion-col col-2 offset-1 *ngIf="l">
+                        <ion-col offset-8 col-3 *ngIf="l">
                             <!-- <button  float-right ion-button clear (click)="addMoreManufacturing()" ><ion-icon style="font-size:24px"  color="optblue" name="add-circle"></ion-icon></button><br/> -->
                             <button ion-button color="optblue" round (click)="addMoreManufacturing()">Add More Product</button>
                         </ion-col>
@@ -1173,8 +1173,7 @@
                                         </button>
                                     </ion-col>
                                     <ion-col col-2 offset-1 *ngIf="l">
-                                        <button ion-button color="optblue" (click)="addServiceMoreState(sp,'2')">Add
+                                        <button ion-button color="optblue" (click)="addServiceMoreState(sp,'2')">Add More Countries</button>
-                                            More</button>
                                     </ion-col>
                                 </ion-buttons>
 

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

@@ -138,7 +138,7 @@
                                                         Cash.</mat-option>
                                                     <mat-option value="Payment received through Banking channels.">Payment
                                                         received through Banking channels.</mat-option>
-                                                        <mat-option value="Payment received in Cash and also through Banking channels.">Payment received in Cash and also through Banking channels.</mat-option>
+                                                        <mat-option value="Payment received in Cash and also through Banking channels.">Payment received in Cash and Bank.</mat-option>
                                                 </mat-select>
                                             </mat-form-field>
                                             <span *ngIf="items.get('manufacturing_payment_type').value == 3">

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

@@ -156,7 +156,7 @@
             <!-- <mat-label>Variation of Profit % over sales</mat-label>
             &nbsp;&nbsp;- -->
           <mat-form-field>
-            <input matInput autocomplete="off" [ngClass]="{'highlight': (details.controls['financial_profit_to_sale_variation'].value > 40) || (details.controls['financial_profit_to_sale_variation'].value < -40)}" placeholder="Variation of Profit % over sales" formControlName="financial_profit_to_sale_variation" (keypress)="keyPress($event)" readonly>
+            <input matInput autocomplete="off" [ngClass]="{'highlight': (details.controls['financial_profit_to_sale_variation'].value > 40) || (details.controls['financial_profit_to_sale_variation'].value < -40)}" placeholder="Variation of Profit/Loss to Sales % from Previous Year" formControlName="financial_profit_to_sale_variation" (keypress)="keyPress($event)" readonly>
           </mat-form-field>
             <p class="info" *ngIf="i != 0 && details.get('financial_profit_to_sale_variation').value != '' " [ngClass]="{'highlight': (details.controls['financial_profit_to_sale_variation'].value > 40) || (details.controls['financial_profit_to_sale_variation'].value < -40)}">
               <span *ngIf="details.get('financial_profit_to_sale_variation').value == 0">

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

@@ -328,7 +328,7 @@
                                             <mat-select placeholder="Stock" formControlName="traded_goods_observed" (selectionChange)="checkComments($event.value,4,g)">
                                                 <mat-option value="yes">Add Stock Details</mat-option>
                                                 <mat-option value="no">No stock observed</mat-option>
-                                                <mat-option value="stock not required to be maintained">Stock not required to be maintained</mat-option>
+                                                <!-- <mat-option value="stock not required to be maintained">Stock not required to be maintained</mat-option> -->
                                             </mat-select>
                                         </mat-form-field>
                                         <span *ngIf="tradetg.get('traded_goods_observed').value == 'yes'">

src/pages/pd-question/pd-question-emp-info/pd-question-emp-info.ts

@@ -231,6 +231,11 @@ export class PdQuestionEmpInfoPage {
       this.employmentForm.controls['amount_paid_in_cash'].setValidators([Validators.max(salary)]);   
       this.employmentForm.controls['amount_paid_in_cash'].updateValueAndValidity();
       let maxamt = salary-cash_amount
+      if( this.employmentForm.controls['amount_paid_in_cash'].value !=''){
+        let balance=salary-this.employmentForm.controls['amount_paid_in_cash'].value
+        console.log("bal",balance)
+      this.employmentForm.controls['amount_paid_through_bank'].setValue(balance);
+      }
       if(maxamt >= 0 ){
         this.employmentForm.controls['amount_paid_through_bank'].setValidators([Validators.max(salary-cash_amount)]);   
       }
@@ -475,6 +480,7 @@ inWords(val,flag:number){
         let Emp = value['records'];
         console.log('emp',Emp);
         this.employmentForm.controls['employer_name'].setValue(Emp.employer_name);
+        this.employmentForm.controls['employer_in_brief'].setValue(Emp.employer_in_brief)
         this.employmentForm.controls['how_long_year'].setValue(Emp.how_long_year);
         this.employmentForm.controls['how_long_month'].setValue(Emp.how_long_month);
         this.employmentForm.controls['was_met'].setValue(Emp.was_met);

src/pages/pd-question/pd-question-loans/pd-question-loans.ts

@@ -9,6 +9,7 @@ import { takeUntil } from 'rxjs/operators';
 import { ReplaySubject, Subject } from 'rxjs';
 import {CameraProvider} from '../../../providers/common-provider/camera'
 import {LoadingProvider} from '../../../providers/common-provider/loading'
+import {StorageProvider} from '../../../providers/storage/storage'
 
 /**
  * Generated class for the PdQuestionLoansPage page.
@@ -81,12 +82,12 @@ export class PdQuestionLoansPage {
   constructor(public navCtrl: NavController, public navParams: NavParams, public fb: FormBuilder, 
     public qustCat: QuestionCategoryProvider, public aws: AwsServiceProvider, 
     public toast: ToastProvider,public constant:ConstantsProvider,private cameraProvider:CameraProvider,
-    private loading:LoadingProvider) {
+    private loading:LoadingProvider,public storagedb:StorageProvider) {
     this.FormId = this.navParams.get('FormId');
     this.pdDetails = this.navParams.get('pdDetails');
     console.log("pd",this.pdDetails);
     this.applicants = this.pdDetails.applicat_details
-    this.applicants = this.applicants.filter(appt => appt.applicant_type != 2);
+    this.applicants = this.applicants.filter(appt => appt.applicant_type != 2 && appt.applicant_type != 3);
     this.productAbbr = this.pdDetails.product_abbr;
     this.subProductName = this.pdDetails.subproduct_name;
     this.users = this.aws.getlocale();
@@ -197,6 +198,7 @@ export class PdQuestionLoansPage {
                 })
               })
             }
+          //  this.localInsert(true)
             resolve();
           }
         })
@@ -876,5 +878,18 @@ export class PdQuestionLoansPage {
       })
       
     }
+    localInsert(option){
+      let datas:any=this.loanDetailsForm.value
+      datas.pd_id=this.pdDetails.pd_id
+      datas.form_id=this.FormId.form_id;
+      datas.active=option;
+      // let form_id=this.FormId.form_id
+      // let recors={'records':datas}
+      this.storagedb.insertData(datas).then(res=>{
+        let alert=this.toast.setAlert('data',JSON.stringify(res))
+        alert.present();
+        console.log(res);
+      })
+    }
 
 }

src/pages/pd-question/pd-question-neighbour-hood/pd-question-neighbour-hood.ts

@@ -79,7 +79,7 @@ export class PdQuestionNeighbourHoodPage {
     if(this.neighbourhoodForm.dirty){
    
       return new Promise((resolve,reject)=>{
-        let alert=this.toast.setAlert("Form is Modified","Are you sure want to Go Back")
+        let alert=this.toast.setAlert("Data will be Lost","Are you sure want to Go Back")
         alert.present();
         alert.onDidDismiss((data)=>{
           console.log("d",data);

src/pages/pd-question/pd-question-other-income/pd-question-other-income.html

@@ -92,13 +92,15 @@
                             <mat-option *ngFor="let source of sourceIncome" [value]="source.id">{{source.name}}</mat-option>
                         </mat-select>
                     </mat-form-field>
-                    <mat-form-field style="width:100%" *ngIf="details.get('source').value == '5'">
+                    <div *ngIf="details.get('source').value == '5'">
+                    <mat-form-field style="width:100%" >
                         <mat-label>Address</mat-label>
                     <input matInput placeholder="Rental Info Details" formControlName="address" autocomplete="off">
                     <!-- <mat-hint align="end"><i (click)="Toview()">Rental Info Details</i></mat-hint> -->
                     <!-- <mat-hint align="end"><strong (click)="Toview()">Validate Rental Income</strong></mat-hint>         -->
                     </mat-form-field>
                     <button float-right ion-button small color="optblue" (click)="Toview()">Rental Info Details</button>
+                </div>
                     <mat-form-field style="width: 100%;"*ngIf="details.get('source').value == '1'">     
                         <input matInput placeholder="Specify Others Source"
                         formControlName="others_source">

src/pages/pd-question/pd-question-other-income/pd-question-other-income.ts

@@ -94,7 +94,7 @@ export class PdQuestionOtherIncomePage {
     if(this.otherIncomeForm.dirty){
    
       return new Promise((resolve,reject)=>{
-        let alert=this.toast.setAlert("Form is Modified","Are you sure want to Go Back")
+        let alert=this.toast.setAlert("Data will be Lost","Are you sure want to Go Back")
         alert.present();
         alert.onDidDismiss((data)=>{
           console.log("d",data);
@@ -298,6 +298,7 @@ Toview(){
  // alert('Rental Income Details - Is inprogress');
   
   // here Hardcoded;
+  this.otherIncomeForm.reset(this.otherIncomeForm.value)
   let RIFormDtls = {'form_id':17,'form_name':'Rental Verification'};
   this.navCtrl.push(PdQuestionRentalInfoPage,{'FormId':RIFormDtls,'pdDetails':this.pdDetails});
 }

src/pages/pd-question/pd-question-rental-info/pd-question-rental-dash/pd-question-rental-dash.html

@@ -0,0 +1,28 @@
+<!--
+  Generated template for the PdQuestionRentalDashPage page.
+
+  See http://ionicframework.com/docs/components/#navigation for more info on
+  Ionic pages and navigation.
+-->
+<ion-header>
+
+  <ion-navbar color="optblue">
+    <ion-title>{{form_details.form_name}}</ion-title>
+  </ion-navbar>
+
+</ion-header>
+
+
+<ion-content padding>
+<mat-card *ngFor="let info of existing_rental_list;let i=index" (click)="editDet(info.rental_existing_data)">
+  <mat-card-header>
+    <mat-card-title><h6>Property {{i+1}}</h6></mat-card-title>
+  </mat-card-header>
+  <ion-icon name="ios-pin-outline">
+ &nbsp;<mat-label>{{info.address}}</mat-label><br/>
+  &nbsp; <mat-label>{{info.state}} {{info.city}} - {{info.pincode}}</mat-label></ion-icon><br/><br/>
+  <mat-label style="color:orangered;font-size:14px;"><strong>Annual Rent Amount as per Applicant : {{info.applicants_rent | rupeeCurrencyFormat}}</strong></mat-label>
+</mat-card>
+<ion-fab bottom right>
+  <button ion-fab color="optblue" (click)="addMore()"><ion-icon name="md-add"></ion-icon></button></ion-fab>
+</ion-content>

src/pages/pd-question/pd-question-rental-info/pd-question-rental-dash/pd-question-rental-dash.module.ts

@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { PdQuestionRentalDashPage } from './pd-question-rental-dash';
+
+@NgModule({
+  declarations: [
+    PdQuestionRentalDashPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(PdQuestionRentalDashPage),
+  ],
+})
+export class PdQuestionRentalDashPageModule {}

src/pages/pd-question/pd-question-rental-info/pd-question-rental-dash/pd-question-rental-dash.scss

@@ -0,0 +1,24 @@
+page-pd-question-rental-dash {
+    .mat-card{
+        margin-bottom: 10px;
+    //    border-radius: 10px !important;
+    padding-top: 10px;
+    padding-bottom: 10px;
+        box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
+    }
+  .mat-card-content{
+    margin-bottom: 0px !important;
+  }
+  .mat-card-title{
+      color:olivedrab;
+  }
+  mat-label{
+    color:darkcyan
+  }
+//   ion-icon{
+//       color:olivedrab
+//   }
+  .scroll-content{
+    background-color: #eee;
+  }
+}

src/pages/pd-question/pd-question-rental-info/pd-question-rental-dash/pd-question-rental-dash.ts

@@ -0,0 +1,110 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import{QuestionCategoryProvider} from '../../../../providers/question-category/question-category'
+import {RupeeCurrencyFormatPipe} from '../../../../pipes/rupee-currency-format/rupee-currency-format'
+import {PdQuestionRentalInfoPage} from '../pd-question-rental-info'
+/**
+ * Generated class for the PdQuestionRentalDashPage page.
+ *
+ * See https://ionicframework.com/docs/components/#navigation for more info on
+ * Ionic pages and navigation.
+ */
+
+// @IonicPage()
+@Component({
+  selector: 'page-pd-question-rental-dash',
+  templateUrl: 'pd-question-rental-dash.html',
+  providers:[RupeeCurrencyFormatPipe]
+})
+export class PdQuestionRentalDashPage {
+  pdDetails:any;
+  form_details:any;
+  pageTitle:any
+  existing_rental_count_id: number;
+  existing_rental_list: any=[];
+  constructor(public navCtrl: NavController, public navParams: NavParams,private qustCat:QuestionCategoryProvider) {
+    this.pdDetails=this.navParams.get('pdDetails');
+    this.form_details=this.navParams.get('FormId');
+    console.log(this.form_details);
+    
+
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad PdQuestionRentalDashPage');
+   
+  }
+  ionViewCanEnter(){
+    this.getAllRentalInfo();
+  }
+  getAllRentalInfo(){
+    this.existing_rental_list=[]
+    let records = { 'pd_id': this.pdDetails.pd_id, 'pd_form_id': this.form_details.form_id };
+    this.qustCat.retiverForm(records).subscribe(res=>{
+      if(res['dataStatus']==true){
+        let rentalVal=res['records'];
+        let tempArray: any = [];
+        let amt: any = [];
+        this.existing_rental_count_id = rentalVal.length;
+        rentalVal.forEach((value,index)=>{
+          let annualRentAmt:any
+          if(value.property_unit_details){
+            let selectedUnit=Object.keys(value.property_unit_details).map(function(key){
+              return value.property_unit_details[key]
+            });
+            if(selectedUnit.length>0){
+              selectedUnit.forEach((element,innerIndex)=>{
+                tempArray[innerIndex]=element.monthly_rent_amount
+                annualRentAmt=tempArray.reduce((sum,val)=> sum+ +val,0);
+                annualRentAmt=annualRentAmt*12;
+              })
+            }
+            else{
+              annualRentAmt=0;
+            }
+            amt[index]=annualRentAmt
+          }
+          let params={'state_id':value.state,'city_id':value.city,'pincode_id':value.pincode}
+          this.qustCat.getStateCityNamesAndPincode(params).subscribe(datas=>{
+            if(datas.dataStatus==true){
+              let obj={
+                'address':value.address_property,
+                'applicants_rent': amt[index],
+                'state': datas.records.state_name,
+                'city': datas.records.city_name,
+                'pincode': datas.records.pincode,
+                'rental_count_id': value.rental_count_id,
+                'rental_existing_data': value
+              }
+              this.existing_rental_list.push(obj)
+              console.log("modify",this.existing_rental_list);
+            }
+          })
+        })
+      }
+      else{
+      this.existing_rental_count_id=0
+      }
+    })
+  }
+  editDet(values){
+    let passValues: any = {
+      manage_status: 2,
+      existing_rental_count_id: values.rental_count_id,
+      editData: values
+    }
+    this.navCtrl.push(PdQuestionRentalInfoPage,{'values':passValues,'pdDetails':this.pdDetails,'FormId':this.form_details});
+    console.log("hai");
+    console.log("d",values)
+  }
+  addMore(){
+    let passValues: any = {
+      manage_status: 1,
+      // parentData: this.parentData,
+      // masterData: this.masterData,
+      existing_rental_count_id: this.existing_rental_count_id + 1,
+    }
+    this.navCtrl.push(PdQuestionRentalInfoPage,{"values":passValues,'pdDetails':this.pdDetails,'FormId':this.form_details});
+  }
+
+}

src/pages/pd-question/pd-question-rental-info/pd-question-rental-info.html

@@ -3,7 +3,7 @@
     <button ion-button menuToggle>
       <ion-icon name="menu"></ion-icon>
     </button>
-    <ion-title *ngIf="!viewchange">{{FormId.form_name}}</ion-title>
+    <ion-title *ngIf="!viewchange">{{pageTitle}}</ion-title>
   </ion-navbar>
   <ion-segment [(ngModel)]="tab" color="optblue">
       <ion-segment-button value="0">
@@ -44,7 +44,7 @@
                                 <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input class="docName" #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">
@@ -441,8 +441,8 @@
                 <mat-label>Amount Received in Bank</mat-label>
                 <input matInput autocomplete="off" placeholder="" formControlName="amount_received_bank" type="number"
                   required (keyup)="ValidatedRentAmount(units.value,u,1)">
-                  <mat-error *ngIf="units.controls['amount_received_bank'].hasError('max')">Given Value Is More Than Rent Amount</mat-error>
+                  <mat-error style="font-size: 13px" style="font-size: 13px" *ngIf="units.controls['amount_received_bank'].hasError('max')">Given Value Is More Than Rent Amount</mat-error>
-                  <mat-error *ngIf="units.controls['amount_received_bank'].hasError('min')">Given Value Is Less Than Rent Amount</mat-error>
+                  <mat-error style="font-size: 13px" style="font-size: 13px" *ngIf="units.controls['amount_received_bank'].hasError('min')">Given Value Is Less Than Rent Amount</mat-error>
                 <mat-hint align="end" style="font-size:12px" *ngIf="units.value.amount_received_bank != ''">{{"&#8377;"}} {{amount_received_bank_Inwords[u]}} Only</mat-hint>
               </mat-form-field>
 
@@ -450,8 +450,8 @@
               <mat-label>Amount Received in Cash</mat-label>
               <input matInput autocomplete="off" placeholder="" formControlName="amount_received_cash"
                 required (keyup)="inWords($event.target.value,u,6)" type="number" >
-                <mat-error *ngIf="units.controls['amount_received_cash'].hasError('max')">Given Value Is More Than Rent Amount</mat-error>
+                <mat-error style="font-size: 13px" style="font-size: 13px" *ngIf="units.controls['amount_received_cash'].hasError('max')">Given Value Is More Than Rent Amount</mat-error>
-                <mat-error *ngIf="units.controls['amount_received_cash'].hasError('min')">Given Value Is Less Than Rent Amount</mat-error>
+                <mat-error style="font-size: 13px" style="font-size: 13px" *ngIf="units.controls['amount_received_cash'].hasError('min')">Given Value Is Less Than Rent Amount</mat-error>
               <mat-hint align="end" style="font-size:12px" *ngIf="units.value.amount_received_cash != ''">{{"&#8377;"}} {{amount_received_cash_Inwords[u]}} Only</mat-hint>
             </mat-form-field>
 
@@ -715,8 +715,8 @@
                 <mat-label>Amount Paid in Bank</mat-label>
                 <input matInput type="number" autocomplete="off" placeholder="" formControlName="amount_received_bank_per_met"
                   required (keyup)="ValidatedRentAmount(units.value,u,2)">
-                  <mat-error *ngIf="units.controls['amount_received_bank_per_met'].hasError('max')">Given Value Is More Than Rent Amount</mat-error>
+                  <mat-error style="font-size: 13px" style="font-size: 13px" *ngIf="units.controls['amount_received_bank_per_met'].hasError('max')">Given Value Is More Than Rent Amount</mat-error>
-                  <mat-error *ngIf="units.controls['amount_received_bank_per_met'].hasError('min')">Given Value Is Less Than Rent Amount</mat-error>
+                  <mat-error style="font-size: 13px" style="font-size: 13px" *ngIf="units.controls['amount_received_bank_per_met'].hasError('min')">Given Value Is Less Than Rent Amount</mat-error>
                 <mat-hint align="end" style="font-size:12px" *ngIf="units.value.amount_received_bank_per_met != ''">{{"&#8377;"}} {{amount_received_bank_per_met_Inwords[u]}} Only</mat-hint>
               </mat-form-field>
 
@@ -724,8 +724,8 @@
               <mat-label>Amount Paid in Cash</mat-label>
               <input matInput type="number" autocomplete="off" placeholder="" formControlName="amount_received_cash_per_met"
                 required (keyup)="inWords($event.target.value,u,12)">
-                <mat-error *ngIf="units.controls['amount_received_cash_per_met'].hasError('max')">Given Value Is More Than Rent Amount</mat-error>
+                <mat-error style="font-size: 13px" *ngIf="units.controls['amount_received_cash_per_met'].hasError('max')">Given Value Is More Than Rent Amount</mat-error>
-                <mat-error *ngIf="units.controls['amount_received_cash_per_met'].hasError('min')">Given Value Is Less Than Rent Amount</mat-error>
+                <mat-error style="font-size: 13px" *ngIf="units.controls['amount_received_cash_per_met'].hasError('min')">Given Value Is Less Than Rent Amount</mat-error>
               <mat-hint align="end" style="font-size:12px" *ngIf="units.value.amount_received_cash_per_met != ''">{{"&#8377;"}} {{amount_received_cash_per_met_Inwords[u]}} Only</mat-hint>
             </mat-form-field>
 

src/pages/pd-question/pd-question-rental-info/pd-question-rental-info.ts

@@ -71,6 +71,8 @@ export class PdQuestionRentalInfoPage {
   imageBucket: any=[];
   tab: any='0';
   imageDisplay: any=[];
+  pageTitle: string;
+  data:any;
   
   constructor(public navCtrl: NavController, public navParams: NavParams,
     public aws:AwsServiceProvider,public toast:ToastProvider,
@@ -78,6 +80,9 @@ export class PdQuestionRentalInfoPage {
     public constprovider:ConstantsProvider,public alertCtrl:AlertController,
     private loading:LoadingProvider,private cameraProvider:CameraProvider) 
     {
+      this.data=this.navParams.get('values'); // for get the data from dash page
+      console.log("values",this.data)
+      this.pageTitle = this.data.manage_status==1 ? 'Add RI Details' : 'Update RI Details';
     this.FormId = this.navParams.get('FormId');
     this.pdDetails = this.navParams.get('pdDetails');
     this.users = this.aws.getlocale();
@@ -192,8 +197,13 @@ export class PdQuestionRentalInfoPage {
       val=="1" ? this.rentalForms.addControl('rental_rates_third_party_check_done', new FormControl('', Validators.required)) : this.rentalForms.removeControl('rental_rates_third_party_check_done');
       val=="0" ? this.rentalForms.addControl('why_third_party_check_not_done', new FormControl('', Validators.required)) : this.rentalForms.removeControl('why_third_party_check_not_done');
     }); 
-
+    if(this.data.manage_status != 1){
       this.getRentalDetails(); 
+    }
+    else{
+      let control: any = <FormArray>this.rentalForms.controls['property_unit_details'];
+      control.push(this.createUnitDetails(''));
+    }
 
 
   }
@@ -968,9 +978,9 @@ compareSingleObjects(o1: any, o2: any) {
   //   }
   // }
   saveAlert(answerData){
-  let ApplicantRentAmt : any ; 
+  let ApplicantRentAmt : number=0 ; 
-  let TenantRentAmt : any ; 
+  let TenantRentAmt : number =0; 
-  let FloorsTotalRentAmt : any ; 
+  let FloorsTotalRentAmt : number =0; 
 
   let TempArray1 : any = [];
   let TempArray2 : any = [];
@@ -981,9 +991,9 @@ compareSingleObjects(o1: any, o2: any) {
   if(answerData.property_unit_details.length > 0){
   
     answerData.property_unit_details.forEach((data,index) => {
-      TempArray1[index] = data.monthly_rent_amount;
+      TempArray1[index] = data.hasOwnProperty('monthly_rent_amount') ? data.monthly_rent_amount : 0;
       ApplicantRentAmt = TempArray1.reduce((sum, val) => sum + +val, 0);
-      TempArray2[index] = data.paid_monthly_rent_per_met;
+      TempArray2[index] = data.hasOwnProperty('paid_monthly_rent_per_met') ? data.paid_monthly_rent_per_met : 0;
       TenantRentAmt = TempArray2.reduce((sum, val) => sum + +val, 0);
     })
     TextMessage = 'Monthly Rent as Per Loan Applicant =' + ApplicantRentAmt+'<br>'; 
@@ -992,7 +1002,7 @@ compareSingleObjects(o1: any, o2: any) {
   
   if(answerData.multistoried_building_details.length > 0){
     answerData.multistoried_building_details.forEach((val,index) => {
-      TempArray3[index] = val.floor_rent_amount;
+      TempArray3[index] = val.hasOwnProperty('floor_rent_amount')? val.floor_rent_amount : 0;
       FloorsTotalRentAmt = TempArray3.reduce((sum, val) => sum + +val, 0);
     });
     TextMessage = TextMessage +'Rent amount calculated = '+FloorsTotalRentAmt;
@@ -1023,7 +1033,7 @@ compareSingleObjects(o1: any, o2: any) {
     alert.present();
   }
   saveRentalDetails(answerData) {
-    
+    answerData.rental_count_id=this.data.existing_rental_count_id
     console.log('answerData',answerData);
     
       delete answerData.stateSearch;
@@ -1089,11 +1099,13 @@ compareSingleObjects(o1: any, o2: any) {
     
       
       
-    this.qustCat.retiverForm(records).subscribe(res=> {
+    // this.qustCat.retiverForm(records).subscribe(res=> {
-      if(res['dataStatus']==true)
+      console.log("enter",this.data.editData)
+      if(this.data.editData)
        {
-      
+        
-          let rentalDetails = res['records'];
+          let rentalDetails = this.data.editData;
+          console.log("rental",rentalDetails)
               rentalDetails.pdid  = this.pdDetails.pd_id,
               rentalDetails.formid  = this.FormId.form_id;
               rentalDetails.other_name_person_type ? this.rentalForms.addControl('other_name_person_type', new FormControl('', Validators.required)): this.rentalForms.removeControl('other_name_person_type');
@@ -1105,9 +1117,9 @@ compareSingleObjects(o1: any, o2: any) {
                 rentalDetails.citySearch = '';
                 rentalDetails.pincodeSearch = '';
              //get Multistoried Building Details
-            if(res['records'].multistoried_building_details){
+            if(rentalDetails.multistoried_building_details){
-            let selectedMultistoriedBuilding  = Object.keys(res['records'].multistoried_building_details).map(function (key) {
+            let selectedMultistoriedBuilding  = Object.keys(rentalDetails.multistoried_building_details).map(function (key) {
-                return res['records'].multistoried_building_details[key];
+                return rentalDetails.multistoried_building_details[key];
             });
 
               if(selectedMultistoriedBuilding.length>0){
@@ -1143,6 +1155,7 @@ compareSingleObjects(o1: any, o2: any) {
 
           // get property unit details
           if(rentalDetails.property_unit_details){
+            console.log("property",rentalDetails.property_unit_details)
             let selectedUnitDetails  = Object.keys(rentalDetails.property_unit_details).map(function (key) {
                 return rentalDetails.property_unit_details[key];
             });
@@ -1224,7 +1237,7 @@ compareSingleObjects(o1: any, o2: any) {
         }
         
        
-      });
+      // });
     
     // this.qustCat.retiverForm(records).subscribe(res=>
     //   {
@@ -1385,9 +1398,9 @@ ValidatedRentAmount(value:any,index:number,type: number){
        ChildCtrl.controls['amount_received_bank'].updateValueAndValidity();
        let maxamt = monthlyrentamt-bank_amount
        if(maxamt >= 0 ){
-         ChildCtrl.controls['amount_received_cash'].setValue();
+         ChildCtrl.controls['amount_received_cash'].setValue(maxamt);
          ChildCtrl.controls['amount_received_cash'].setValidators([Validators.required,Validators.max(monthlyrentamt-bank_amount),Validators.min(monthlyrentamt-bank_amount)]);   
-         this.inWords(maxamt,index,8)
+         this.inWords(maxamt,index,6)
        }
        else{
          ChildCtrl.controls['amount_received_cash'].setValue(0);

src/pipes/pipes.module.ts

@@ -3,9 +3,9 @@ import { PdPipe } from './pd/pd';
 import { RupeeCurrencyFormatPipe } from './rupee-currency-format/rupee-currency-format';
 @NgModule({
 	declarations: [PdPipe,
-    RupeeCurrencyFormatPipe],
+    ],
 	imports: [],
 	exports: [PdPipe,
-    RupeeCurrencyFormatPipe]
+   ]
 })
 export class PipesModule {}

src/providers/constants/constants.ts

@@ -17,6 +17,7 @@ public commonimage = "http://ssa.sineedge.com/sparqapi/logo/avatar.jpg";
   apiurl()
   {
     let testapiurl = 'http://ssa.sineedge.com/sparqtest/api/';
+    let testapiurl_beta='http://ssa.sineedge.com/sparqtest_beta/api/';
     let devapiurl_beta = 'http://ssa.sineedge.com/sparqapi_beta/api/';
     let devapiurl = 'http://ssa.sineedge.com/sparqapi/api/';
     let localapiurl = 'http://192.168.0.9/sparqapi/api/';

src/providers/question-category/question-category.ts

@@ -125,4 +125,7 @@ getFamilyDetails(pdid:any){
 getAddressDetails(pdid:any){
   return this.http.post<any>(this.apiurl+'getPDAddress',{'pd_id':pdid})
 }
+getStateCityNamesAndPincode(values:any){
+  return this.http.post<any>(this.apiurl+'getStateCityNamesAndPincode',{'records':values})
+}
 }

src/providers/storage/storage.ts

@@ -0,0 +1,76 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import {Storage} from '@Ionic/storage'
+import {ToastProvider} from '../common-provider/toast'
+
+/*
+  Generated class for the StorageProvider provider.
+
+  See https://angular.io/guide/dependency-injection for more info on providers
+  and Angular DI.
+*/
+//const storage_key='form_Datas'
+
+@Injectable()
+export class StorageProvider {
+
+  constructor(public http: HttpClient,public storage:Storage,public toast:ToastProvider) {
+    console.log('Hello StorageProvider Provider');
+  }
+insertData(data){
+  this.toast.pdTriggerappmessage(this.storage.driver);
+  const storage_key=data.pd_id
+  console.log("storage provider")
+  console.log(data);
+  console.log(JSON.stringify(data));
+ 
+    console.log("sto",this.storage.get(storage_key))
+  return this.storage.get(storage_key).then((res)=>{
+    console.log("res",res)
+    if(res != null ){
+      let option:boolean=false
+      if( res.length != 0 && res.length != undefined){
+  //   res.forEach((value)=>{
+  //     if(value.form_id==data.form_id){
+  //       option=true
+  //     }
+  // })
+  let current=res.filter(val=>val.form_id==data.form_id)
+  console.log("current",current);
+  if(current.length > 0){
+    let value:any=[]
+    value.push(data)
+    return this.storage.set(storage_key,value)
+  }
+}
+       let old_Data:any=[]
+        old_Data=res
+       console.log("old data",old_Data)
+       old_Data.push(data)
+       return this.storage.set(storage_key,old_Data)
+     
+    }
+    else{
+      //res.push(data)
+      // let dataValue=Object.keys(data).map(function(key){
+      //   return data[key];
+      // })
+      let value:any=[]
+      value.push(data)
+      return this.storage.set(storage_key,value)
+    }
+  })
+  
+
+
+}
+retrieveLocalStorage(data){
+  const storage_key=data.pd_id
+  return this.storage.get(storage_key).then(res=>{
+    console.log("storage get",res)
+    if(res != null){
+    return res.filter(val=>val.form_id==data.form_id)
+    }
+  })
+}
+}

www/build/main.css

@@ -30368,3 +30368,27 @@ page-pd-question-rental-info .docName {
   font-size: 12px;
   height: 28px;
 }
+
+page-pd-question-rental-dash .mat-card {
+  margin-bottom: 10px;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  -webkit-box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
+  box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
+}
+
+page-pd-question-rental-dash .mat-card-content {
+  margin-bottom: 0px !important;
+}
+
+page-pd-question-rental-dash .mat-card-title {
+  color: olivedrab;
+}
+
+page-pd-question-rental-dash mat-label {
+  color: darkcyan;
+}
+
+page-pd-question-rental-dash .scroll-content {
+  background-color: #eee;
+}