fix conflict

Mohem/src/app/authentication/confirm-login/confirm-login.component.html

@@ -30,15 +30,11 @@
           <p class="text1" style="font-size: 28px;margin-bottom: 0px" >{{empname}}</p>
          -->
       </ion-col>
-    </ion-row>   <div *ngIf="onlySMSBox"><p>{{ts.trPK('login','verify-login-with')}}</p></div>
-          <!-- <type-writer *ngIf="!onlySMSBox" [text]="'login, verify-fingerprint' | translate" class="description"
-            color="primary" fontSize="0.55cm" lineHeight="1cm" fontSize="0.55cm"></type-writer>
-   -->
-  
+    </ion-row>   
+    <div *ngIf="onlySMSBox"><p>{{ts.trPK('login','verify-login-with')}}</p></div>
    <div *ngIf="!onlySMSBox && FFloginType == 2"><p>{{ts.trPK('login','verify-fingerprint')}}</p></div>
    <div *ngIf="!onlySMSBox && FFloginType == 3"><p>{{ts.trPK('login','verify-faceId')}}</p></div>
 
-
         </ion-col>
       </ion-row> 
   

Mohem/src/app/authentication/login/login.component.ts

@@ -92,10 +92,26 @@ export class LoginComponent implements OnInit, OnDestroy {
     requestGetLoginInfo: any;
     logoutFlage: boolean ;
     getuser: any = '';
+    getlastlogin: any;
 
     private checkUserResult: CheckUserAuthenticationResponse;
 
+    ionViewWillEnter(){
+
+        console.log("ionViewWillEnter");
+    }
+
+
     ngOnInit() {
+
+        // if(!this.cs.getIsTimeSessionOut()){
+           
+        //     this.getlastlogin = this.cs.sharedService.getSharedData(
+        //         AuthenticationService.IMEI_USER_DATA,
+        //         false
+        //       );
+        //        console.log("this.getlastlogin"+ this.getlastlogin);
+        // }
         this.currentLang = TranslatorService.getCurrentLanguageCode();
         console.log(TranslatorService.CURRENT_LANGUAGE)
         console.log(TranslatorService.EN)
@@ -127,8 +143,14 @@ export class LoginComponent implements OnInit, OnDestroy {
           this.user = user;
         });
 
-        this.deviceToken =  localStorage.getItem('devicyeToken');
-        this.deviceToken1 =this.cs.getDeviceToken();
+        //this.deviceToken =  localStorage.getItem('devicyeToken');
+        //this.deviceToken1 =this.cs.getDeviceToken();
+        
+          console.log(" this.user login in init" +  this.user);
+        //this.deviceToken =  localStorage.getItem('devicyeToken');
+        this.deviceToken =this.cs.getDeviceToken();
+
+
         console.log('lngOnInit localStorage: ' + this.deviceToken1);
         console.log('lngOnInit getDeviceToken: ' + this.deviceToken);
 
@@ -382,7 +404,7 @@ export class LoginComponent implements OnInit, OnDestroy {
       getLastLoginInfo() {
         this.requestGetLoginInfo = {
             DeviceType: this.cs.getDeviceType(), // "Android",//this.cs.getDeviceType(),
-            DeviceToken: this.deviceToken// "5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36"//this.deviceToken
+            DeviceToken: this.cs.getDeviceToken()// "5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36"//this.deviceToken
         };
         this.authService.getLoginInfo(this.requestGetLoginInfo, () => {}, this.ts.trPK('general', 'ok')).subscribe(res => {
           if (this.cs.validResponse(res)) {

Mohem/src/app/authentication/sms-page/sms-page.page.html

@@ -19,14 +19,15 @@
           <p class="headerTxt"  > {{'verificationcode,verificationcode' | translate}}</p>
         <br/>
         <p class="leftDiv">{{'verificationcode,title' | translate}}
-          <span class="boldTxtNav">{{'verificationcode,verificationcode' | translate}}</span>
-           {{'verificationcode,by' | translate}}
-           <span *ngIf="loginType == 1" class="boldTxtNav">{{'verificationcode,sms' | translate}}</span>
-           <span  *ngIf="loginType == 4" class="boldTxtNav">whatsapp</span>
-
-           {{'verificationcode,instruct' | translate}}
-           <span class="boldTxtNav">{{'general,submit' | translate}}</span
-            ></p>
+            <span class="boldTxtNav">{{'verificationcode,verificationcode' | translate}}</span>
+             {{'verificationcode,by' | translate}}
+             <span *ngIf="loginType == 1" class="boldTxtNav">{{'verificationcode , sms' | translate}}</span>
+             <span  *ngIf="loginType == 4" class="boldTxtNav">{{'verificationcode , whatsapp' | translate}}</span>
+  
+             {{'verificationcode,instruct' | translate}}
+             <span class="boldTxtNav">{{'general,submit' | translate}}</span
+              ></p>
+        <!-- <p class="leftDiv">{{'verificationcode,title' | translate}}<span class="boldTxtNav">{{'verificationcode,verificationcode' | translate}}</span> {{'verificationcode,by' | translate}}<span class="boldTxtNav">{{'verificationcode,sms' | translate}}</span>{{'verificationcode,instruct' | translate}}<span class="boldTxtNav">{{'general,submit' | translate}}</span></p> -->
       </ion-col>
     </ion-row>
   </ion-grid>

Mohem/src/app/authentication/sms-page/sms-page.page.ts

@@ -139,8 +139,9 @@ export class SmsPageComponent implements OnInit {
        console.log("deviceToken :"+this.deviceToken);
 
        this.loginTypeData= this.common.sharedService.getSharedData(SMSCheckRequest.SHARED_DATA, false);
+       this.loginType=this.loginTypeData.loginType;
 
-      // console.log("loginType :"+this.loginTypeData.loginType);
+     console.log("loginType :"+this.loginTypeData.loginType);
 
 
 
@@ -419,7 +420,7 @@ export class SmsPageComponent implements OnInit {
 
         
 
-console.log("successful insertMobileLogin" );
+
 
       });
 

Mohem/src/app/eit/add-eit/add-eit.component.html

@@ -1,6 +1,6 @@
 <!-- <ion-header>
   <ion-toolbar class="header-toolbar-new">
-      <ion-buttons slot="start">
+      <ion-buttons *ngIf="getPassdirfromNotifiPage != true" slot="start">
         <nav-buttons backLink=""></nav-buttons>
         </ion-buttons>
     <ion-title color="light">{{headerTitle}}</ion-title>
@@ -12,13 +12,21 @@
     </ion-buttons>
 
   </ion-toolbar>
-</ion-header> -->
+</ion-header>
+
+-->
+
+<!-- <app-generic-header
+  showBack="!getPassdirfromNotifiPage"
+  [updateDirection]="getPassdirfromNotifiPage" 
+  [headerText]="headerTitle"
+  (trigger)="closemodal()">
+</app-generic-header> -->
 
 <app-generic-header
   showBack="true"
   [headerText]="headerTitle">
-</app-generic-header>
-
+</app-generic-header> 
 
 <ion-content padding>
   <div #containerDiv id="containerDiv">

Mohem/src/app/hmg-common/services/push/push.service.ts

@@ -168,11 +168,12 @@ export class PushService {
             localStorage.setItem('deviceToken', data);
 
         }
-        if (this.authService.isAuthenticated()) {
-            this.registerAuthenticatedUser(data);
-        } else {
-            this.registerNotAuthenticatedUser(data);
-        }
+        //
+        // if (this.authService.isAuthenticated()) {
+        //     this.registerAuthenticatedUser(data);
+        // } else {
+        //     this.registerNotAuthenticatedUser(data);
+        // }
     }
 
 

Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html

@@ -12,6 +12,24 @@
             <img [src]="userImage"/>
           </div>
         </ion-col>
+
+          <!-- *ngIf="getPassdirfromNotifiPage == true" -->
+          <ion-col *ngIf="updateDirection"  [size]="2" style="padding: 0;" (click)="closeModal()">
+              <div class="profile-image-container">
+                  <img style="
+                  width: 20px;
+                  height: 20px;
+                  margin-top: 5px;"
+                  [src]="close"
+              />
+                </div>
+          <!-- <ion-buttons   slot="primary" >
+              <ion-button style="background: red !important;">
+                <ion-icon slot="icon-only" name="close"></ion-icon>
+              </ion-button>
+            </ion-buttons> -->
+            </ion-col>
+
     </ion-row>
   </ion-toolbar>
 </ion-header>

Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 import { CommonService } from '../../services/common/common.service';
 
 @Component({
@@ -12,16 +12,35 @@ export class GenericHeaderComponent implements OnInit {
   @Input() showMenu = false;
   @Input() showBack = false;
   @Input() navigate = true;
+  @Input() showClose = false;
+  @Input() updateDirection = false;
   @Input() headerText = '';
   @Input() backLink: string;
+  @Output() trigger= new EventEmitter();
 
-
+  public close = 'assets/imgs/cancel.png';
   constructor(public common: CommonService) { }
 
-  ngOnInit() {}
+  ngOnInit() {
+
+    console.log(this.updateDirection);
+    console.log(this.showClose);
+    console.log(this.showBack);
+      if(this.updateDirection){
+        this.showBack=false;
+      }else{
+        
+      }
+
+  }
 
   openProfilePage() {
     this.common.openEditProfile();
   }
 
+  closeModal(){
+    console.log("closeModal");
+  this.trigger.emit();
+  }
+
 }

Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html

@@ -1,6 +1,9 @@
 <ion-header *ngIf="!messageSuccess">
   <ion-toolbar >
-    <ion-title color="dark">{{ 'workListMain, rfc' | translate}}</ion-title>
+    <ion-title color="dark">
+      {{ts.trPK('worklistMain','rfc')}}
+    
+    </ion-title>
 
   </ion-toolbar>
 </ion-header>