PD Trigger Forms Changes

src/pages/auth/auth.html

@@ -70,6 +70,9 @@
          <mat-card-actions text-center>
            <button mat-raised-button color="primary" (click)="checkpin(pin.value)">UNLOCK</button>
          </mat-card-actions>
+         <div align="center" >(or)</div>
+         <h5 align="center">Login Using FingerPrint</h5>
+         <div align="center" style="font-size: 11px;">Place your finger on fingerprint scanner to login</div>
          <mat-card-actions text-center (click)="checkfingerprint()">
           <ion-icon name="finger-print"></ion-icon>
          </mat-card-actions>

src/pages/input/input.html

@@ -28,14 +28,14 @@
     </div>
     <div fxLayout="column" fxLayoutAlign="start stretch">
       <mat-form-field style="width: 100%">
-          <input matInput placeholder="PD Contact Person" type="text" name="pdcontactperson" formControlName="pdcontactperson"required>
+          <input matInput placeholder="Lender Contact Person" type="text" name="pdcontactperson" formControlName="pdcontactperson"required>
-          <mat-error *ngIf="pdforms.controls['pdcontactperson'].hasError('required')">PD Contact Person Required</mat-error>
+          <mat-error *ngIf="pdforms.controls['pdcontactperson'].hasError('required')">Lender Contact Person Required</mat-error>
         </mat-form-field>
   </div>
   <div fxLayout="column" fxLayoutAlign="start stretch">
     <mat-form-field style="width: 100%">
-        <input matInput placeholder="PD Contact Number" type="number" name="pdcontectno" patten="{10}" max="10" formControlName="pdcontectno"required>
+        <input matInput placeholder="Lender Contact Number" type="tel" name="pdcontectno" maxlength="10" formControlName="pdcontectno"required>
-        <mat-error *ngIf="pdforms.controls['pdcontectno'].hasError('required')">PD Contect Number Required</mat-error>
+        <mat-error *ngIf="pdforms.controls['pdcontectno'].hasError('required')">Lender Contect Number Required</mat-error>
       </mat-form-field>
 </div>
     <div fxLayout="column" fxLayoutAlign="start stretch">
@@ -60,16 +60,18 @@
     
     </mat-form-field>
   </div>
-  <div fxLayout="column" fxLayoutAlign="start stretch">
+  <div fxLayout="column" fxLayoutAlign="start stretch" text-warp>
+    <mat-list>
     <mat-form-field style="width: 100%">
       <mat-select matInput placeholder="Customer Segment" formControlName = "customeSeg">
           <mat-option>--</mat-option>
 
-          <mat-option *ngFor = "let c of customeSeg" [value]="c.customer_segment_id">{{c.customer_segment}}</mat-option>
+          <mat-option  *ngFor = "let c of customeSeg" [value]="c.customer_segment_id">{{c.abbr}} - {{c.customer_segment}}</mat-option>
 
       </mat-select>
     
     </mat-form-field>
+    </mat-list>
   </div>
   <div fxLayout="column" fxLayoutAlign="start stretch">
     <mat-form-field style="width: 100%">
@@ -93,7 +95,7 @@
     <textarea type="text" matInput placeholder="Address 1" formControlName = "add1"></textarea>
     </mat-form-field>
   </div>
-  <div fxLayout="column" fxLayoutAlign="start stretch">
+  <!-- <div fxLayout="column" fxLayoutAlign="start stretch">
       <mat-form-field style="width: 100%">
     <textarea type="text" matInput placeholder="Address 2" formControlName="add2"></textarea>
     </mat-form-field>
@@ -103,7 +105,7 @@
   <mat-form-field style="width: 100%">
     <textarea type="text" matInput placeholder="Address 3" formControlName="add3"></textarea>
     </mat-form-field>
-  </div>
+  </div> -->
   
   <div fxLayout="column" fxLayoutAlign="start stretch">
     <mat-form-field style="width: 100%">
@@ -125,80 +127,92 @@
   </div>
   <div fxLayout="column" fxLayoutAlign="start stretch">
     <mat-form-field style="width: 100%">
-    <input type="text" matInput placeholder="PIN" formControlName="pincode">
+    <input type="number" maxlength="2" matInput placeholder="PIN" formControlName="pincode">
     </mat-form-field>
   </div>
 
