diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts index 0a7e5666..2e626b59 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -122,6 +122,10 @@ export class AddEitComponent implements OnInit { EITTransactionsRequest.SUBMIT_EIT_ACTION ); } + + // window.addEventListener('keyboardDidShow', () => { + // document.activeElement.scrollIntoView(false); + // }); } ngOnInit() {} diff --git a/Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts b/Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts index 8bb03e7b..964cf5f0 100644 --- a/Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts +++ b/Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts @@ -11,4 +11,5 @@ export class MenuEntry { public PROMPT: string; public REQUEST_TYPE: string; public ATTACHMENT_REQUIRED: string; + public REQ_ATTACHMENT_TIP: string; } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html index 94ab6876..fee6d4a8 100644 --- a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html +++ b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html @@ -1,7 +1,7 @@
{{value}} - {{text}} + {{text}}
diff --git a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts index c414bc98..8e522d69 100644 --- a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts +++ b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit, Input } from '@angular/core'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; @Component({ selector: 'app-card-filter', @@ -11,8 +12,16 @@ export class CardFilterComponent implements OnInit { @Input() active: boolean; @Input() color: string; + direction: string; + constructor() { } - ngOnInit() {} + ngOnInit() { + this.direction = TranslatorService.getCurrentLanguageName(); + console.log(this.direction); + if (this.direction == 'ar') { + this.text = 'الموارد البشرية'; + } + } } diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html index 1d5540c9..d52889c3 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html @@ -49,7 +49,7 @@ {{ts.trPK('vacation-rule','itemType')}} - HR + {{text}}