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 eba7eed13..386d0f278 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,6 +61,31 @@
{{ licenseService.totalLicensedNumberOfPages }}
+ + +
+ +
+
+
{{ licenseService.currentLicenseInfo.activeFilesUploadedBytes | size }}
+
+ +
+
+
{{ licenseService.currentLicenseInfo.archivedFilesUploadedBytes | size }}
+
+
+
+
{{ licenseService.currentLicenseInfo.trashFilesUploadedBytes | size }}
+
+ +
+
+
{{ licenseService.currentLicenseInfo.totalFilesUploadedBytes | size }}
+
+ + +
@@ -91,9 +116,11 @@
{{ licenseService.allLicensesInfo.numberOfOcrPages }}
- - +
+ +
+ diff --git a/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.scss index 9912f1c10..a48358949 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.scss @@ -12,7 +12,7 @@ width: calc(100% - 40px); display: grid; grid-template-columns: 1fr 2fr; - margin: 20px 20px 50px 20px; + margin: 20px; .row { display: contents; @@ -41,6 +41,7 @@ } redaction-license-chart { - margin-bottom: 50px; + margin: 50px 0; + grid-column: span 2; } } 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 d578901b2..5b9bfc13c 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 @@ -5,7 +5,7 @@ import { LicenseChartComponent } from './license-chart/license-chart.component'; import { RouterModule, Routes } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { MatSelectModule } from '@angular/material/select'; -import { IqserHelpModeModule, IqserListingModule } from '@iqser/common-ui'; +import { IqserHelpModeModule, IqserListingModule, SizePipe } from '@iqser/common-ui'; import { NgxChartsModule } from '@swimlane/ngx-charts'; import { ComboChartComponent, ComboSeriesVerticalComponent, YAxisComponent } from './combo-chart'; import { FormsModule } from '@angular/forms'; @@ -40,6 +40,7 @@ const routes: Routes = [ NgxChartsModule, IqserListingModule, IqserHelpModeModule, + SizePipe, ], }) export class LicenseModule {} diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index 453f143ac..1e00f5941 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/apps/red-ui/src/assets/i18n/redact/de.json @@ -1676,6 +1676,13 @@ "active": "Aktiv", "inactive": "" }, + "storage-details": "", + "storage": { + "active-documents": "", + "all-documents": "", + "archived-documents": "", + "trash-documents": "" + }, "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 5989ae8ca..53efcf790 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/apps/red-ui/src/assets/i18n/redact/en.json @@ -1676,10 +1676,17 @@ "active": "Active", "inactive": "Inactive" }, + "storage-details": "Storage Details", + "storage": { + "active-documents": "Active Documents", + "all-documents": "All Documents", + "archived-documents": "Archived Documents", + "trash-documents": "Documents in Trash" + }, "total-analyzed": "Total Analyzed Pages", "total-ocr-analyzed": "Total OCR Processed Pages", "unlicensed-analyzed": "Unlicensed Analyzed Pages", - "usage-details": "Usage Details" + "usage-details": "Page Usage Details" }, "license-information": "License Information", "load-all-annotations-success": "All annotations were loaded and are now visible in the document thumbnails", diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json index 45ee43954..98eabdfc6 100644 --- a/apps/red-ui/src/assets/i18n/scm/de.json +++ b/apps/red-ui/src/assets/i18n/scm/de.json @@ -1676,6 +1676,13 @@ "active": "Aktiv", "inactive": "" }, + "storage-details": "", + "storage": { + "active-documents": "", + "all-documents": "", + "archived-documents": "", + "trash-documents": "" + }, "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/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json index 27a898c04..fb2d459c0 100644 --- a/apps/red-ui/src/assets/i18n/scm/en.json +++ b/apps/red-ui/src/assets/i18n/scm/en.json @@ -1676,10 +1676,17 @@ "active": "Active", "inactive": "Inactive" }, + "storage-details": "Storage Details", + "storage": { + "active-documents": "Active Documents", + "all-documents": "All Documents", + "archived-documents": "Archived Documents", + "trash-documents": "Documents in Trash" + }, "total-analyzed": "Total Analyzed Pages Since {date}", "total-ocr-analyzed": "Total OCR Processed Pages Since {date}", "unlicensed-analyzed": "Unlicensed Analyzed Pages", - "usage-details": "Usage Details" + "usage-details": "Page Usage Details" }, "license-information": "License Information", "load-all-annotations-success": "All annotations were loaded and are now visible in the document thumbnails", diff --git a/libs/common-ui b/libs/common-ui index 02d0089d0..aa4516286 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 02d0089d0d7e81b3ff445534ecfee007f9aef309 +Subproject commit aa4516286eeeaab7e69adadb4f58193e8f2b64ed diff --git a/libs/red-domain/src/lib/reports/license-report.ts b/libs/red-domain/src/lib/reports/license-report.ts index d0095cdca..ab145d2c0 100644 --- a/libs/red-domain/src/lib/reports/license-report.ts +++ b/libs/red-domain/src/lib/reports/license-report.ts @@ -1,16 +1,21 @@ -import { IReportData } from './report-data'; - -export interface ILicenseReport { - data?: IReportData[]; +interface ILicenseData { + activeFilesUploadedBytes?: number; + archivedFilesUploadedBytes?: number; + totalFilesUploadedBytes?: number; + trashFilesUploadedBytes?: number; + numberOfAnalyzedPages?: number; + numberOfOcrPages?: number; + startDate?: Date; endDate?: Date; +} + +export interface ILicenseReport extends ILicenseData { limit?: number; numberOfAnalyses?: number; numberOfAnalyzedFiles?: number; - numberOfAnalyzedPages?: number; numberOfDossiers?: number; numberOfOcrFiles?: number; - numberOfOcrPages?: number; offset?: number; requestId?: string; - startDate?: Date; + monthlyData?: ILicenseData[]; }