-  <div fxLayout="column" fxLayoutAlign="start stretch">
+  <!-- <div fxLayout="column" fxLayoutAlign="start stretch">
       <mat-form-field style="width: 100%">
       <input type="text" matInput placeholder="Remarks" formControlName="remarks">
       </mat-form-field>
-    </div>
+    </div> -->
   
       </mat-card>
 <br/>
   <mat-card class="box">
     <ion-row>
       <ion-col col-8>
-    <h5>Main Applicant Details</h5>
+    <h5>Applicant Info</h5>
   </ion-col>
   
-    <ion-col col-3 *ngIf="!btnaccess">
+    <!-- <ion-col col-3 *ngIf="!btnaccess">
       <a (click)="addCoApplicant()"><ion-icon color="optblue" name="md-person-add"></ion-icon></a>
-     </ion-col>
+     </ion-col> -->
      </ion-row>
       <div fxLayout="column" fxLayoutAlign="start stretch">
           <mat-form-field style="width: 100%">
-              <input matInput placeholder="Name" type="text" name="lenName" formControlName="mainappname">
+              <input matInput placeholder="Individual Name" type="text" name="lenName" formControlName="mainappname">
           </mat-form-field>
       </div>
       <div fxLayout="column" fxLayoutAlign="start stretch">
           <mat-form-field style="width: 100%">
-              <input matInput placeholder="Email" type="email" name="mainappemail" formControlName="mainappemail">
+              <input matInput placeholder="Company / Firm Name" type="text" name="mainappcompany" formControlName="mainappcompany">
           </mat-form-field>
       </div>
       <div fxLayout="column" fxLayoutAlign="start stretch">
           <mat-form-field style="width: 100%">
-              <input matInput placeholder="Phone" type="number" name="mainappphone" formControlName="mainappphone">
+              <input matInput placeholder="Mobile Number" type="tel" maxlength="10" name="mainappphone" formControlName="mainappphone">
           </mat-form-field>
       </div>
+      <div>
+          <p>Landline</p>
+        <mat-form-field style="width: 30%">
+         
+          
+            <input matInput placeholder="code" type="tel" minlength="2" maxlength="4" name="mainapplandline" [(ngModel)]="Landline1" [ngModelOptions]="{standalone: true}">
+        </mat-form-field> &nbsp; - &nbsp;
+        <mat-form-field style="width: 60%">
+          
+            <input matInput placeholder="number" type="tel" minlength="6" maxlength="8" name="mainapplandline" [(ngModel)]="Landline2" [ngModelOptions]="{standalone: true}">
+        </mat-form-field>
+    </div>
+    
       
   </mat-card>
   <br/>
   
-  <div fxLayout="row" fxLayoutWrap="wrap" formArrayName="items" *ngFor="let coDetails of pdforms.get('items')['controls']; let i = index;let last = last;">
+  <mat-card fxLayout="row" fxLayoutWrap="wrap" formArrayName="items" >
-      <div class="column" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
+      <ion-row>
+          <h5>Additional Requirement</h5>
+          <ion-col offset-1 col-3> 
+          
+           </ion-col>
+          </ion-row>
+      <div class="column" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" *ngFor="let coDetails of pdforms.get('items')['controls']; let i = index;let last = last;">
+           
             
-            <mat-card class="p-2" class="box">
-                <ion-row>
-               <h5>{{pdforms.controls.items.controls[i].controls.label.value}} {{i+1}}</h5>
-               <ion-col offset-1 col-3> 
-               <ion-buttons end >
-                  <a (click)="remove(i)">
-                  <ion-icon name="close" color="optblue" style="font-size: 22px;"></ion-icon></a> 
-                  <a (click)="addCoApplicant()" *ngIf="last">
-                  <ion-icon color="optblue" name="md-person-add" style="font-size: 22px;"></ion-icon></a>
                 
-                </ion-buttons>
-                </ion-col>
-               </ion-row>
                
                <div [formGroupName]="i">
                     <mat-form-field style="width: 100%">
-                            <input matInput placeholder="Name" formControlName="coapplicantName" type="text">
+                            <input matInput placeholder="Requirement" formControlName="add_requirement" type="text">
                         </mat-form-field>
-                        <mat-form-field style="width: 100%">
-                                <input matInput placeholder="Relation" formControlName="relationship" type="text">
-                            </mat-form-field>
-                  </div>
                        
