diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index 028fef98..641da196 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -116,6 +116,8 @@ export class AppComponent implements OnInit { this.events.subscribe('setMenu', () => { const user = this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { if (user) { + const digitalIDUser: any = JSON.stringify(user); + localStorage.setItem('digitalIDUser', digitalIDUser); this.companyUrl = user.CompanyImageURL ? user.CompanyImageURL : '../assets/imgs/CSLogo.png'; this.companyDesc = user.CompanyImageDescription ? user.CompanyImageDescription : 'Powered By Cloud Solutions'; this.User_name_Emp = user.EMPLOYEE_DISPLAY_NAME; diff --git a/Mohem/src/app/authentication/authentication.module.ts b/Mohem/src/app/authentication/authentication.module.ts index 8dde550b..e2b085e2 100644 --- a/Mohem/src/app/authentication/authentication.module.ts +++ b/Mohem/src/app/authentication/authentication.module.ts @@ -22,6 +22,7 @@ import { CheckUserComponent } from './check-user/check-user.component'; import { ChangePasswordComponent } from './change-password/change-password.component'; import {ConfirmLoginComponent} from '../authentication/confirm-login/confirm-login.component' import {WelcomeComponent} from '../authentication/welcome/welcome.component' +import { DigitalIdComponent } from './digital-id/digital-id.component'; const routes: Routes = [ { @@ -82,12 +83,14 @@ const routes: Routes = [ CheckUserComponent, ChangePasswordComponent, // ConfirmLoginComponent, - WelcomeComponent + WelcomeComponent, + DigitalIdComponent ], providers:[ FingerprintAIO, Device, SplashScreen - ] + ], + entryComponents:[DigitalIdComponent] }) export class AuthenticationPageModule { } diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html index 95971d3d..f5f29a47 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html @@ -66,4 +66,9 @@ + +

{{ts.trPK('general','digital-id')}}

+ +
+ diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss b/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss index eb5390a3..ad2206df 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss @@ -7,4 +7,31 @@ } +.button-digital-id{ + --background: white !important; + background: white !important; + white-space: normal; + color: white; + text-transform: capitalize; + min-height: 1.0cm; + --border-radius: 33px !important; + border-radius: 33px !important; + --min-height: 1.6cm !important; + width: 315px; + border: 1px solid black; +} + + +.digital-id-en{ + color: black; + position: absolute; + right: 20px; + width: 10%; + } + .digital-id-ar{ + color: black; + position: absolute; + left: 20px; + width: 10%; + } \ No newline at end of file diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts index 065e2fb1..8c6d5924 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -12,12 +12,13 @@ import { GetLoginInfoResponse } from '../../hmg-common/services/authentication/m import { SMSCheckRequest } from 'src/app/hmg-common/services/authentication/models/smscheck.request'; import { SMSCheckResponse } from 'src/app/hmg-common/services/authentication/models/smscheck.response'; import { PushService } from 'src/app/hmg-common/services/push/push.service'; -import { Platform } from '@ionic/angular'; +import { ModalController, Platform } from '@ionic/angular'; import { CheckUserAuthenticationResponse } from 'src/app/hmg-common/services/authentication/models/check-user-auth.response'; import { LoginModel } from '../models/LoginModel'; import * as moment from 'moment'; import { CheckAppVersionResponse } from 'src/app/hmg-common/services/authentication/models/check-app-version.response'; import { NFC } from "@ionic-native/nfc/ngx"; +import { DigitalIdComponent } from '../digital-id/digital-id.component'; @Component({ selector: 'app-confirm-login', @@ -49,6 +50,8 @@ export class ConfirmLoginComponent implements OnInit { private iosLink: string; private androidLink: string; public isNFCAvailable = false; + direction:string; + userInfo: any; constructor( public ts: TranslatorService, @@ -58,6 +61,7 @@ export class ConfirmLoginComponent implements OnInit { private faio: FingerprintAIO, public pushService: PushService, public platform: Platform, + public modalController: ModalController, private nfc: NFC ) { this.loginData = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); @@ -75,6 +79,8 @@ export class ConfirmLoginComponent implements OnInit { } ngOnInit() { + this.direction = TranslatorService.getCurrentLanguageName(); + this.userInfo = JSON.parse(localStorage.getItem('digitalIDUser')); this.checkNFCStatus(); // **checkIfAvailable FAIO **// this.checkIfAvailable(); @@ -474,4 +480,12 @@ checkAccess(el: any) { } } +async openDigitalId() { + const modal = await this.modalController.create({ + component: DigitalIdComponent, + cssClass: 'digital-id-modal-css' + }); + return await modal.present(); +} + }​ diff --git a/Mohem/src/app/authentication/digital-id/digital-id.component.html b/Mohem/src/app/authentication/digital-id/digital-id.component.html new file mode 100644 index 00000000..6b133b8f --- /dev/null +++ b/Mohem/src/app/authentication/digital-id/digital-id.component.html @@ -0,0 +1,33 @@ + + + + + + + + + +

{{userInfo.ASSIGNMENT_NUMBER}}

+
+
+ + +

{{userInfo.EMPLOYEE_DISPLAY_NAME}}

+

{{userInfo.JOB_NAME}}

+
+
+ + + + + +
+ +
+ + + +
+ +
+
\ No newline at end of file diff --git a/Mohem/src/app/authentication/digital-id/digital-id.component.scss b/Mohem/src/app/authentication/digital-id/digital-id.component.scss new file mode 100644 index 00000000..e43b4628 --- /dev/null +++ b/Mohem/src/app/authentication/digital-id/digital-id.component.scss @@ -0,0 +1,13 @@ +.button-login{ + --background: #c1272d !important; + background: #c1272d !important; + white-space: normal; + color: var(--light); + text-transform: capitalize; + min-height: 1.0cm; + --border-radius: 33px !important; + border-radius: 33px !important; + --min-height: 1.6cm !important; + width: 315px; +} + diff --git a/Mohem/src/app/authentication/digital-id/digital-id.component.spec.ts b/Mohem/src/app/authentication/digital-id/digital-id.component.spec.ts new file mode 100644 index 00000000..9884cc27 --- /dev/null +++ b/Mohem/src/app/authentication/digital-id/digital-id.component.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DigitalIdComponent } from './digital-id.component'; + +describe('DigitalIdComponent', () => { + let component: DigitalIdComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ DigitalIdComponent ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DigitalIdComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Mohem/src/app/authentication/digital-id/digital-id.component.ts b/Mohem/src/app/authentication/digital-id/digital-id.component.ts new file mode 100644 index 00000000..d3768dee --- /dev/null +++ b/Mohem/src/app/authentication/digital-id/digital-id.component.ts @@ -0,0 +1,30 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; + +@Component({ + selector: 'app-digital-id', + templateUrl: './digital-id.component.html', + styleUrls: ['./digital-id.component.scss'], +}) +export class DigitalIdComponent implements OnInit { + userInfo: any; + + constructor( + public modalCtrl: ModalController, + public ts: TranslatorService, + ) { } + + ngOnInit() { + this.userInfo = JSON.parse(localStorage.getItem('digitalIDUser')); + console.log(this.userInfo); + } + + + dismiss() { + this.modalCtrl.dismiss({ + 'dismissed': true + }); + } + +} diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index 94cf254d..638b6265 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -26,9 +26,6 @@ -
@@ -40,6 +37,8 @@
+ + @@ -47,6 +46,17 @@
+ + + + +

+
diff --git a/Mohem/src/app/authentication/login/login.component.scss b/Mohem/src/app/authentication/login/login.component.scss index 080bb5d5..81d65d6c 100644 --- a/Mohem/src/app/authentication/login/login.component.scss +++ b/Mohem/src/app/authentication/login/login.component.scss @@ -141,6 +141,22 @@ img.centerDiv { --min-height: 1.6cm !important; width: 315px; } + +.button-digital-id{ + --background: white !important; + background: white !important; + white-space: normal; + color: white; + text-transform: capitalize; + min-height: 1.0cm; + --border-radius: 33px !important; + border-radius: 33px !important; + --min-height: 1.6cm !important; + width: 315px; + border: 1px solid black; +} + + .content { width: 500px; margin-left: auto; @@ -227,4 +243,19 @@ img.centerDiv { display:inline-block; margin-top:20px; margin-right: 15%; + } + + + .digital-id-en{ + color: black; + position: absolute; + right: 20px; + width: 10%; + } + + .digital-id-ar{ + color: black; + position: absolute; + left: 20px; + width: 10%; } \ No newline at end of file diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index 88a625f5..447b9d2b 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -18,6 +18,8 @@ import { CheckAppVersionResponse } from 'src/app/hmg-common/services/authenticat import { PushService } from 'src/app/hmg-common/services/push/push.service'; import { KeyboardService } from 'src/app/hmg-common/services/keyboard/keyboard.service'; import { KeyboardStatusModel } from 'src/app/hmg-common/services/keyboard/keyboard-status.model'; +import { ModalController } from '@ionic/angular'; +import { DigitalIdComponent } from '../digital-id/digital-id.component'; @Component({ selector: 'login', @@ -26,6 +28,7 @@ import { KeyboardStatusModel } from 'src/app/hmg-common/services/keyboard/keyboa }) export class LoginComponent implements OnInit, OnDestroy { deviceToken1: any; + userInfo: any; constructor( public cs: CommonService, @@ -42,21 +45,22 @@ export class LoginComponent implements OnInit, OnDestroy { public sharedData: SharedDataService, public plt: Platform, public pushService: PushService, - public keyboardService: KeyboardService + public keyboardService: KeyboardService, + public modalController: ModalController ) { this.events.subscribe('logoutFlage', logoutFlage => { console.log('login compont logoutFlage: ' + logoutFlage); // tslint:disable-next-line: triple-equals if (logoutFlage == true) { - console.log(' subscribe check logoutFlage: ' + logoutFlage); - this.logoutFlage = logoutFlage; - localStorage.setItem('logoutFlage', logoutFlage); + console.log(' subscribe check logoutFlage: ' + logoutFlage); + this.logoutFlage = logoutFlage; + localStorage.setItem('logoutFlage', logoutFlage); } }); this.getuser = this.cs.sharedService.getSharedData( AuthenticationService.IMEI_USER_DATA, false - ); + ); if (this.getuser) { this.user = true; @@ -91,7 +95,7 @@ export class LoginComponent implements OnInit, OnDestroy { user = false; DeviceType: string; requestGetLoginInfo: any; - logoutFlage: boolean ; + logoutFlage: boolean; getuser: any = ''; getlastlogin: any; public keyboardOpened = false; @@ -99,6 +103,7 @@ export class LoginComponent implements OnInit, OnDestroy { ngOnInit() { this.monitorKeyboardChange(); + this.userInfo = JSON.parse(localStorage.getItem('digitalIDUser')); this.currentLang = TranslatorService.getCurrentLanguageCode(); if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { @@ -113,19 +118,19 @@ export class LoginComponent implements OnInit, OnDestroy { this.deviceToken = this.cs.getDeviceToken(); if (this.deviceToken) { console.log('login enabled first time: ' + this.deviceToken); - } else { - console.log('no deviceToken' ); - this.pushService.startReceiving(); - } + } else { + console.log('no deviceToken'); + this.pushService.startReceiving(); + } // here will delete below part and depdding on user (response from getMobileInfo) this.username = localStorage.getItem('user'); this.password = localStorage.getItem('password'); // ****// const remember = localStorage.getItem('remember'); // ****// - this.empname = localStorage.getItem('emp-name'); + this.empname = localStorage.getItem('emp-name'); this.logintype = localStorage.getItem('login-type'); // tslint:disable-next-line: triple-equals - if (remember == 'true') { this.remeberMe = true ; } else { this.remeberMe = false; } + if (remember == 'true') { this.remeberMe = true; } else { this.remeberMe = false; } } ngOnDestroy(): void { @@ -133,9 +138,9 @@ export class LoginComponent implements OnInit, OnDestroy { } public changeLanguage(langNumber) { - console.log("current lang: "+this.currentLang) - console.log("click lang: "+langNumber) - if(this.currentLang == langNumber){ + console.log("current lang: " + this.currentLang) + console.log("click lang: " + langNumber) + if (this.currentLang == langNumber) { this.currentLang = langNumber; return; } else { @@ -167,9 +172,9 @@ export class LoginComponent implements OnInit, OnDestroy { this.remeberMyInfo(); } public remeberMyInfo() { - if (this.username) {localStorage.setItem('user', this.username); } - if (this.password) {localStorage.setItem('password', this.password); } - localStorage.setItem('remember', 'true'); + if (this.username) { localStorage.setItem('user', this.username); } + if (this.password) { localStorage.setItem('password', this.password); } + localStorage.setItem('remember', 'true'); } public onLogin() { @@ -183,21 +188,21 @@ export class LoginComponent implements OnInit, OnDestroy { this.checkAppUpdated(); console.log('login enabled second time: ' + this.deviceToken); }, 1000); - } + } } public checkAppUpdated() { - this.authService.checkApplicationVersion(() => {}).subscribe((result: CheckAppVersionResponse) => { - // tslint:disable-next-line: triple-equals - if (result.MessageStatus == 2 && result.ErrorType == 4) { - this.cs.presentAcceptDialog(result.ErrorEndUserMessage, () => { - this.handleAppUpdate(result); - }); + this.authService.checkApplicationVersion(() => { }).subscribe((result: CheckAppVersionResponse) => { + // tslint:disable-next-line: triple-equals + if (result.MessageStatus == 2 && result.ErrorType == 4) { + this.cs.presentAcceptDialog(result.ErrorEndUserMessage, () => { + this.handleAppUpdate(result); + }); // tslint:disable-next-line: triple-equals - } else if (result.MessageStatus == 1) { - this.checkUserAuthentication(); - } - }); + } else if (result.MessageStatus == 1) { + this.checkUserAuthentication(); + } + }); } private handleAppUpdate(result) { @@ -332,7 +337,7 @@ export class LoginComponent implements OnInit, OnDestroy { login() { let anotherUser = this.sharedData.getSharedData('anotherUser'); - if(anotherUser){ + if (anotherUser) { this.username = ''; this.password = ''; } @@ -340,42 +345,51 @@ export class LoginComponent implements OnInit, OnDestroy { console.log('login'); // this.loginDiv=true; this.user = false; - } + } - loginWithUser() { + loginWithUser() { console.log('loginWithUser'); this.cs.openConfirmLoginPage(); - } + } - getLastLoginInfo() { + getLastLoginInfo() { this.requestGetLoginInfo = { DeviceType: this.cs.getDeviceType(), // "Android",//this.cs.getDeviceType(), DeviceToken: this.cs.getDeviceToken()// "5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36"//this.deviceToken }; - this.authService.getLoginInfo(this.requestGetLoginInfo, () => {}, this.ts.trPK('general', 'ok')).subscribe(res => { - if (this.cs.validResponse(res)) { + this.authService.getLoginInfo(this.requestGetLoginInfo, () => { }, this.ts.trPK('general', 'ok')).subscribe(res => { + if (this.cs.validResponse(res)) { - if (res.Mohemm_GetMobileLoginInfoList.length > 0) { + if (res.Mohemm_GetMobileLoginInfoList.length > 0) { - this.cs.sharedService.setSharedData( - // res.Patient_SELECTDeviceIMEIbyIMEIList[0], - res.Mohemm_GetMobileLoginInfoList[0], - AuthenticationService.IMEI_USER_DATA - ); - this.user = true; + this.cs.sharedService.setSharedData( + // res.Patient_SELECTDeviceIMEIbyIMEIList[0], + res.Mohemm_GetMobileLoginInfoList[0], + AuthenticationService.IMEI_USER_DATA + ); + this.user = true; - } else { - this.user = false; - } - } + } else { + this.user = false; + } + } }); - } + } + + private monitorKeyboardChange() { + this.events.subscribe(KeyboardService.KEYBOARD_STATUS, (status: KeyboardStatusModel) => { + this.keyboardOpened = status.opened; + }); + } + - private monitorKeyboardChange() { - this.events.subscribe ( KeyboardService.KEYBOARD_STATUS , ( status: KeyboardStatusModel) => { - this.keyboardOpened = status.opened; + async openDigitalId() { + const modal = await this.modalController.create({ + component: DigitalIdComponent, + cssClass: 'digital-id-modal-css' }); - } + return await modal.present(); + } } diff --git a/Mohem/src/app/hmg-common/ui/accordin-custom/accordin-tab-custom/accordin-tab-custom.component.ts b/Mohem/src/app/hmg-common/ui/accordin-custom/accordin-tab-custom/accordin-tab-custom.component.ts index ac292fa6..110e1ba6 100644 --- a/Mohem/src/app/hmg-common/ui/accordin-custom/accordin-tab-custom/accordin-tab-custom.component.ts +++ b/Mohem/src/app/hmg-common/ui/accordin-custom/accordin-tab-custom/accordin-tab-custom.component.ts @@ -11,7 +11,7 @@ export class AccordinTabCustomComponent implements OnInit { private accordion: AccordinCustomComponent; private id: number; - public show = false; + @Input() public show = false; public direction = 'ltr'; @Input() header: string; @Input() subHeader: string; @@ -30,7 +30,6 @@ export class AccordinTabCustomComponent implements OnInit { } public setVisibility(show: boolean) { - this.show = show; } public setAccordion(accordion: AccordinCustomComponent) { @@ -38,6 +37,7 @@ export class AccordinTabCustomComponent implements OnInit { } public onClick() { + this.show = !this.show; this.setVisibility(!this.show); if (this.show) { if (this.accordion) { diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html index 069e4db8..a174e010 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html @@ -57,7 +57,7 @@ + [header]="notificationList.DESCRIPTION" [show]="i === 0 ? true: false"> diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html index e45a4696..1ca7ee25 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html @@ -35,13 +35,12 @@ -

{{ 'general, empty' | translate}}

+ [header]="Lines.ITEM_DESCRIPTION" [show]="i === 0 ? true: false">
diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html index c25881b5..45631bc9 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html @@ -39,7 +39,7 @@

{{ 'general, empty' | translate}}

- +
diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.html b/Mohem/src/app/profile/edit-profile/edit-profile.component.html index 5f2cdb05..808ce73c 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.html +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.html @@ -28,23 +28,60 @@
-
+
+ + + + + - -
+ + + + + + + + + + + + +
+ +
- -
+ + + + + + + + + + + + +
+ +
- -
+ + + + + + + + + +
- -
diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss index ccb2a610..24788296 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss @@ -82,22 +82,22 @@ margin-top: 87px; border-radius: 10px; margin-bottom: -49px; - margin-left: 14px; - margin-right: 14px; + margin-left: 30px; + margin-right: 30px; } .columns{ margin: 10px; - background: #269DB8; + background: #0B4775; border-radius: 27px; - padding-left: 30px; - padding-right: 6px; - padding-top: 19px; - padding-bottom: 26px; + // padding-left: 30px; + // padding-right: 6px; + // padding-top: 19px; + // padding-bottom: 26px; } .columns-ar{ margin: 10px; - background: #269DB8; + background: #0B4775; border-radius: 27px; padding-left: 7px; padding-right: 3px; @@ -134,8 +134,8 @@ margin-left: 14px; margin-right: 14px; border-radius: 10px; - background: white; - border: solid #bebbbb !important; + // background: white; + border:#bebbbb !important; padding: 2px; } .p{ @@ -183,4 +183,12 @@ color: grey; -webkit-transform: rotate(180deg); transform: rotate(180deg); - } \ No newline at end of file + } + + .verticalLine { + width:1%; + height:50px; + background:white; + margin-top: 100%; + // margin-left: 10%; +} \ No newline at end of file diff --git a/Mohem/src/assets/imgs/IDTOP.png b/Mohem/src/assets/imgs/IDTOP.png new file mode 100644 index 00000000..edcdad43 Binary files /dev/null and b/Mohem/src/assets/imgs/IDTOP.png differ diff --git a/Mohem/src/assets/imgs/IDTOP_HMG.png.png b/Mohem/src/assets/imgs/IDTOP_HMG.png.png new file mode 100644 index 00000000..75ac031d Binary files /dev/null and b/Mohem/src/assets/imgs/IDTOP_HMG.png.png differ diff --git a/Mohem/src/assets/imgs/ID_ico.png b/Mohem/src/assets/imgs/ID_ico.png new file mode 100644 index 00000000..0fefb6bc Binary files /dev/null and b/Mohem/src/assets/imgs/ID_ico.png differ diff --git a/Mohem/src/assets/imgs/profilePic.png b/Mohem/src/assets/imgs/profilePic.png new file mode 100644 index 00000000..b6b1a4a4 Binary files /dev/null and b/Mohem/src/assets/imgs/profilePic.png differ diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 43e6a98e..e6be0cdb 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -938,6 +938,10 @@ "success-attendance": { "en": "Your attendance is marked successfully.", "ar": "تم تسجيل حضورك بنجاح" + }, + "digital-id":{ + "en":"Employee Digital ID", + "ar":"هوية الموظف الرقمية" } }, "home": { diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 35c54fcc..ff3befe8 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1545,3 +1545,11 @@ table.monthview-datetable th small { .disable-button-opacity { opacity: .2; } + + .digital-id-modal-css .modal-wrapper { + height: 90%; + width: 90%; + top: 3%; + position: absolute; + display: block; + } \ No newline at end of file