Add On changes

.sourcemaps/0.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../@angular/common/http (ignored)"],"names":[],"mappings":";;;;;AAAA,e","file":"0.js","sourcesContent":["/* (ignored) */\n\n\n//////////////////\n// WEBPACK FOOTER\n// @angular/common/http (ignored)\n// module id = 705\n// module chunks = 0"],"sourceRoot":""}
+{"version":3,"sources":[],"names":[],"mappings":"","sourcesContent":[]}

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

@@ -1,4 +1,4 @@
-#Mon Apr 22 19:26:46 IST 2019
+#Fri Apr 26 20:11:09 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.
-#Mon Apr 22 19:26:47 IST 2019
+#Fri Apr 26 20:11:10 IST 2019
 60.set=ASSET
 52.set=ASSET
 53.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug

src/app/app.component.ts

@@ -129,6 +129,7 @@ let alert=this.alertCtrl.create({
   }
   getuserDetails()
   {
+    this.userDetails=''
      
     let userid = this.aws.getlocale();
     this.aws.getuserprofile(userid).subscribe(res=>{
@@ -151,7 +152,6 @@ let alert=this.alertCtrl.create({
       break;
       case 2:
   this.AWS.logout().subscribe(()=>{
-    this.userDetails=''
     this.nav.setRoot(LoginPage);
   });
   break;

src/pages/input/input.ts

@@ -66,7 +66,7 @@ other_applicant:any=[];
 loadDetails=false;
 mainApplicant:any=[]
 pdMaster:any=[]
-checkOtpAccess:boolean=false
+checkOtpAccess:boolean = false;
 @ViewChild('focusinp') input_focus ;
 @ViewChild('scroll') scrolltop : Content;
   addresses: any=[];
@@ -402,6 +402,7 @@ checkOtpAccess:boolean=false
   }
   
   },error=>{
+    console.log("currnpd",this.currentPosPDofficer);
     alert(JSON.stringify(error))
     data = {'pd_id':this.address_pd_id,'pd_status':'INITIATED','mobile_no':this.mainApplicant.mobile_no,'officerName':appdetails.pd_allocated_to,'firstName':this.mainApplicant.applicant_name,'fk_updatedby':this.users,'updatedon':currentdate,'link': this.currentPosPDofficer};
     this.pdDetails.updatepdStatus(data).subscribe(res=>
@@ -409,6 +410,7 @@ checkOtpAccess:boolean=false
           this.updateinitiated = res;
           if(this.updateinitiated.dataStatus == true)
           { 
+            console.log("status","true");
             this.getNewpdupdate();
             this.getcurrentLocation();
             this.startedAccess = true;
@@ -436,14 +438,18 @@ if(this.updatestarted.dataStatus == true)
  //console.log("appdetails",appdetails)
  //this.navCtrl.setRoot(OtpPage,{'pdDetails':appdetails});
  this.getNewpdupdate();
+ this.startedAccess=false
  this.checkOtpAccess=true
+ 
 }
 else{
   this.checkOtpAccess=false
 }
 
-})
+},err=>alert(JSON.stringify(err)));
    // console.log('Buy clicked');
+ },err=>{
+   alert(JSON.stringify(err))
  })
   }
 
