diff --git a/src/app/announcement/announcement-detail/announcement-detail.component.ts b/src/app/announcement/announcement-detail/announcement-detail.component.ts index b3bc4ea..81e89eb 100644 --- a/src/app/announcement/announcement-detail/announcement-detail.component.ts +++ b/src/app/announcement/announcement-detail/announcement-detail.component.ts @@ -56,11 +56,11 @@ export class AnnouncementDetailComponent implements OnChanges { public priorityOptions$: Observable = of([]) constructor( - private user: UserService, - private announcementApi: AnnouncementInternalAPIService, - private fb: FormBuilder, - private translate: TranslateService, - private msgService: PortalMessageService + private readonly user: UserService, + private readonly announcementApi: AnnouncementInternalAPIService, + private readonly fb: FormBuilder, + private readonly translate: TranslateService, + private readonly msgService: PortalMessageService ) { this.dateFormat = this.user.lang$.getValue() === 'de' ? 'dd.mm.yy' : 'mm/dd/yy' this.timeFormat = this.user.lang$.getValue() === 'de' ? '24' : '12' diff --git a/src/app/announcement/announcement-search/announcement-criteria/announcement-criteria.component.ts b/src/app/announcement/announcement-search/announcement-criteria/announcement-criteria.component.ts index 538316d..1d1bc1d 100644 --- a/src/app/announcement/announcement-search/announcement-criteria/announcement-criteria.component.ts +++ b/src/app/announcement/announcement-search/announcement-criteria/announcement-criteria.component.ts @@ -43,8 +43,8 @@ export class AnnouncementCriteriaComponent implements OnInit { public priorityType$: Observable = of([]) constructor( - private user: UserService, - public translate: TranslateService + private readonly user: UserService, + public readonly translate: TranslateService ) { this.dateFormatForRange = this.user.lang$.getValue() === 'de' ? 'dd.mm.yy' : 'm/d/yy' } diff --git a/src/app/announcement/announcement-search/announcement-search.component.html b/src/app/announcement/announcement-search/announcement-search.component.html index 43407cd..9f0fead 100644 --- a/src/app/announcement/announcement-search/announcement-search.component.html +++ b/src/app/announcement/announcement-search/announcement-search.component.html @@ -26,6 +26,8 @@ paginatorPosition="bottom" [rows]="10" [rowsPerPageOptions]="[10, 20, 100]" + [showCurrentPageReport]="true" + currentPageReportTemplate="{first} - {last} {{ 'ACTIONS.SEARCH.OF' | translate }} {totalRecords}" > - - - diff --git a/src/app/announcement/announcement-search/announcement-search.component.ts b/src/app/announcement/announcement-search/announcement-search.component.ts index 550f5e2..7bc29f1 100644 --- a/src/app/announcement/announcement-search/announcement-search.component.ts +++ b/src/app/announcement/announcement-search/announcement-search.component.ts @@ -123,11 +123,11 @@ export class AnnouncementSearchComponent implements OnInit { ] constructor( - private user: UserService, - private announcementApi: AnnouncementInternalAPIService, - private msgService: PortalMessageService, - private translate: TranslateService, - private cdr: ChangeDetectorRef + private readonly user: UserService, + private readonly announcementApi: AnnouncementInternalAPIService, + private readonly msgService: PortalMessageService, + private readonly translate: TranslateService, + private readonly cdr: ChangeDetectorRef ) { this.dateFormat = this.user.lang$.getValue() === 'de' ? 'dd.MM.yyyy HH:mm' : 'M/d/yy, h:mm a' } diff --git a/src/app/onecx-announcement-remote.module.ts b/src/app/onecx-announcement-remote.module.ts index 594e29b..9410a04 100644 --- a/src/app/onecx-announcement-remote.module.ts +++ b/src/app/onecx-announcement-remote.module.ts @@ -63,7 +63,7 @@ const routes: Routes = [ schemas: [] }) export class OneCXAnnouncementModule implements DoBootstrap { - constructor(private injector: Injector) { + constructor(private readonly injector: Injector) { console.info('OneCX Announcement Module constructor') } diff --git a/src/app/remotes/announcement-banner/announcement-banner.component.ts b/src/app/remotes/announcement-banner/announcement-banner.component.ts index a358f00..3216a58 100644 --- a/src/app/remotes/announcement-banner/announcement-banner.component.ts +++ b/src/app/remotes/announcement-banner/announcement-banner.component.ts @@ -65,12 +65,12 @@ export class OneCXAnnouncementBannerComponent implements ocxRemoteComponent, ocx public announcements$: Observable = this.announcementsSubject.asObservable() constructor( - @Inject(BASE_URL) private baseUrl: ReplaySubject, - private translateService: TranslateService, - private apiV1: AnnouncementInternalAPIService, - private appStateService: AppStateService, - private userService: UserService, - private appConfigService: AppConfigService + @Inject(BASE_URL) private readonly baseUrl: ReplaySubject, + private readonly translateService: TranslateService, + private readonly apiV1: AnnouncementInternalAPIService, + private readonly appStateService: AppStateService, + private readonly userService: UserService, + private readonly appConfigService: AppConfigService ) { this.userService.lang$.subscribe((lang) => this.translateService.use(lang)) combineLatest([ diff --git a/src/app/remotes/announcement-list-active/announcement-list-active.component.ts b/src/app/remotes/announcement-list-active/announcement-list-active.component.ts index e92d671..f0c2475 100644 --- a/src/app/remotes/announcement-list-active/announcement-list-active.component.ts +++ b/src/app/remotes/announcement-list-active/announcement-list-active.component.ts @@ -68,12 +68,12 @@ export class OneCXAnnouncementListActiveComponent implements ocxRemoteComponent, copyToClipboard = copyToClipboard constructor( - @Inject(BASE_URL) private baseUrl: ReplaySubject, - private announcementApi: AnnouncementInternalAPIService, - private translateService: TranslateService, - private appStateService: AppStateService, - private userService: UserService, - private appConfigService: AppConfigService + @Inject(BASE_URL) private readonly baseUrl: ReplaySubject, + private readonly announcementApi: AnnouncementInternalAPIService, + private readonly translateService: TranslateService, + private readonly appStateService: AppStateService, + private readonly userService: UserService, + private readonly appConfigService: AppConfigService ) { this.userService.lang$.subscribe((lang) => this.translateService.use(lang)) combineLatest([this.baseUrl.asObservable(), this.appStateService.currentWorkspace$.asObservable()]) diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 638aa00..9568591 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -50,7 +50,8 @@ "NO_DATA": "Keine Ergebnisse", "NO_RESULTS": "Die Suche ergab keine Ergebnisse", "SEARCH_FAILED": "Die Suche ist fehlgeschlagen", - "NOT_FOUND": "Keine Daten gefunden" + "NOT_FOUND": "Keine Daten gefunden", + "OF": "von" }, "CANCEL": "Abbrechen", "CHOOSE": "Auswählen", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index a57d276..3d4a38f 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -50,7 +50,8 @@ "NO_DATA": "No data", "NO_RESULTS": "Search returned no results", "SEARCH_FAILED": "Search failed", - "NOT_FOUND": "No data found" + "NOT_FOUND": "No data found", + "OF": "of" }, "CANCEL": "Cancel", "CHOOSE": "Choose",