Fairoj: Last changes,alert fixes

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

@@ -1,4 +1,4 @@
-#Fri Mar 01 15:12:18 IST 2019
+#Mon Mar 11 15:12:53 IST 2019
 base.0=S\:\\pd_office\\sineedgelenderapp\\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.
-#Fri Mar 01 15:12:19 IST 2019
+#Mon Mar 11 15:12:54 IST 2019
 56.path=classes.dex
 5.base=S\:\\pd_office\\sineedgelenderapp\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 42.base=S\:\\pd_office\\sineedgelenderapp\\platforms\\android\\app\\build\\intermediates\\assets\\debug

src/app/app.component.ts

@@ -1,5 +1,5 @@
 import { Component, ViewChild } from '@angular/core';
-import { Nav, Platform } from 'ionic-angular';
+import { Nav, Platform,AlertController } from 'ionic-angular';
 import { StatusBar } from '@ionic-native/status-bar';
 import { SplashScreen } from '@ionic-native/splash-screen';
 import { LoginPage } from '../pages/login/login';
@@ -19,12 +19,13 @@ export class MyApp {
   userDetails: any;
   userAccess:boolean = false;
   @ViewChild(Nav) nav: Nav;
+  public alertShown:boolean=false;
 
   rootPage: any = LoginPage;
 
   pages: Array<{title: string,icon:any, method: any}>;
 
-  constructor(public platform: Platform, public statusBar: StatusBar, public splashScreen: SplashScreen,public aws:AwsServiceProvider,public shared:CognitoServiceProvider,public AWS:AwsServiceProvider) {
+  constructor(public platform: Platform, public statusBar: StatusBar, public splashScreen: SplashScreen,public aws:AwsServiceProvider,public shared:CognitoServiceProvider,public AWS:AwsServiceProvider,public  alertCtrl:AlertController) {
     this.initializeApp();
 
     // used for an example of ngFor and navigation
@@ -56,7 +57,40 @@ export class MyApp {
       }, 1000);
     });
   })
-  }
+   this.platform.registerBackButtonAction(()=>{
+      if(this.nav.length()==1){
+        if(this.alertShown==false){
+        //this.presentConfirm();  
+        let alert=this.alertCtrl.create({
+          title:'Confirm Exit',
+          message:'Do You Want Exit ?',
+          buttons:[
+            {
+              text:'Cancel',
+              role:'cancel',
+              handler:()=>{
+                console.log("Cancel clicked");
+               this.alertShown=false
+               alert.dismiss
+              }
+            },
+            {
+              text:'Yes',
+              handler:()=>{
+                console.log("Exit");
+                this.platform.exitApp();
+              }
+            }
+          ]
+        });
+          alert.present();
+          this.alertShown=true
+        }
+      }
+      else{
+        this.nav.pop()
+      }
+    });    }
   getuserDetails()
   {
      

src/pages/auth/auth.html

@@ -61,7 +61,7 @@
         <ion-row>
           <ion-col text-center>
             <mat-form-field>
-              <input matInput placeholder="PIN" #pin  pattern="[0-9]{4}" maxlength="4" style="width: 100%;" required>
+              <input matInput type="password" placeholder="PIN" #pin  pattern="[0-9]{4}" maxlength="4" style="width: 100%;" required>
             </mat-form-field>
           </ion-col>
         </ion-row>

src/pages/input/input.html

@@ -40,7 +40,7 @@
   </div>
   <div fxLayout="column" fxLayoutAlign="start stretch">
     <mat-form-field style="width: 100%">
-        <input matInput placeholder="Lender Contact Number" type="tel" name="pdcontectno" minlength="10" maxlength="10" formControlName="pdcontectno"required>
+        <input matInput placeholder="Lender's Mobile Number" type="tel" name="pdcontectno" minlength="10" maxlength="10" formControlName="pdcontectno"required>
         <mat-error *ngIf="pdforms.controls['pdcontectno'].hasError('required')">Lender Contact Number Required</mat-error>
       </mat-form-field>
 </div>
@@ -67,8 +67,8 @@
       </mat-select>
       </mat-form-field>
   </div>
-  <div fxLayout="column" fxLayoutAlign="start stretch">
-    <mat-form-field style="width: 100%">
+  
+    <mat-form-field style="width: 100%" *ngIf="pdforms.controls['proName'].value != 4">
       <mat-select matInput placeholder="Sub Product Name" formControlName="subProName">
           <mat-option>--</mat-option>
 
@@ -77,14 +77,14 @@
       </mat-select>
     
     </mat-form-field>
-  </div>
+ 
   <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.abbr}} - {{c.customer_segment}}</mat-option>