-            </mat-card>
+                  </div>
+                  <ion-buttons >
+                      <a (click)="remove(i)">
+                      <ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon></a> &nbsp;&nbsp;&nbsp;
+                      <a (click)="addCoApplicant()" *ngIf="last">
+                      <ion-icon color="optblue" name="md-add" style="font-size: 22px;"></ion-icon></a>
+                      
+                    </ion-buttons>
+            <!-- </mat-card> -->
 
          </div>
          <br/>
          
-         </div>
+         </mat-card>
-         <mat-card>
+         <mat-card *ngIf="pddocdata.length !=0">
             <ion-grid >
               <ion-row>
                 
@@ -223,14 +237,22 @@
         </ion-row>
             </ion-grid>
            </mat-card>
+           <br/>
+           <mat-card>
+              <ion-row>
+                  <mat-form-field style="width: 100%;">
+                  <textarea type="text" matInput placeholder="Remarks" formControlName="remarks"></textarea>                    
+                  </mat-form-field>
+              </ion-row>
+           </mat-card>
           <br/>
           <ion-row>
             
             
-       
+            <ion-spinner icon="bubbles"  *ngIf="btnaccess" class="spinner-calm"></ion-spinner>
          <!-- <ion-buttons >
          <ion-button color="optblue" full[disabled]="!pdforms.valid" mat-raised-button style="width:100%" (click)="savepdDetails(pdforms.value)">Save <ion-icon name="md-disc"></ion-icon></ion-button> -->
-         <button ion-button full color="optblue" [disabled]="!pdforms.valid" (click)="savepdDetails(pdforms.value)"> Save</button>
+         <button ion-button full color="optblue" [disabled]="!pdforms.valid || btnaccess"  (click)="savepdDetails(pdforms.value,Landline1,Landline2)"> Submit &nbsp;&nbsp;</button>
           <!-- </ion-buttons> -->
         
         </ion-row>

src/pages/input/input.scss

@@ -7,3 +7,6 @@
 .example-full-width {
   width: 100%;
 }
+.spinner-md-crescent circle {
+  stroke: #E00201;
+}

src/pages/pd-allocation/pd-allocation.html

@@ -6,28 +6,28 @@
     <ion-title style="font-size: 14px !important;" *ngIf="!viewchange">{{pdFullDetails.lender_applicant_id}}</ion-title>
     
       
-      <ion-buttons end>
+      <!-- <ion-buttons end>
         <a (click)="filter(viewchange)" *ngIf="!viewchange">
           <ion-icon style="color:white;font-size:25px;"name="search"></ion-icon>
         </a>
         <a (click)="filter(viewchange)" *ngIf="viewchange">
             <ion-icon style="color:white;font-size:25px;"name="close"></ion-icon>
           </a>
-        </ion-buttons>
+        </ion-buttons> -->
   </ion-navbar>
 
 </ion-header>
 
 
 <ion-content padding>
-    <ion-refresher (ionRefresh)="doRefresh($event)">
+    <!-- <ion-refresher (ionRefresh)="doRefresh($event)">
         <ion-refresher-content
           pullingIcon="refresh"
           pullingText="Pull to refresh"
           refreshingSpinner="crescent"
           refreshingText="Refreshing...">
         </ion-refresher-content>
-      </ion-refresher>
+      </ion-refresher> -->
       <br/>
       <ion-grid class="fadeIn">
          <mat-card class="box" reorder="true" style="min-height:100% !important;">
@@ -45,20 +45,20 @@
             <div *ngFor="let Mainapplicatent of applicantDetails">
             <ion-row *ngIf="Mainapplicatent.applicant_type =='1'">
                 <ion-col text-left>
-                  <span><ion-icon name="person"></ion-icon>&nbsp; {{Mainapplicatent.applicant_name}} (Main)</span>
+                  <span><ion-icon name="person"></ion-icon>&nbsp; {{Mainapplicatent.applicant_name}}</span>
                </ion-col>
                <ion-col text-right>
                   <span><ion-icon name="md-call"></ion-icon>&nbsp;{{Mainapplicatent.mobile_no}} </span>
                </ion-col>
               </ion-row> 
-               <ion-row *ngIf="Mainapplicatent.applicant_type =='0'">
+               <!-- <ion-row *ngIf="Mainapplicatent.applicant_type =='0'">
                 <ion-col text-left>
                   <span><ion-icon name="md-person"></ion-icon>&nbsp; {{Mainapplicatent.applicant_name}}</span>
                </ion-col>
                <ion-col text-right>
                   <span><ion-icon name="md-call"></ion-icon>&nbsp;{{Mainapplicatent.mobile_no}} </span>
                </ion-col>
