fixed digital ID issues

ZohaibIqbalKambrani
enadhilal 5 years ago
parent c0d4ab610d
commit c66905865e

@ -57,6 +57,16 @@
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-item (click)="openDigitalId()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/ID_ico.png" item-left>
</ion-thumbnail>
<ion-label class="changepassword" >
{{ts.trPK('general','digital-id')}}
<ion-badge class="start-badge main-badge" slot="end" color="danger">{{notBadge}}</ion-badge>
</ion-label>
</ion-item>
</ion-list> </ion-list>
<div class="" style="text-align:center"> <div class="" style="text-align:center">
@ -128,6 +138,16 @@
</button> --> </button> -->
</ion-item> </ion-item>
<ion-item (click)="openDigitalId()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/ID_ico.png" item-left>
</ion-thumbnail>
<ion-label class="changepassword" >
{{ts.trPK('general','digital-id')}}
<ion-badge class="start-badge main-badge" slot="end" color="danger">{{notBadge}}</ion-badge>
</ion-label>
</ion-item>
<!-- <ion-item (click)="profile()"> <!-- <ion-item (click)="profile()">
<ion-thumbnail slot="start" class="menu-thumb"> <ion-thumbnail slot="start" class="menu-thumb">

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Platform, Events, MenuController } from '@ionic/angular'; import { Platform, Events, MenuController, ModalController } from '@ionic/angular';
import { TranslatorService } from './hmg-common/services/translator/translator.service'; import { TranslatorService } from './hmg-common/services/translator/translator.service';
import { CommonService } from './hmg-common/services/common/common.service'; import { CommonService } from './hmg-common/services/common/common.service';
import { AuthenticationService } from './hmg-common/services/authentication/authentication.service'; import { AuthenticationService } from './hmg-common/services/authentication/authentication.service';
@ -10,6 +10,7 @@ import { LazyLoadingService } from './hmg-common/services/lazy-loading/lazy-load
import { DomSanitizer } from '@angular/platform-browser'; import { DomSanitizer } from '@angular/platform-browser';
import { SplashScreen } from '@ionic-native/splash-screen/ngx'; import { SplashScreen } from '@ionic-native/splash-screen/ngx';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { DigitalIdComponent } from './authentication/digital-id/digital-id.component';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
@ -37,6 +38,8 @@ export class AppComponent implements OnInit {
DeviceToken: string; // this.deviceToken DeviceToken: string; // this.deviceToken
}; };
private digitalIDUser: any;
constructor( constructor(
public ts: TranslatorService, public ts: TranslatorService,
private cs: CommonService, private cs: CommonService,
@ -50,6 +53,7 @@ export class AppComponent implements OnInit {
public pushService: PushService, public pushService: PushService,
private splashScreen: SplashScreen, private splashScreen: SplashScreen,
public router: Router, public router: Router,
public modalController: ModalController
) { ) {
this.events.subscribe('img-change', displayImg => { this.events.subscribe('img-change', displayImg => {
console.log('app compont: ' + displayImg); console.log('app compont: ' + displayImg);
@ -116,8 +120,7 @@ export class AppComponent implements OnInit {
this.events.subscribe('setMenu', () => { this.events.subscribe('setMenu', () => {
const user = this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { const user = this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => {
if (user) { if (user) {
const digitalIDUser: any = JSON.stringify(user); this.digitalIDUser = user//JSON.stringify(user);
localStorage.setItem('digitalIDUser', digitalIDUser);
this.companyUrl = user.CompanyImageURL ? user.CompanyImageURL : '../assets/imgs/CSLogo.png'; this.companyUrl = user.CompanyImageURL ? user.CompanyImageURL : '../assets/imgs/CSLogo.png';
this.companyDesc = user.CompanyImageDescription ? user.CompanyImageDescription : 'Powered By Cloud Solutions'; this.companyDesc = user.CompanyImageDescription ? user.CompanyImageDescription : 'Powered By Cloud Solutions';
this.User_name_Emp = user.EMPLOYEE_DISPLAY_NAME; this.User_name_Emp = user.EMPLOYEE_DISPLAY_NAME;
@ -188,6 +191,17 @@ export class AppComponent implements OnInit {
this.menu.toggle(); this.menu.toggle();
} }
async openDigitalId() {
const modal = await this.modalController.create({
component: DigitalIdComponent,
cssClass: 'digital-id-modal-css',
componentProps: {
'userInfo':this.digitalIDUser//JSON.parse(this.digitalIDUser)
}
});
return await modal.present();
}
private changeImage() { private changeImage() {
this.cs.openChangeImagePage(); this.cs.openChangeImagePage();
this.menu.toggle(); this.menu.toggle();

@ -18,10 +18,11 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx';
import { NgCalendarModule } from 'ionic2-calendar'; import { NgCalendarModule } from 'ionic2-calendar';
import { NFC, Ndef} from "@ionic-native/nfc/ngx" import { NFC, Ndef} from "@ionic-native/nfc/ngx"
import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx"; import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx";
import { DigitalIdComponent } from './authentication/digital-id/digital-id.component';
@NgModule({ @NgModule({
declarations: [AppComponent], declarations: [AppComponent, DigitalIdComponent],
entryComponents: [], entryComponents: [DigitalIdComponent],
imports: [ imports: [
BrowserModule, BrowserModule,
BrowserAnimationsModule, BrowserAnimationsModule,

@ -22,7 +22,6 @@ import { CheckUserComponent } from './check-user/check-user.component';
import { ChangePasswordComponent } from './change-password/change-password.component'; import { ChangePasswordComponent } from './change-password/change-password.component';
import {ConfirmLoginComponent} from '../authentication/confirm-login/confirm-login.component' import {ConfirmLoginComponent} from '../authentication/confirm-login/confirm-login.component'
import {WelcomeComponent} from '../authentication/welcome/welcome.component' import {WelcomeComponent} from '../authentication/welcome/welcome.component'
import { DigitalIdComponent } from './digital-id/digital-id.component';
const routes: Routes = [ const routes: Routes = [
{ {
@ -84,13 +83,12 @@ const routes: Routes = [
ChangePasswordComponent, ChangePasswordComponent,
// ConfirmLoginComponent, // ConfirmLoginComponent,
WelcomeComponent, WelcomeComponent,
DigitalIdComponent
], ],
providers:[ providers:[
FingerprintAIO, FingerprintAIO,
Device, Device,
SplashScreen SplashScreen
], ],
entryComponents:[DigitalIdComponent] entryComponents:[]
}) })
export class AuthenticationPageModule { } export class AuthenticationPageModule { }

@ -66,9 +66,9 @@
</ion-grid> </ion-grid>
<ion-button *ngIf="userInfo" class="button-digital-id" (click)="openDigitalId()"> <!-- <ion-button *ngIf="userInfo" class="button-digital-id" (click)="openDigitalId()">
<p style="color: black;">{{ts.trPK('general','digital-id')}}</p> <p style="color: black;">{{ts.trPK('general','digital-id')}}</p>
<img [ngClass]=" direction === 'en' ? 'digital-id-en' : 'digital-id-ar'" src="../assets/imgs/ID_ico.png"> <img [ngClass]=" direction === 'en' ? 'digital-id-en' : 'digital-id-ar'" src="../assets/imgs/ID_ico.png">
</ion-button> </ion-button> -->
</ion-content> </ion-content>

@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit, Input} from '@angular/core';
import { ModalController } from '@ionic/angular'; import { ModalController } from '@ionic/angular';
import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
@ -8,7 +8,7 @@ import { TranslatorService } from 'src/app/hmg-common/services/translator/transl
styleUrls: ['./digital-id.component.scss'], styleUrls: ['./digital-id.component.scss'],
}) })
export class DigitalIdComponent implements OnInit { export class DigitalIdComponent implements OnInit {
userInfo: any; @Input() userInfo: any;
constructor( constructor(
public modalCtrl: ModalController, public modalCtrl: ModalController,
@ -16,7 +16,6 @@ export class DigitalIdComponent implements OnInit {
) { } ) { }
ngOnInit() { ngOnInit() {
this.userInfo = JSON.parse(localStorage.getItem('digitalIDUser'));
console.log(this.userInfo); console.log(this.userInfo);
} }

@ -96,7 +96,7 @@
border-radius: 10px; border-radius: 10px;
margin-bottom: -49px; margin-bottom: -49px;
margin-left: 20px; margin-left: 20px;
margin-right: 25px; margin-right: 20px;
} }
.columns{ .columns{

Loading…
Cancel
Save