Show page report in paginator, mark svcs as readonly in constructors (#…

…259)

* feat: show page report in paginator, mark svcs as readonly in constructors

* feat: adjust translations

---------

Co-authored-by: Christian Badura <[email protected]>

src/app/announcement/announcement-detail/announcement-detail.component.ts

@@ -56,11 +56,11 @@ export class AnnouncementDetailComponent implements OnChanges {
   public priorityOptions$: Observable<SelectItem[]> = 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'

src/app/announcement/announcement-search/announcement-criteria/announcement-criteria.component.ts

@@ -43,8 +43,8 @@ export class AnnouncementCriteriaComponent implements OnInit {
   public priorityType$: Observable<SelectItem[]> = 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'
   }

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}"
     >
       <ng-template pTemplate="caption">
         <ocx-data-view-controls
@@ -39,9 +41,6 @@
           [filterColumns]="['ANNOUNCEMENT.TITLE' | translate, 'ANNOUNCEMENT.WORKSPACE' | translate]"
         ></ocx-data-view-controls>
       </ng-template>
-      <ng-template pTemplate="paginatorleft" let-state>
-        <ocx-paging-info [resultsCount]="announcements ? announcements.length : -1" [state]="state"></ocx-paging-info>
-      </ng-template>
 
       <ng-template pTemplate="emptymessage">
         <tr>

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'
   }

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')
   }
 

src/app/remotes/announcement-banner/announcement-banner.component.ts

@@ -65,12 +65,12 @@ export class OneCXAnnouncementBannerComponent implements ocxRemoteComponent, ocx
   public announcements$: Observable<AnnouncementAbstract[] | undefined> = this.announcementsSubject.asObservable()
 
   constructor(
-    @Inject(BASE_URL) private baseUrl: ReplaySubject<string>,
-    private translateService: TranslateService,
-    private apiV1: AnnouncementInternalAPIService,
-    private appStateService: AppStateService,
-    private userService: UserService,
-    private appConfigService: AppConfigService
+    @Inject(BASE_URL) private readonly baseUrl: ReplaySubject<string>,
+    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([

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<string>,
-    private announcementApi: AnnouncementInternalAPIService,
-    private translateService: TranslateService,
-    private appStateService: AppStateService,
-    private userService: UserService,
-    private appConfigService: AppConfigService
+    @Inject(BASE_URL) private readonly baseUrl: ReplaySubject<string>,
+    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()])

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",

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",