-              </ion-row>
+              </ion-row> -->
             </div>
             </div>
             <div *ngIf="applicantDetails =='Applicant Details Not Found'">
@@ -110,13 +110,20 @@
             
           </ion-row>
           <!-- <a (click)="locationnavicate(applicatentDetails.addressline1)" style="text-decoration: none;"><ion-row> -->
-              <ion-row>
+              <ion-row *ngIf="pdFullDetails.addressline1 !=null;else noaddress;">
               <ion-col col-1 class="cusicon"><ion-icon name="pin"></ion-icon></ion-col>
                  <ion-col class="cardinfo">{{pdFullDetails.addressline1}}<br/>
-                 {{pdFullDetails.addressline2}}<br/>
+                 {{pdFullDetails.city_name}}<br/>
-                 {{pdFullDetails.addressline3}}</ion-col>
+                {{pdFullDetails.state_name}} - {{pdFullDetails.pincode}}</ion-col>
-               
                 </ion-row>
+                <ng-template #noaddress>
+                    <ion-row>
+                        <ion-col col-1 class="cusicon"><ion-icon name="pin"></ion-icon></ion-col>
+                        <ion-col class="cardinfo">
+                        {{pdFullDetails.city_name}}<br/>
+                       {{pdFullDetails.state_name}} - {{pdFullDetails.pincode}}</ion-col>
+                    </ion-row>
+                </ng-template>
                 <hr>
                 <ion-row>
                     <ion-col>
@@ -139,10 +146,11 @@
                     </ion-col>
                   </ion-row>
                   <div *ngIf="docImage !='Documents Not Found'">
-                <div *ngFor="let image of docImage">
+                <div >
                 <ion-row>
-                    <ion-col text-left>
+                    <ion-col *ngFor="let image of docImage">
-                      <span *ngIf="image.pd_document_title !=''"><ion-icon name="md-document"></ion-icon>&nbsp; {{image.pd_document_title}}</span>
+                      <img [src]="image.doc_url" alt="no image" onError="'https://vignette.wikia.nocookie.net/simpsons/images/6/60/No_Image_Available.png/revision/latest?cb=20170219125728'" style="width:100%;height: 90%" imageViewer>
+                      <br/><span>{{image.pd_document_title}}</span>
                    </ion-col>
                    
                   </ion-row> 
@@ -154,6 +162,25 @@
                      </ion-col>
                   </div>
                   <hr/>
+                  
+                  <ion-row>
+                    <ion-col>
+                      <h1>Additional Requirements</h1>
+                    </ion-col>
+                    </ion-row>
+                    <div *ngIf="addAccess;else noreqData;">
+                <ion-row *ngFor="let req of additional_requ">
+                  <ion-col>
+                        {{req.add_requirement}}
+                  </ion-col>
+                </ion-row>
+                </div>
+                  <ng-template #noreqData>
+                      <ion-col text-left>
+                          <span><i class=""></i>&nbsp;  No Additional Requirements</span>
+                       </ion-col>
+                    </ng-template>
+                    <hr/>
                   <ion-row>
                     <ion-col>
                       <h1>Notes</h1>
@@ -164,6 +191,7 @@
                     {{pdFullDetails.remarks}}
                   </ion-col>
                 </ion-row>
+                
       </mat-card> 
        
       <!--<br/>

src/pages/pd-allocation/pd-allocation.scss