+          <mat-option  *ngFor = "let c of customerSegmentList" [value]="c.customer_segment_id">{{c.abbr}}</mat-option>
 
       </mat-select>
     
@@ -93,7 +93,7 @@
   </div>
   <div fxLayout="column" fxLayoutAlign="start stretch">
     <mat-form-field style="width: 100%">
-      <mat-select matInput placeholder="PD Type" formControlName = "pdType" required>
+      <mat-select matInput placeholder="PD Type" formControlName = "pdType" >
 
           <mat-option>--</mat-option>
 
@@ -119,7 +119,7 @@
       <h5>Address # {{i+1}}</h5>
   <div fxLayout="column" fxLayoutAlign="start stretch">
       <mat-form-field style="width: 100%">
-    <textarea type="text" matInput placeholder="Address 1" formControlName = "add1" style="text-transform: uppercase"></textarea>
+    <textarea type="text" matInput placeholder="Address at which PD is to be done" formControlName = "add1" style="text-transform: uppercase"></textarea>
     </mat-form-field>
   </div>
   <!-- <div fxLayout="column" fxLayoutAlign="start stretch">

src/pages/input/input.ts

@@ -51,6 +51,7 @@ btnaccess:boolean = false;
   titleList:any=[];
   display_city_pin:any=[];
   loanAmtInWords:any=[]
