Fairoj : Reset Pin improvements

src/app/pages/authentication/auth/auth.ts

@@ -8,6 +8,7 @@ import { AwsServiceProvider } from '../../../services/aws-service/aws-service';
 
 import { LoadingProvider } from '../../../services/common-provider/loading';
 import { ConstantsProvider } from '../../../services/constants/constants';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 /**
  * Generated class for the AuthPage page.
  *
@@ -30,12 +31,18 @@ pin:any;
   newpassword:any;
   ConfirmPassword:any;
   commonImage:any;
-  constructor(public navCtrl: NavController,public Menu:MenuController,public fb:FormBuilder,public shared:CognitoServiceProvider,public toast:ToastProvider,private faio:FingerprintAIO,public aws:AwsServiceProvider,public loadingCtrl:LoadingProvider,public commonconstant:ConstantsProvider) {
+  pinReset: any = false;
+  constructor(public navCtrl: NavController,public Menu:MenuController,public fb:FormBuilder,public shared:CognitoServiceProvider,public toast:ToastProvider,private faio:FingerprintAIO,public aws:AwsServiceProvider,public loadingCtrl:LoadingProvider,public commonconstant:ConstantsProvider,
+    private actRoute:ActivatedRoute, private router:Router) {
     this.commonImage = this.commonconstant.commonimage;
     this.shared.refresh();
     this.getuserDetails();
     
-
+    this.actRoute.queryParams.subscribe(()=>{
+      if(this.router.getCurrentNavigation().extras.state) {
+        this.pinReset = this.router.getCurrentNavigation().extras.state.pinreset
+      }
+    })
    
   }
 
@@ -60,7 +67,10 @@ pin:any;
         this.userDetails  = this.userDetails.records;
         if(this.userDetails[0].role_name =="PD Executive" || this.userDetails[0].role_name == "PD Officer"){
           //localStorage.setItem('userDetails',JSON.stringify(this.userDetails[0]));
-        if(this.userDetails[0].mpin ==null)
+          if(this.pinReset) {
+            this.mpinaccess = true
+          }
+          else if(this.userDetails[0].mpin ==null)
         {
          
           this.mpinaccess = true;
@@ -84,7 +94,13 @@ pin:any;
     });
   }
   resetPin() {
-    this.mpinaccess = true
+    // this.mpinaccess = true
+    let navigationExtras:NavigationExtras = {
+      state:{
+        pinreset:true
+      }
+    }
+    this.navCtrl.navigateRoot('/authentication/login',navigationExtras); 
   }
   setnewpin(newpin,confirmPin)
   {

src/app/pages/authentication/login/login.page.ts

@@ -10,7 +10,7 @@ import { PdtriggerProvider } from 'src/app/services/pdtrigger/pdtrigger';
 import { ConstantsProvider } from 'src/app/services/constants/constants';
 import { Market } from '@ionic-native/market/ngx';
 import { AppVersion } from '@ionic-native/app-version/ngx';
-import { NavigationExtras } from '@angular/router';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { EventsService } from 'src/app/services/common-provider/events/events.service';
 
 @Component({
@@ -43,12 +43,19 @@ export class LoginPage implements OnInit {
     curr_environmnet: any;
     app_version: string;
   spinner_access: boolean;
+  pinReset: boolean=false;
   constructor( public aws: AwsServiceProvider, public dialog: MatDialog,
   public shared:CognitoServiceProvider,public navCtrl:NavController,public Menu:MenuController
   ,public toast:ToastProvider,private push:Push,private pdtrigger:PdtriggerProvider,private eventsService:EventsService,
-  private constantProvider:ConstantsProvider,private platform:Platform, private marketOpener:Market
+  private constantProvider:ConstantsProvider,private router:Router, private marketOpener:Market
-  ,private appVersion:AppVersion) {
+  ,private appVersion:AppVersion, private actRoute:ActivatedRoute) {
     this.curr_environmnet=this.constantProvider.environment()
+    this.actRoute.queryParams.subscribe(()=>{
+      console.log(this.router.getCurrentNavigation().extras.state)
+      if(this.router.getCurrentNavigation().extras.state) {
+        this.pinReset = this.router.getCurrentNavigation().extras.state.pinreset
+      }
+    })
   }
   ngOnInit(){
     //this.loggedInCheck();
@@ -93,7 +100,17 @@ export class LoginPage implements OnInit {
           this.notification()
           this.checkAppVersion()
           this.spinner_access=false
-        this.navCtrl.navigateRoot('/pd/pd-list');
+          let route_decision = '/pd/pd-list'
+          let NavigationExtras:NavigationExtras={}
+          if(this.pinReset) {
+            route_decision = '/authentication/AuthPage'
+            NavigationExtras = {
+              state:{
+                pinreset:this.pinReset
+              }
+            }
+          }
+        this.navCtrl.navigateRoot(route_decision,NavigationExtras);
               
         }else
         {