@@ -500,24 +506,30 @@ else{
   }
   getNewpdupdate()
   {
-    console.log("new pd",this.applicatentDetails.pd_id)
+    console.log("Started",this.startedAccess)
+    console.log("checkOtpAccess",this.checkOtpAccess)
       this.acceptedAccess = false;
       this.initiatedAccess = false;
       this.scheduleAccess = false;
       this.startedAccess = false;
+      this.checkOtpAccess = false;
     this.pdDetails.getpddetails(this.users).subscribe(res=>
       {
         this.appdata = res;
         if(this.appdata.dataStatus == true)
         {
+        
           this.applicatentDetails = this.appdata.records.filter(app=>app.pd_id == this.applicatentDetails.pd_id)[0];
           // this.address_pd_status=this.applicatentDetails
           //FOR GETTING THE LATEST ADDRESS STATUS FROM getFullPDdetails
-          let rec_pdid = {'pdid':this.applicatentDetails.pd_id};
+          let pdDetails_pdid=this.applicatentDetails.is_child != '1' ? this.applicatentDetails.pd_id :this.applicatentDetails.parent_pd_id
+          let rec_pdid = {'pdid':pdDetails_pdid};
           this.pdDetails.getFullPDdetails(rec_pdid).subscribe(result=>{
+            if(result['dataStatus']==true){
+              this.addresses= result['records'].pd_address
             result['records'].pd_address.forEach(data=>{
               if(data.addtional_pd_data.length != 0){
-                if(data.addtional_pd_data[0].pd_status == 'ALLOCATED' || data.addtional_pd_data[0].pd_status == 'ACCEPTED'  || data.addtional_pd_data[0].pd_status == 'SCHEDULED'  || data.addtional_pd_data[0].pd_status == 'INITIATED'){
+                if(data.addtional_pd_data[0].pd_status == 'ALLOCATED' || data.addtional_pd_data[0].pd_status == 'ACCEPTED'  || data.addtional_pd_data[0].pd_status == 'SCHEDULED'  || data.addtional_pd_data[0].pd_status == 'INITIATED' || data.addtional_pd_data[0].pd_status == 'STARTED'){
                   // this.address_pd_id=data.addtional_pd_data[0].pd_id
                   this.address_pd_status=data.addtional_pd_data[0].pd_status
                   // this.address_allocated_data=data.addtional_pd_data[0]
@@ -573,7 +585,8 @@ else{
     if(this.address_pd_status == 'STARTED'){
       this.checkOtpAccess=true;
     }
-
+ 
+      }
     })
         }
       

src/pages/pd-list/pd-list.scss

@@ -98,11 +98,21 @@ page-pd-list{
    }
    ion-slide.swiper-slide {
     align-items: flex-start;
-    overflow-x:scroll;
+    // height: auto;
-    display: block;
+
+    // overflow-x:scroll;
+    // overflow-y:scroll;
+    // display: block;
 }
+.slide-zoom{
+  height:100%;
+  overflow-y:scroll;
+}
+// ion-slide{
+//   height: auto;
+// }
 // ion-slides{
-// //  height: auto;
+//  height: auto;
 // }
 
 .app_id{

src/pages/pd-list/pd-list.ts

@@ -128,7 +128,7 @@ export class PdListPage {
        {
         this.pdlistaccess = false;
         
-          this.pdschduleDetails = this.pdlistdetails.records.filter(sch=>sch.pd_status =="ACCEPTED" || sch.pd_status =="SCHEDULED" || sch.pd_status =="INITIATED" || sch.pd_status =="STARTED" || sch.pd_status =="INPROGRESS" || sch.pd_status == "ADD_ON_PENDING" && sch.applicat_details );
+          this.pdschduleDetails = this.pdlistdetails.records.filter(sch=>sch.pd_status =="ACCEPTED" || sch.pd_status =="SCHEDULED" || sch.pd_status =="INITIATED" || sch.pd_status =="STARTED" || sch.pd_status =="INPROGRESS" || sch.pd_status == "ADD_ON_PENDING" );
           this.searchpast = this.pdschduleDetails;
           
           this.pdinprogress =  this.pdlistdetails.records.filter(allocate=>allocate.pd_status == "ALLOCATED");

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

@@ -982,7 +982,7 @@ countRowsForTextarea(text){
       const control=<FormArray>this.pdQuestionAddress.controls['addresses']
       this.qustCat.getAddressDetails(this.pdDetails.pd_id).subscribe(res=>{
         if(res.dataStatus == true){
-          this.addressesList =  res.records.filter(item => item.isactive == 1);
+          this.addressesList =  res.records.filter(item => item.isactive == 1 && item.assigned_pd == this.pdDetails.pd_id);
           console.log('this.addressesList',this.addressesList);
           if(this.addressesList.length > 0){
             this.addressesList.forEach((datas,index)=>{

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

@@ -112,6 +112,7 @@ export class PdQuestionBusinessInfoPage {
     
    this.businessForm=this.fb.group({
     fk_createdby:[this.users],
+    parent_pdid:[this.pdDetails.parent_pd_id],
     pdid:[this.pdid],
     formid:[this.FormId],
     company_id: this.pdDetails.company_id,
@@ -347,7 +348,7 @@ changeOfStartedBusiness(members,i,e){
                DocArray = [{document: ''}];
                otherDoc.push(this.createDocument());
            }
-
+           businessVal.parent_pdid=this.pdDetails.parent_pd_id
             businessVal.pdid  = this.pdid;
                 businessVal.formid  = 13;
                 businessVal.company_id  = this.pdDetails.company_id;

src/pages/pd-question/pd-question-current-loans/pd-question-current-loans.html

@@ -110,7 +110,7 @@
                                         <input matInput placeholder="Specify Lender" formControlName="others_lender">
                                     </mat-form-field>
                                     <mat-form-field style="width: 100%">
-                                            <mat-select placeholder="Loan Taken By" formControlName="loan_taken_by" [compareWith]="compareObjects">
+                                            <mat-select placeholder="Loan Taken By" formControlName="loan_taken_by" [compareWith]="compareObjects" multiple>
                                                 <mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName">
                                                     <mat-option [value]="val" *ngFor="let val of group.groupValues">{{val.name}}</mat-option>
                                                     

src/pages/pd-question/pd-question-family/pd-question-family.html

@@ -154,7 +154,7 @@
         </mat-select>
 </mat-form-field>
 <mat-form-field *ngIf="tech.get('residence_ownership').value== 3">
-    <input matInput type="number" placeholder="Rent Amount" formControlName="rent" (keyup)="inWords($event.target.value,i,2)"/>
+    <input matInput type="number" placeholder="Monthly Rent Amount" formControlName="rent" (keyup)="inWords($event.target.value,i,2)"/>
     <mat-hint align="end" style="font-size: 11px" *ngIf="tech.get('rent').value != ''">{{"&#8377;"}} {{RentAmount[i]}} Only</mat-hint>
 </mat-form-field>
 <mat-form-field *ngIf="tech.get('residence_ownership').value== 1">
@@ -176,6 +176,12 @@
           <div *ngFor="let item of tech.controls.family_members_details['controls']; let ix=index; let last=last" [formGroupName]="ix">       
       
           <mat-card-header appearence="outline">Family Details # {{ix+1}} Of {{FamilyMemberAsLabel[i]}}</mat-card-header>
+          <mat-form-field style="width:100%">
+                <mat-select placeholder="Title" formControlName="applicant_title_name">
+                  <mat-option>Select</mat-option>
+                  <mat-option *ngFor="let t1 of titleList" [value]="t1.title_id">{{t1.name}}</mat-option>
+                </mat-select>
+              </mat-form-field>
           <mat-form-field>
               <input matInput type="text" placeholder="Name" formControlName="family_member_name" />
           </mat-form-field>

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

@@ -69,6 +69,7 @@ data:any;
   imageDisplay: any=[];
   imageBucket: any=[];
   tab: any='0';
+  titleList: any=[];
 
   constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
     public qustCat:QuestionCategoryProvider,public aws:AwsServiceProvider,
@@ -263,6 +264,7 @@ data:any;
             this.inWords(vals.earning_gross_income_per_month,index,1);
           }
             let datas = this.fb.group({
+              applicant_title_name:[vals.applicant_title_name || null],
                 family_member_name: [vals.family_member_name || null],
                 family_member_relationship: [vals.family_member_relationship || null],
                 relationSearch:[''],
@@ -373,6 +375,7 @@ data:any;
   }
   generateFamilyMembersDetailsGet(): FormGroup {
     return this.fb.group({
+      applicant_title_name:[''],
         family_member_name: ['' ],
         family_member_relationship: [''],
         relationSearch:[''],
@@ -433,6 +436,11 @@ data:any;
               this.stateDataValue=this.stateData.slice();
               }
             })
+            this.qustCat.getcommondrop('TITLES').subscribe(res=>{
+              if(res['dataStatus']==true){
+                this.titleList=res['records'].filter(com=>com.isactive==1);
+              }
+            });
     
 }
 getCity(e,i){
@@ -697,6 +705,7 @@ selectedPerson(e,inx){
               //     this.isReadOnly[inx] = false;
               // }
               arraydata = {
+                          'applicant_title_name':'',
                           'family_member_name' : val.name,
                           'family_member_relationship' : val.relationship,
                           'family_member_age' : val.age,
@@ -742,6 +751,7 @@ if (result.length > 0) {
 }
 initgenerateFamilyMembersDetailsGet(val):FormGroup{
   return this.fb.group({
+    applicant_title_name:[val.applicant_title_name],
     family_member_name: [val.family_member_name],
     family_member_relationship: [val.family_member_relationship],
     relationSearch:[''],

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

@@ -1327,7 +1327,8 @@ console.log('1)',this.temp);
       business_date_object: [elementValue.business_date_object],
       is_active: [elementValue.is_active],
       is_new:[elementValue.is_new],
-      business_entity_type_name:[name]
+      business_entity_type_name:[name],
+      associate_pd_id:[elementValue.associate_pd_id]
       
   });
   }

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

@@ -56,7 +56,7 @@ export class PdQuestionOtherIncomePage {
     this.customer_segment_abbr = this.pdDetails.customer_segment_abbr;
     console.log('this.customer_segment_abbr',this.customer_segment_abbr)
     this.applicants=this.pdDetails.applicat_details.filter(val=>val.pd_co_applicant_id != 0)
-    this.applicants.push({'pd_co_applicant_id': 0,'applicant_name': "Others"})
+    //this.applicants.push({'pd_co_applicant_id': 0,'applicant_name': "Others"})
     this.getFrequency();
     this.users = this.aws.getlocale();
 

src/providers/common-provider/toast.ts

@@ -67,25 +67,12 @@ setAlertForDocName(){
   ],
   buttons:[
     {
-      text:'Yes / Allow Addon PD',
+      text:'Submit',
-      handler:()=>{
+      handler:data=>{
-        alert.dismiss('add_on')
+        console.log(data.Name)
-        return false
+        alert.dismiss(data.Name)
-      }
-    },
-    {
-      text:'Yes',
-      handler:()=>{
-        alert.dismiss('yes')
-        return false
-      }
-    },
-    {
-      text:'No',
-      handler:()=>{
-        alert.dismiss('No')
-        return false
       }
+   
     }
   ]
   })

src/providers/constants/constants.ts

@@ -21,7 +21,7 @@ public commonimage = "http://ssa.sineedge.com/sparqapi/logo/avatar.jpg";
     let devapiurl_beta = 'http://ssa.sineedge.com/sparqapi_beta/api/';
     let devapiurl = 'http://ssa.sineedge.com/sparqapi/api/';
     let localapiurl = 'http://192.168.0.6:9999/AWSEC2/sparqapi/api/';
-    return devapiurl;
+    return testapiurl;
   }
 
   getcurrentDate()