diff --git a/apps/red-ui/src/app/modules/admin/screens/license/components/chart/chart.component.ts b/apps/red-ui/src/app/modules/admin/screens/license/components/chart/chart.component.ts index fb9a9e314..1cda6e89a 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/components/chart/chart.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license/components/chart/chart.component.ts @@ -41,6 +41,7 @@ export class ChartComponent implements OnChanges { text: this.yAxisLabel, padding: { bottom: 20 }, }, + min: 0, }, y1: { display: this.secondaryAxis, @@ -50,6 +51,7 @@ export class ChartComponent implements OnChanges { text: this.yAxisLabelRight, padding: { bottom: 20 }, }, + min: 0, }, }, plugins: { diff --git a/apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-capacity.component.html b/apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-capacity.component.html new file mode 100644 index 000000000..66f61dd5c --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-capacity.component.html @@ -0,0 +1,62 @@ +
+
+ +
+
+
{{ licenseService.currentLicenseReport.activeFilesUploadedBytes | size }}
+
+ +
+
+
{{ licenseService.currentLicenseReport.archivedFilesUploadedBytes | size }}
+
+
+
+
{{ licenseService.currentLicenseReport.trashFilesUploadedBytes | size }}
+
+ +
+
+
+ {{ licenseService.currentLicenseReport.totalFilesUploadedBytes | size }} + + ({{ uploadedBytesCapacityPercentage | number : '1.0-2' }}%) + +
+
+ +
+ +
+ +
+ +
+
+ + + + {{ 'license-info-screen.capacity.storage-capacity' | translate }} + + + + + {{ 'license-info-screen.capacity.exceeded-capacity' | translate }} + + + diff --git a/apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-capacity.component.scss b/apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-capacity.component.scss new file mode 100644 index 000000000..eb954eec9 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-capacity.component.scss @@ -0,0 +1,49 @@ +:host { + display: contents; +} + +.grid-container { + width: calc(100% - 40px); + display: grid; + grid-template-columns: 1fr 2fr 2fr; + margin: 20px; + + .donut-chart-wrapper { + grid-row: 2 / span 4; + grid-column: 3; + width: fit-content; + } + + .row { + display: contents; + + > div { + padding: 8px 20px; + + &:first-of-type { + font-weight: 600; + } + } + + &:hover { + > div { + background-color: var(--iqser-alt-background); + } + } + } + + .section-title { + grid-column: span 3; + padding: 20px 20px 8px; + margin-bottom: 8px; + border-bottom: 1px solid var(--iqser-separator); + } + + redaction-chart { + grid-column: span 3; + } +} + +.exceeded-capacity { + color: var(--iqser-red-1); +} diff --git a/apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-storage.component.ts b/apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-capacity.component.ts similarity index 84% rename from apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-storage.component.ts rename to apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-capacity.component.ts index 4795e4b96..912c03c6a 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-storage.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-capacity.component.ts @@ -10,15 +10,15 @@ import { getLabelsFromLicense, getLineConfig } from '../../utils/functions'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @Component({ - selector: 'red-license-storage', - templateUrl: './license-storage.component.html', - styleUrls: ['./license-storage.component.scss'], + selector: 'red-license-capacity', + templateUrl: './license-capacity.component.html', + styleUrls: ['./license-capacity.component.scss'], }) -export class LicenseStorageComponent { +export class LicenseCapacityComponent { readonly formatSize = size; uploadedBytesCapacityPercentage = -1; donutChartConfig: DonutChartConfig[] = []; - readonly data$ = this.licenseService.licenseData$.pipe( + readonly data$ = this.licenseService.selectedLicense$.pipe( map(() => this.licenseService.currentLicenseReport), tap(license => { this.uploadedBytesCapacityPercentage = this.#getUploadedBytesCapacityPercentage(license); @@ -44,22 +44,22 @@ export class LicenseStorageComponent { { value: license.activeFilesUploadedBytes, color: ChartGreen, - label: this._translateService.instant(_('license-info-screen.storage.active-documents')), + label: this._translateService.instant(_('license-info-screen.capacity.active-documents')), }, { value: license.archivedFilesUploadedBytes, color: ChartBlue, - label: this._translateService.instant(_('license-info-screen.storage.archived-documents')), + label: this._translateService.instant(_('license-info-screen.capacity.archived-documents')), }, { value: license.trashFilesUploadedBytes, color: ChartRed, - label: this._translateService.instant(_('license-info-screen.storage.trash-documents')), + label: this._translateService.instant(_('license-info-screen.capacity.trash-documents')), }, { - value: this.licenseService.uploadedBytesCapacity - license.totalFilesUploadedBytes, + value: Math.max(this.licenseService.uploadedBytesCapacity - license.totalFilesUploadedBytes, 0), color: ChartGrey, - label: this._translateService.instant(_('license-info-screen.storage.unused')), + label: this._translateService.instant(_('license-info-screen.capacity.unused')), }, ]; } @@ -70,25 +70,25 @@ export class LicenseStorageComponent { return [ { data: monthlyData.flatMap(d => d.activeFilesUploadedBytes), - label: this._translateService.instant('license-info-screen.storage.active-documents'), + label: this._translateService.instant('license-info-screen.capacity.active-documents'), ...getLineConfig(ChartGreen, false, 'origin'), stack: 'storage', }, { data: monthlyData.flatMap(d => d.archivedFilesUploadedBytes), - label: this._translateService.instant('license-info-screen.storage.archived-documents'), + label: this._translateService.instant('license-info-screen.capacity.archived-documents'), ...getLineConfig(ChartBlue, false, '-1'), stack: 'storage', }, { data: monthlyData.flatMap(d => d.trashFilesUploadedBytes), - label: this._translateService.instant('license-info-screen.storage.trash-documents'), + label: this._translateService.instant('license-info-screen.capacity.trash-documents'), ...getLineConfig(ChartRed, false, '-1'), stack: 'storage', }, { data: monthlyData.flatMap(d => d.activeFilesUploadedBytes + d.archivedFilesUploadedBytes + d.trashFilesUploadedBytes), - label: this._translateService.instant('license-info-screen.storage.all-documents'), + label: this._translateService.instant('license-info-screen.capacity.all-documents'), ...getLineConfig(ChartBlack, true, false), borderWidth: 2, }, diff --git a/apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-storage.component.html b/apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-storage.component.html deleted file mode 100644 index 821f0489e..000000000 --- a/apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-storage.component.html +++ /dev/null @@ -1,48 +0,0 @@ -
- -
-
-
{{ licenseService.currentLicenseReport.activeFilesUploadedBytes | size }}
-
- -
-
-
{{ licenseService.currentLicenseReport.archivedFilesUploadedBytes | size }}
-
-
-
-
{{ licenseService.currentLicenseReport.trashFilesUploadedBytes | size }}
-
- -
-
-
- {{ licenseService.currentLicenseReport.totalFilesUploadedBytes | size }} - - ({{ uploadedBytesCapacityPercentage | number : '1.0-2' }}%) - -
-
- -
- -
- -
- -
diff --git a/apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-storage.component.scss b/apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-storage.component.scss deleted file mode 100644 index c0a071ff5..000000000 --- a/apps/red-ui/src/app/modules/admin/screens/license/components/license-storage/license-storage.component.scss +++ /dev/null @@ -1,38 +0,0 @@ -:host { - display: contents; -} - -.donut-chart-wrapper { - grid-row: 11 / span 4; - grid-column: 3; - width: fit-content; -} - -.row { - display: contents; - - > div { - padding: 8px 20px; - - &:first-of-type { - font-weight: 600; - } - } - - &:hover { - > div { - background-color: var(--iqser-alt-background); - } - } -} - -.section-title { - grid-column: span 3; - padding: 20px 20px 8px; - margin-bottom: 8px; - border-bottom: 1px solid var(--iqser-separator); -} - -redaction-chart { - grid-column: span 3; -} diff --git a/apps/red-ui/src/app/modules/admin/screens/license/components/license-usage/license-usage.component.html b/apps/red-ui/src/app/modules/admin/screens/license/components/license-usage/license-usage.component.html index 9aeee0700..6f979cc53 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/components/license-usage/license-usage.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/license/components/license-usage/license-usage.component.html @@ -1,41 +1,43 @@ -
+
+
-
-
-
- {{ licenseService.analyzedPagesInCurrentLicensingPeriod }} - ({{ analysisPercentageOfLicense$ | async | number : '1.0-2' }}%) +
+
+
+ {{ licenseService.analyzedPagesInCurrentLicensingPeriod }} + ({{ analysisPercentageOfLicense$ | async | number : '1.0-2' }}%) +
+
+ +
+
+
{{ licenseService.currentLicenseReport.numberOfOcrPages }}
+
+ +
+
+
{{ licenseService.unlicensedPages }}
+
+ +
+
+ +
{{ licenseService.allLicensesReport.numberOfAnalyzedPages }}
+
+ +
+
+
{{ licenseService.allLicensesReport.numberOfOcrPages }}
+
+ +
+
- -
-
-
{{ licenseService.currentLicenseReport.numberOfOcrPages }}
-
- -
-
-
{{ licenseService.unlicensedPages }}
-
- -
-
- -
{{ licenseService.allLicensesReport.numberOfAnalyzedPages }}
-
- -
-
-
{{ licenseService.allLicensesReport.numberOfOcrPages }}
-
- -
- -
diff --git a/apps/red-ui/src/app/modules/admin/screens/license/components/license-usage/license-usage.component.scss b/apps/red-ui/src/app/modules/admin/screens/license/components/license-usage/license-usage.component.scss index 2a35a4526..bdd488e9c 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/components/license-usage/license-usage.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/license/components/license-usage/license-usage.component.scss @@ -2,35 +2,42 @@ display: contents; } -.row { - display: contents; +.grid-container { + width: calc(100% - 40px); + display: grid; + grid-template-columns: 1fr 2fr 2fr; + margin: 20px; - > div { - padding: 8px 20px; + .row { + display: contents; - &:first-of-type { - font-weight: 600; - } - - &:nth-child(2) { - grid-column: span 2; - } - } - - &:hover { > div { - background-color: var(--iqser-alt-background); + padding: 8px 20px; + + &:first-of-type { + font-weight: 600; + } + + &:nth-child(2) { + grid-column: span 2; + } + } + + &:hover { + > div { + background-color: var(--iqser-alt-background); + } } } -} -.section-title { - grid-column: span 3; - padding: 20px 20px 8px; - margin-bottom: 8px; - border-bottom: 1px solid var(--iqser-separator); -} + .section-title { + grid-column: span 3; + padding: 20px 20px 8px; + margin-bottom: 8px; + border-bottom: 1px solid var(--iqser-separator); + } -redaction-chart { - grid-column: span 3; + redaction-chart { + grid-column: span 3; + } } diff --git a/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html index 7a642fc4b..4c210d01e 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html @@ -61,9 +61,14 @@
{{ licenseService.totalLicensedNumberOfPages }}
- - +
+
{{ 'license-info-screen.licensed-capacity' | translate }}
+
{{ licenseService.uploadedBytesCapacity | size }}
+
+ + + diff --git a/apps/red-ui/src/app/modules/admin/screens/license/license.module.ts b/apps/red-ui/src/app/modules/admin/screens/license/license.module.ts index 6ac357a00..70a40d2f9 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/license.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license/license.module.ts @@ -10,7 +10,7 @@ import { CommonModule } from '@angular/common'; import { LicenseService } from '@services/license.service'; import { ChartComponent } from './components/chart/chart.component'; import { NgChartsModule } from 'ng2-charts'; -import { LicenseStorageComponent } from './components/license-storage/license-storage.component'; +import { LicenseCapacityComponent } from './components/license-storage/license-capacity.component'; import { LicenseUsageComponent } from './components/license-usage/license-usage.component'; import { DonutChartComponent } from '@shared/components/donut-chart/donut-chart.component'; @@ -25,7 +25,7 @@ const routes: Routes = [ ]; @NgModule({ - declarations: [LicenseScreenComponent, LicenseSelectComponent, ChartComponent, LicenseStorageComponent, LicenseUsageComponent], + declarations: [LicenseScreenComponent, LicenseSelectComponent, ChartComponent, LicenseCapacityComponent, LicenseUsageComponent], imports: [ RouterModule.forChild(routes), CommonModule, diff --git a/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.html b/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.html index 2de1a0ff6..b744b9f11 100644 --- a/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.html +++ b/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.html @@ -21,6 +21,10 @@
{{ getFormattedValue(displayedDataTotal) }}
{{ subtitles[0] }}
+
+ +
+ string; + @Input() subtitleTemplate?: TemplateRef; @Output() readonly subtitleChanged = new EventEmitter(); @@ -36,10 +37,6 @@ export class DonutChartComponent implements OnChanges, OnInit { size = 0; filters$: Observable; - constructor(@Optional() readonly filterService: FilterService) { - // TODO: move this component to a separate module, split into smaller components, improve filters - } - get circumference(): number { return 2 * Math.PI * this.radius; } @@ -52,6 +49,10 @@ export class DonutChartComponent implements OnChanges, OnInit { return this.totalType === 'sum' ? this.dataTotal : this.config.length; } + constructor(@Optional() readonly filterService: FilterService) { + // TODO: move this component to a separate module, split into smaller components, improve filters + } + ngOnInit() { const filterModels$ = this.filterService?.getFilterModels$(this.filterKey).pipe( map(filters => filters ?? []), diff --git a/apps/red-ui/src/app/services/license.service.ts b/apps/red-ui/src/app/services/license.service.ts index d2cabf2b8..fbcd8d306 100644 --- a/apps/red-ui/src/app/services/license.service.ts +++ b/apps/red-ui/src/app/services/license.service.ts @@ -40,11 +40,6 @@ const defaultOnError: ILicenses = { providedIn: 'root', }) export class LicenseService extends GenericService { - readonly #licenseData$ = new BehaviorSubject(undefined); - readonly #selectedLicense$ = new BehaviorSubject(undefined); - readonly #logger = inject(NGXLogger); - readonly #toaster = inject(Toaster); - protected readonly _defaultModelPath = 'report'; readonly licenseData$: Observable; readonly selectedLicense$: Observable; activeLicenseId: string; @@ -53,29 +48,21 @@ export class LicenseService extends GenericService { allLicensesReport: ILicenseReport = {}; unlicensedPages = 0; analyzedPagesInCurrentLicensingPeriod = 0; - uploadedBytesCapacity = 0; - - constructor() { - super(); - this.selectedLicense$ = this.#selectedLicense$.pipe(filter(license => !!license)); - this.licenseData$ = this.#licenseData$.pipe( - filter(licenses => !!licenses), - tap(data => (this.activeLicenseId = data.activeLicense)), - tap(() => { - const activeLicense = this.activeLicense; - if (!activeLicense) { - return; - } - const uploadedBytesCapacity = this.activeLicense.features.find(f => f.name === 'uploadedBytesCapacity')?.value; - this.uploadedBytesCapacity = uploadedBytesCapacity ? parseInt(uploadedBytesCapacity, 10) : 0; - }), - ); - } + protected readonly _defaultModelPath = 'report'; + readonly #licenseData$ = new BehaviorSubject(undefined); + readonly #selectedLicense$ = new BehaviorSubject(undefined); + readonly #logger = inject(NGXLogger); + readonly #toaster = inject(Toaster); get selectedLicense() { return this.#selectedLicense$.value; } + get uploadedBytesCapacity(): number { + const uploadedBytesCapacity = this.selectedLicense.features.find(f => f.name === 'uploadedBytesCapacity')?.value || '0'; + return parseInt(uploadedBytesCapacity, 10); + } + get activeLicense() { if (!this.#licenseData$.value) { return undefined; @@ -94,6 +81,15 @@ export class LicenseService extends GenericService { return activeLicense.features.find(f => f.name === 'pdftron').value; } + constructor() { + super(); + this.selectedLicense$ = this.#selectedLicense$.pipe(filter(license => !!license)); + this.licenseData$ = this.#licenseData$.pipe( + filter(licenses => !!licenses), + tap(data => (this.activeLicenseId = data.activeLicense)), + ); + } + async loadLicenseData(license: ILicense = this.selectedLicense) { this.totalLicensedNumberOfPages = this.getTotalLicensedNumberOfPages(license); diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index e768b6a87..81eb0aa52 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/apps/red-ui/src/assets/i18n/redact/de.json @@ -208,9 +208,6 @@ "accept-recommendation": { "label": "Empfehlung annehmen" }, - "accept-suggestion": { - "label": "Genehmigen und zum Wörterbuch hinzufügen" - }, "convert-highlights": { "label": "" }, @@ -328,7 +325,6 @@ } }, "recategorize-image": "neu kategorisieren", - "reject-suggestion": "Vorschlag ablehnen", "remove-annotation": { "remove-redaction": "" }, @@ -477,7 +473,6 @@ "heading-with-name-and-link": "Ihr Benutzer verfügt nicht über die erforderlichen RED-*-Rollen, um auf diese Applikation zugreifen zu können. Bitte kontaktieren Sie {adminName}, um den Zugang anzufordern!", "logout": "Ausloggen" }, - "by": "von", "change-legal-basis-dialog": { "actions": { "cancel": "Abbrechen", @@ -1638,6 +1633,16 @@ }, "license-info-screen": { "backend-version": "Backend-Version der Anwendung", + "capacity-details": "", + "capacity": { + "active-documents": "", + "all-documents": "", + "archived-documents": "", + "exceeded-capacity": "", + "storage-capacity": "", + "trash-documents": "", + "unused": "" + }, "copyright-claim-text": "Copyright © 2020 - {currentYear} knecon AG (powered by IQSER)", "copyright-claim-title": "Copyright", "current-analyzed": "In aktuellem Lizenzzeitraum analysierte Seiten", @@ -1653,6 +1658,7 @@ "end-user-license-text": "Die Nutzung dieses Produkts unterliegt den Bedingungen der Endbenutzer-Lizenzvereinbarung für den RedactManager, sofern darin nichts anderweitig festgelegt.", "end-user-license-title": "Endbenutzer-Lizenzvereinbarung", "license-title": "", + "licensed-capacity": "", "licensed-page-count": "Anzahl der lizenzierten Seiten", "licensed-to": "Lizenziert für", "licensing-details": "Lizenzdetails", @@ -1667,15 +1673,6 @@ "active": "Aktiv", "inactive": "" }, - "storage-details": "", - "storage": { - "active-documents": "", - "all-documents": "", - "archived-documents": "", - "storage-capacity": "", - "trash-documents": "", - "unused": "" - }, "total-analyzed": "Seit {date} insgesamt analysierte Seiten", "total-ocr-analyzed": "", "unlicensed-analyzed": "Über Lizenz hinaus analysierte Seiten", diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index 021c6a57d..208d0bf4e 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/apps/red-ui/src/assets/i18n/redact/en.json @@ -208,9 +208,6 @@ "accept-recommendation": { "label": "Accept Recommendation" }, - "accept-suggestion": { - "label": "Approve Suggestion" - }, "convert-highlights": { "label": "Convert Selected Earmarks" }, @@ -328,7 +325,6 @@ } }, "recategorize-image": "Recategorize", - "reject-suggestion": "Reject Suggestion", "remove-annotation": { "remove-redaction": "Remove" }, @@ -477,7 +473,6 @@ "heading-with-name-and-link": "Your user is successfully logged in but has no role assigned yet. Please contact {adminName} to assign appropriate roles.", "logout": "Logout" }, - "by": "by", "change-legal-basis-dialog": { "actions": { "cancel": "Cancel", @@ -1638,6 +1633,16 @@ }, "license-info-screen": { "backend-version": "Backend Application Version", + "capacity-details": "Capacity Details", + "capacity": { + "active-documents": "Active Documents", + "all-documents": "Retention Capacity Used", + "archived-documents": "Archived Documents", + "exceeded-capacity": "Exceeded Capacity", + "storage-capacity": "Capacity", + "trash-documents": "Documents in Trash", + "unused": "Unused Storage" + }, "copyright-claim-text": "Copyright © 2020 - {currentYear} knecon AG (powered by IQSER)", "copyright-claim-title": "Copyright Claim", "current-analyzed": "Analyzed Pages in Licensing Period", @@ -1653,6 +1658,7 @@ "end-user-license-text": "The use of this product is subject to the terms of the Redaction End User Agreement, unless otherwise specified therein.", "end-user-license-title": "End User License Agreement", "license-title": "License Title", + "licensed-capacity": "Licensed Capacity", "licensed-page-count": "Licensed Pages", "licensed-to": "Licensed to", "licensing-details": "Licensing Details", @@ -1667,15 +1673,6 @@ "active": "Active", "inactive": "Inactive" }, - "storage-details": "Storage Details", - "storage": { - "active-documents": "Active Documents", - "all-documents": "Total Storage Used", - "archived-documents": "Archived Documents", - "storage-capacity": "Storage Capacity", - "trash-documents": "Documents in Trash", - "unused": "Unused Storage" - }, "total-analyzed": "Total Analyzed Pages", "total-ocr-analyzed": "Total OCR Processed Pages", "unlicensed-analyzed": "Unlicensed Analyzed Pages", diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json index 2370969bb..4d505af32 100644 --- a/apps/red-ui/src/assets/i18n/scm/de.json +++ b/apps/red-ui/src/assets/i18n/scm/de.json @@ -473,7 +473,6 @@ "heading-with-name-and-link": "Ihr Benutzer verfügt nicht über die erforderlichen RED-*-Rollen, um auf diese Applikation zugreifen zu können. Bitte kontaktieren Sie {adminName}, um den Zugang anzufordern!", "logout": "Ausloggen" }, - "by": "von", "change-legal-basis-dialog": { "actions": { "cancel": "Abbrechen", @@ -1634,6 +1633,16 @@ }, "license-info-screen": { "backend-version": "Backend-Version der Anwendung", + "capacity-details": "", + "capacity": { + "active-documents": "", + "all-documents": "", + "archived-documents": "", + "exceeded-capacity": "", + "storage-capacity": "", + "trash-documents": "", + "unused": "" + }, "copyright-claim-text": "Copyright © 2020 - {currentYear} knecon AG (powered by IQSER)", "copyright-claim-title": "Copyright", "current-analyzed": "In aktuellem Lizenzzeitraum analysierte Seiten", @@ -1649,6 +1658,7 @@ "end-user-license-text": "Die Nutzung dieses Produkts unterliegt den Bedingungen der Endbenutzer-Lizenzvereinbarung für den RedactManager, sofern darin nichts anderweitig festgelegt.", "end-user-license-title": "Endbenutzer-Lizenzvereinbarung", "license-title": "", + "licensed-capacity": "", "licensed-page-count": "Anzahl der lizenzierten Seiten", "licensed-to": "Lizenziert für", "licensing-details": "Lizenzdetails", @@ -1663,15 +1673,6 @@ "active": "Aktiv", "inactive": "" }, - "storage-details": "", - "storage": { - "active-documents": "", - "all-documents": "", - "archived-documents": "", - "storage-capacity": "", - "trash-documents": "", - "unused": "" - }, "total-analyzed": "Seit {date} insgesamt analysierte Seiten", "total-ocr-analyzed": "", "unlicensed-analyzed": "Über Lizenz hinaus analysierte Seiten", @@ -2069,12 +2070,6 @@ "undo": "" }, "annotations": "", - "table-header": { - "annotation": "", - "component": "", - "transformation": "", - "value": "" - }, "title": "" }, "rules-screen": { diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json index dfb58e68e..527f75897 100644 --- a/apps/red-ui/src/assets/i18n/scm/en.json +++ b/apps/red-ui/src/assets/i18n/scm/en.json @@ -473,7 +473,6 @@ "heading-with-name-and-link": "Your user is successfully logged in but has no role assigned yet. Please contact {adminName} to assign appropriate roles.", "logout": "Logout" }, - "by": "by", "change-legal-basis-dialog": { "actions": { "cancel": "Cancel", @@ -1634,6 +1633,16 @@ }, "license-info-screen": { "backend-version": "Backend Application Version", + "capacity-details": "Capacity Details", + "capacity": { + "active-documents": "Active Documents", + "all-documents": "Retention Capacity Used", + "archived-documents": "Archived Documents", + "exceeded-capacity": "Exceeded Capacity", + "storage-capacity": "Capacity", + "trash-documents": "Documents in Trash", + "unused": "Unused Storage" + }, "copyright-claim-text": "Copyright © 2020 - {currentYear} knecon AG (powered by IQSER)", "copyright-claim-title": "Copyright Claim", "current-analyzed": "Analyzed Pages in Licensing Period", @@ -1649,6 +1658,7 @@ "end-user-license-text": "The use of this product is subject to the terms of the Component End User Agreement, unless otherwise specified therein.", "end-user-license-title": "End User License Agreement", "license-title": "License Title", + "licensed-capacity": "Licensed Capacity", "licensed-page-count": "Licensed pages", "licensed-to": "Licensed to", "licensing-details": "Licensing Details", @@ -1663,15 +1673,6 @@ "active": "Active", "inactive": "Inactive" }, - "storage-details": "Storage Details", - "storage": { - "active-documents": "Active Documents", - "all-documents": "Total Storage Used", - "archived-documents": "Archived Documents", - "storage-capacity": "Storage Capacity", - "trash-documents": "Documents in Trash", - "unused": "Unused Storage" - }, "total-analyzed": "Total Analyzed Pages Since {date}", "total-ocr-analyzed": "Total OCR Processed Pages Since {date}", "unlicensed-analyzed": "Unlicensed Analyzed Pages", @@ -2069,12 +2070,6 @@ "undo": "Undo to: {value}" }, "annotations": "{type} found on {pageCount, plural, one{page} other{pages}} {pages} by rule #{ruleNumber}", - "table-header": { - "annotation-references": "Annotation references", - "component": "Component", - "transformation-rule": "Transformation rule", - "value": "Value" - }, "title": "Structured Component Management" }, "rules-screen": {