preferences

src/app/pages/preferences/preferences.page.ts

@@ -11,17 +11,24 @@ import {SessionDataProviderService} from "../../store/session-data-provider.serv
 export class PreferencesPage implements OnInit {
 
     user_pref_value:string="Olu";
+    signupState:any;
+    signupPath: number = 0;
+
 
   constructor(
       private navctr: NavController,
       private router: Router,
       private wrenchService: WrenchService,
       public sessionDataProviderService:SessionDataProviderService) {
+      this.signupState = this.router.getCurrentNavigation().extras.state;
+      if (this.signupState != undefined){
+          this.signupPath =  this.signupState.signupState;
+      }
 
   }
 
   ngOnInit() {
-debugger;
+//debugger;
       if (this.sessionDataProviderService.account_pref == 'GENERAL'){
           this.user_pref_value =  "PREF04";
       }
@@ -31,7 +38,12 @@ debugger;
       this.getPreferenceData();
   }
   onBack() {
-    this.navctr.back();
+      if (this.signupPath ==  100){
+          this.router.navigate(['tabs/tab1']);
+      }
+      else{
+          this.navctr.back();
+      }
   }
 
     reqData: {

src/app/pages/register/register.page.ts

@@ -225,7 +225,16 @@ export class RegisterPage implements OnInit {
           if (signUpResult != null
               && signUpResult.internal_return == 100
               && this.sessionDataProviderService.ConstructGlobalSessionData(this.signUpResult) == true) {
-              this.router.navigate(['tabs/tab1']);
+              var navigateItem = { signupState: 100 };
+              this.router.navigate(['preferences'], { state: navigateItem });
+           //   this.router.navigate(['tabs/tab1']);
+
+            /*
+                 ,
+            familyPendingData: this.familyPendingData,
+            itemData: item };
+        this.router.navigate(['familymember'], { state: navigateItem });
+             */
           }
           else{
             this.signup_state  =2; // maintain this