@@ -20,6 +20,7 @@ page-pd-allocation {
     .scroll-content{
       background-color: #eee !important;
       padding:0px !important;
+      margin-top:30px !important;
     }
     // .mat-card{
     //   padding: 7px 16px !important;

src/pages/pd-allocation/pd-allocation.ts

@@ -15,6 +15,8 @@ import { PdtriggerProvider } from '../../providers/pdtrigger/pdtrigger';
   templateUrl: 'pd-allocation.html',
 })
 export class PdAllocationPage {
+  addAccess: boolean;
+  additional_requ: any =[];
   qccompleted: any;
   docImage: any;
   applicantDetails: any;
@@ -59,6 +61,14 @@ pdDetailLender:any = [];
               {
                 this.docImage = this.pdDetailLender.msg.pd_docs_msg;
               }
+              if(this.pdDetailLender.records.pd_additional_requirements.length !=0){
+                this.addAccess = true;
+              this.additional_requ = this.pdDetailLender.records.pd_additional_requirements;
+              }else
+              {
+                this.addAccess = false;
+              }
+
              // console.log(this.docImage);
 
 

src/pages/pd-list/pd-list.html

@@ -61,16 +61,17 @@
              <ion-grid class="fadeIn">     
           <mat-card class="md-box" reorder="true" *ngFor="let progess of pdinprogress;let i = index;">
              <ion-list >
+                
                     <ion-item (click)="PdAllocation(progess)" > 
                       <!-- <pre>{{progess.applicat_details | json}}</pre> -->
-                      <ion-icon item-start="" class="lettericon" [style.background]="bgColor[i]" *ngIf="progess.applicat_details !==undefined">{{progess.applicat_details[0].applicant_name | slice : 0 :1 | uppercase}}</ion-icon>
+                      <ion-icon item-start="" class="lettericon" [style.background]="bgColor[i]" *ngIf="progess.applicat_details !==undefined && progess.applicat_details[0].applicant_name !=null">{{progess.applicat_details[0].applicant_name | slice : 0 :1 | uppercase}}</ion-icon>
-                      <ion-icon item-start="" class="lettericon" [style.background]="bgColor[i]" *ngIf="progess.applicat_details ===undefined">N</ion-icon>
+                      <ion-icon item-start="" class="lettericon" [style.background]="bgColor[i]" *ngIf="progess.applicat_details ===undefined || progess.applicat_details[0].applicant_name ==null">N</ion-icon>
                           <ion-row>
-                            <ion-col col-5 *ngIf="progess.applicat_details !== undefined && progess.applicat_details[0].applicant_type == 1">
+                            <ion-col col-5 *ngIf="progess.applicat_details !== undefined && progess.applicat_details[0].applicant_type == 1 && progess.applicat_details[0].applicant_name !=null">
                               <h1>{{progess.applicat_details[0].applicant_name | titlecase}}</h1>
                               <!--<p>28 Sep 2018 10:00 AM</p>-->
                             </ion-col>
-                            <ion-col col-5 *ngIf="progess.applicat_details === undefined">
+                            <ion-col col-5 *ngIf="progess.applicat_details === undefined || progess.applicat_details[0].applicant_name ==null">
                                 <h1>Name Not Given</h1>
                                 <!--<p>28 Sep 2018 10:00 AM</p>-->
                               </ion-col>
@@ -145,7 +146,6 @@
           </div>
   </div>
   <div *ngIf="!pdlistaccess" text-center>
-      <ion-icon name="md-folder-open" style="font-size:35.5rem;"></ion-icon>
       
       <h2>{{pdlistdetails}}</h2>
   </div>

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

@@ -34,12 +34,15 @@ export class PdListPage {
   status:any;
   searchitem:any;
   constructor(public navCtrl: NavController, public navParams: NavParams,public aws:AwsServiceProvider,public pdofficer:PdtriggerProvider,public shared:CognitoServiceProvider) {
-    this.getlenderpddetails(); 
   }
 
   ionViewDidLoad() {
     console.log('ionViewDidLoad PdListPage');
   }
+  ionViewDidEnter()
+  {
+    this.getlenderpddetails();     
+  }
   filter(view){
     if(!view){
       this.viewchange = true;
@@ -94,6 +97,7 @@ export class PdListPage {
     // if the value is an empty string don't filter the items
     
     if(this.pdlist == "inpro"){
+      console.log('if');
       if (q.trim() == '') {
           return ;
       }else{
@@ -101,7 +105,7 @@ export class PdListPage {
         if (v.applicat_details !== undefined && v.applicat_details[0].applicant_name.toLowerCase().indexOf(q.toLowerCase()) > -1 || v.pd_status.toLowerCase().indexOf(q.toLowerCase())>-1 || v.city_name != null && v.city_name.toLowerCase().indexOf(q.toLowerCase())>-1 || v.lender_applicant_id.toLowerCase().indexOf(q.toLowerCase())>-1) {
             return true;
         }
-        return false;
+       
     })
   }
   }else

src/providers/common-provider/camera.ts

@@ -20,7 +20,8 @@ export class CameraProvider {
       destinationType: this.camera.DestinationType.DATA_URL,
       targetWidth: 500,
       targetHeight: 600,
-      correctOrientation: true
+      correctOrientation: true,
+      allowEdit:true,
     };
 
     // If set to crop, restricts the image to a square of 600 by 600