+  customerSegmentList:any=[]
   
   
   constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,public pddetails:PdtriggerProvider,public shared:CognitoServiceProvider,public aws:AwsServiceProvider,public camera:Camera,public toast:ToastProvider, public qustCat:QuestionCategoryProvider) {
@@ -249,6 +250,12 @@ inWords(event){
   {
     this.subproname = this.proname.filter(product=>product.product_id == subprodcutdata)[0];
     this.subproname = this.subproname.subproducts;
+    this.subproname = this.subproname.filter(item => item.is_others == 0);
+      /**customer segment */
+      this.customerSegmentList = (subprodcutdata != '4')?this.customeSeg:this.customeSeg.filter(s => (s.customer_segment).includes('Self'));
+      if(subprodcutdata != '4'){this.pdforms.controls['subProName'].setValue(null)}
+    
+  
   }
   createItem(): FormGroup {
     return this.fb.group({

src/pages/login/login.ts

@@ -75,12 +75,12 @@ login() {
   // console.log(this.email);
   if(this.email !==undefined && this.password !==undefined && this.email !='' && this.password !='' && this.email !=null && this.password !=null ){
   let auth = { 'Username': this.email, 'Password': this.password };
-  this.presentLoading();
+
   this.aws.dologin(auth).subscribe(awsres => {
-    
-      
+    this.presentLoading()
+    setTimeout(()=>{
       this.navCtrl.setRoot(PdListPage);
-            
+    },1000)       
       
 
       

www/assets/fonts/ionicons.scss

@@ -1,50 +0,0 @@
-
-// Ionicons Icon Font CSS
-// --------------------------
-// Ionicons CSS for Ionic's <ion-icon> element
-// ionicons-icons.scss has the icons and their unicode characters
-
-$ionicons-font-path: $font-path !default;
-
-@import "ionicons-icons";
-@import "ionicons-variables";
-
-
-@font-face {
-  font-family: "Ionicons";
-  src: url("#{$ionicons-font-path}/ionicons.woff2?v=#{$ionicons-version}") format("woff2"),
-    url("#{$ionicons-font-path}/ionicons.woff?v=#{$ionicons-version}") format("woff"),
-    url("#{$ionicons-font-path}/ionicons.ttf?v=#{$ionicons-version}") format("truetype");
-  font-weight: normal;
-  font-style: normal;
-}
-
-ion-icon {
-  display: inline-block;
-
-  font-family: "Ionicons";
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
-  text-rendering: auto;
-  text-transform: none;
-  speak: none;
-
-  @include rtl() {
-    &[aria-label^="arrow"]::before,
-    &[flip-rtl]::before {
-      transform: scaleX(-1);
-    }
-
-    &[unflip-rtl]::before {
-      transform: scaleX(1);
-    }
-  }
-
-  &::before {
-    display: inline-block;
-  }
-}

www/assets/fonts/noto-sans.scss

@@ -1,34 +0,0 @@
-// Noto Sans Font
-// Google
-// Apache License, version 2.0
-// http://www.apache.org/licenses/LICENSE-2.0.html
-
-$noto-sans-font-path: $font-path !default;
-
-@font-face {
-  font-family: "Noto Sans";
-  font-style: normal;
-  font-weight: 300;
-  src: local("Noto Sans"), local("Noto-Sans-Regular"), url("#{$noto-sans-font-path}/noto-sans-regular.woff") format("woff"), url("#{$noto-sans-font-path}/noto-sans-regular.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Noto Sans";
-  font-style: normal;
-  font-weight: 400;
-  src: local("Noto Sans"), local("Noto-Sans-Regular"), url("#{$noto-sans-font-path}/noto-sans-regular.woff") format("woff"), url("#{$noto-sans-font-path}/noto-sans-regular.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Noto Sans";
-  font-style: normal;
-  font-weight: 500;
-  src: local("Noto Sans Bold"), local("Noto-Sans-Bold"), url("#{$noto-sans-font-path}/noto-sans-bold.woff") format("woff"), url("#{$noto-sans-font-path}/noto-sans-bold.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Noto Sans";
-  font-style: normal;
-  font-weight: 700;
-  src: local("Noto Sans Bold"), local("Noto-Sans-Bold"), url("#{$noto-sans-font-path}/noto-sans-bold.woff") format("woff"), url("#{$noto-sans-font-path}/noto-sans-bold.ttf") format("truetype");
-}

www/assets/fonts/roboto.scss

@@ -1,34 +0,0 @@
-// Roboto Font
-// Google
-// Apache License, version 2.0
-// http://www.apache.org/licenses/LICENSE-2.0.html
-
-$roboto-font-path: $font-path !default;
-
-@font-face {
-  font-family: "Roboto";
-  font-style: normal;
-  font-weight: 300;
-  src: local("Roboto Light"), local("Roboto-Light"), url("#{$roboto-font-path}/roboto-light.woff2") format("woff2"), url("#{$roboto-font-path}/roboto-light.woff") format("woff"), url("#{$roboto-font-path}/roboto-light.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Roboto";
-  font-style: normal;
-  font-weight: 400;
-  src: local("Roboto"), local("Roboto-Regular"), url("#{$roboto-font-path}/roboto-regular.woff2") format("woff2"), url("#{$roboto-font-path}/roboto-regular.woff") format("woff"), url("#{$roboto-font-path}/roboto-regular.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Roboto";
-  font-style: normal;
-  font-weight: 500;
-  src: local("Roboto Medium"), local("Roboto-Medium"), url("#{$roboto-font-path}/roboto-medium.woff2") format("woff2"), url("#{$roboto-font-path}/roboto-medium.woff") format("woff"), url("#{$roboto-font-path}/roboto-medium.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Roboto";
-  font-style: normal;
-  font-weight: 700;
-  src: local("Roboto Bold"), local("Roboto-Bold"), url("#{$roboto-font-path}/roboto-bold.woff2") format("woff2"), url("#{$roboto-font-path}/roboto-bold.woff") format("woff"), url("#{$roboto-font-path}/roboto-bold.ttf") format("truetype");
-}

www/build/main.css.map

@@ -1 +0,0 @@
-null