From c72679738c471fb3d9d4f71ea3ee3da959af25dc Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Sat, 16 Sep 2023 23:12:24 -0400
Subject: [PATCH] debus scan code

---
 src/app/pages/login/login.page.html       | 29 ++++++++++++++++++-----
 src/app/pages/login/login.page.ts         |  3 +++
 src/app/pages/startscan/startscan.page.ts |  7 ++++--
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html
index 6745724..30d48e7 100644
--- a/src/app/pages/login/login.page.html
+++ b/src/app/pages/login/login.page.html
@@ -11,18 +11,35 @@
         <div class="boxed_contents">
             <ion-grid>
                 <ion-row>
-                    <ion-col>
-                        <!--            <ion-button expand="block" fill="outline" >Login</ion-button>-->
+                    <ion-col size="6">
+                        <ion-button fill="outline" size="large" (click)="moveToStartScan()">
+                            <ion-icon slot="start" name="scan"></ion-icon>
+                            Scan Login</ion-button>
                     </ion-col>
-                    <ion-col class="family_box">
-                        <ion-button expand="block" class="login-type"  (click)="familyLogin()">
+                    <ion-col size="6">
+                        <ion-button  class="login-type"  (click)="familyLogin()">
                             <ion-icon name="people-circle-outline"></ion-icon>
-                            Go to Family Account</ion-button>
+                           Family Login</ion-button>
                     </ion-col>
-
                 </ion-row>
             </ion-grid>
 
+<!--            <ion-grid>-->
+<!--                <ion-row>-->
+<!--                    <ion-col>-->
+<!--                        <ion-button fill="outline" size="large" (click)="moveToStartScan()">-->
+<!--                            <ion-icon slot="start" name="scan"></ion-icon>-->
+<!--                            Scan Login</ion-button>-->
+<!--                    </ion-col>-->
+<!--                    <ion-col class="family_box">-->
+<!--                        <ion-button expand="block" class="login-type"  (click)="familyLogin()">-->
+<!--                            <ion-icon name="people-circle-outline"></ion-icon>-->
+<!--                            Go to Family Login</ion-button>-->
+<!--                    </ion-col>-->
+
+<!--                </ion-row>-->
+<!--            </ion-grid>-->
+
             <ion-label class="simp_lbl_tx">Login to continue</ion-label>
             <ion-item lines="none">
                 <ion-icon slot="start" name="mail-outline"></ion-icon>
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 0d43f18..d6e5e7a 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -105,6 +105,9 @@ getBlogData(){
     this.router.navigate(['register']);
   }
 
+  moveToStartScan(){
+    this.router.navigate(['startscan']);
+  }
   onLoginApple() {
 
     // -> 'web', 'ios' or 'android'
diff --git a/src/app/pages/startscan/startscan.page.ts b/src/app/pages/startscan/startscan.page.ts
index a960d4e..b768df2 100644
--- a/src/app/pages/startscan/startscan.page.ts
+++ b/src/app/pages/startscan/startscan.page.ts
@@ -52,10 +52,13 @@ export class StartscanPage implements OnInit {
   //  alert(1000);
     this.wrenchService.qrLoginUser(this.loginQrData).subscribe(
         loginResult => {
-        //  alert("Here 00009");
+          alert("Here 00009");
           this.loginResult = loginResult;
           console.log("INTERNAL RETURN->" + this.loginResult.internal_return);
-          if (loginResult != null && loginResult.internal_return == 100 && this.sessionDataProviderService.ConstructGlobalSessionData(this.loginResult) == true) {
+          if (loginResult != null
+              && loginResult.internal_return == 100
+              && this.sessionDataProviderService.ConstructGlobalSessionData(this.loginResult) == true) {
+            alert("Here 00009a");
            // this.getBlogData();
             this.router.navigate(['tabs/tab1']);
           }