diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.html b/Mohem/src/app/absence/submit-absence/submit-absence.component.html index 98bb9c31..9a17288e 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.html +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.html @@ -5,19 +5,19 @@ -
+ + {{ts.trPK('submitAbsence','absenceType')}} - --> + - + {{ts.trPK('submitAbsence','startDate')}} diff --git a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html index ba7fd550..c0e012d1 100644 --- a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html +++ b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html @@ -59,7 +59,7 @@ - +

{{ts.trPK('general','business-card')}}

diff --git a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts index d95ed279..2cb0ea3a 100644 --- a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts +++ b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts @@ -76,6 +76,7 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy { user_name: string; userInfo: any; userBusiness: any; + showBusinessCard = false; constructor( public ts: TranslatorService, @@ -94,7 +95,13 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy { false ); - console.log( "this.user in welcome login"+ this.user); + console.log( "this.user in welcome login"+ JSON.stringify(this.user)); + + // if (this.user && this.user.BusinessCardPrivilege) { + // this.showBusinessCard = true + // } else { + // this.showBusinessCard = false; + // } this.userName = localStorage.getItem("user"); this.password = localStorage.getItem("password"); diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 28867e3a..89200ab2 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -119,7 +119,7 @@ export class HomeComponent implements OnInit { }, { value: 0, - name: 'MO', + name: 'MR', active: false, color: '#3cb9d5', key: 'INVMOA',