{
+ const startDate = dayjs(licence.validFrom, 'DD-MM-YYYY');
+ const endDate = dayjs(licence.validUntil, 'DD-MM-YYYY');
+ const startMonth: number = startDate.month();
+ const startYear: number = startDate.year();
+
+ const dateRanges = this.#generateDateRanges(startMonth, startYear, endDate.month(), endDate.year());
+ const reports = await this.#getReports(dateRanges);
+
+ return [
+ {
+ name: this._translateService.instant('license-info-screen.chart.licensed-total'),
+ series: this.#totalLicensedPagesSeries(dateRanges),
+ },
+ {
+ name: this._translateService.instant('license-info-screen.chart.cumulative'),
+ series: this.#setBarChartAndGetCumulativePageSeries(startMonth, startYear, reports),
+ },
+ ];
+ }
+
+ #setBarChartAndGetCumulativePageSeries(month: number, year: number, reports: ILicenseReport[]) {
+ let cumulativePages = 0;
+ const cumulativePagesSeries = [];
+ this.barChart = [];
+
+ for (const report of reports) {
+ cumulativePages += report.numberOfAnalyzedPages;
+
+ const name = `${monthNames[month]} ${year}`;
+ this.barChart.push({
+ name,
+ value: report.numberOfAnalyzedPages,
+ });
+
+ cumulativePagesSeries.push({
+ name,
+ value: cumulativePages,
+ });
+
+ month++;
+ if (month === 12) {
+ month = 0;
+ year++;
+ }
+ }
+
+ return cumulativePagesSeries;
+ }
+
+ #getReports(dateRanges: IDateRange[]) {
+ const reports = dateRanges.map(dateRange => {
+ const startDate = toDate(dateRange.startDate.month + 1, dateRange.startDate.year);
+ const endDate = toDate(dateRange.endDate.month + 1, dateRange.endDate.year);
+ return this._licenseService.getReport({ startDate, endDate });
+ });
+
+ return Promise.all(reports);
+ }
+
+ #totalLicensedPagesSeries(dateRanges: IDateRange[]) {
+ return dateRanges.map(dateRange => ({
+ name: `${monthNames[dateRange.startDate.month]} ${dateRange.startDate.year}`,
+ value: this._licenseService.totalLicensedNumberOfPages,
+ }));
+ }
+
+ #generateDateRanges(month: number, year: number, endMonth: number, endYear: number) {
+ const dates: IDateRange[] = [];
+
+ while (month <= endMonth && year <= endYear) {
+ let nextMonth = month + 1;
+ let nextYear = year;
+ if (nextMonth === 12) {
+ nextMonth = 0;
+ nextYear++;
+ }
+
+ dates.push({ startDate: { month, year }, endDate: { month: nextMonth, year: nextYear } });
+
+ year = nextYear;
+ month = nextMonth;
+ }
+
+ return dates;
+ }
+}
diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html
index 947c16001..5d0f57dd6 100644
--- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html
@@ -41,22 +41,24 @@
-
-
-
{{ selectedLicense.licensedTo || '-' }}
-
-
-
- {{ (selectedLicense.validFrom | date: 'dd-MM-YYYY') || '-' }} /
- {{ (selectedLicense.validUntil | date: 'dd-MM-YYYY') || '-' }}
+
+
+
+
{{ selectedLicense.licensedTo || '-' }}
+
+
+
+
+ {{ (selectedLicense.validFrom | date: 'dd-MM-YYYY') || '-' }} /
+ {{ (selectedLicense.validUntil | date: 'dd-MM-YYYY') || '-' }}
+
+
+
{{ 'license-info-screen.licensed-page-count' | translate }}
@@ -93,23 +95,7 @@
-
+
diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.scss b/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.scss
similarity index 100%
rename from apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.scss
rename to apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.scss
diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.ts b/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.ts
similarity index 68%
rename from apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.ts
rename to apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.ts
index a033f39f1..954521f9c 100644
--- a/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-licence.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/license-information/select-licence/select-license.component.ts
@@ -9,11 +9,11 @@ const translations = {
} as const;
@Component({
- selector: 'redaction-select-licence',
- templateUrl: './select-licence.component.html',
- styleUrls: ['./select-licence.component.scss'],
+ selector: 'redaction-select-license',
+ templateUrl: './select-license.component.html',
+ styleUrls: ['./select-license.component.scss'],
})
-export class SelectLicenceComponent {
+export class SelectLicenseComponent {
@Output() readonly valueChanges = new EventEmitter();
value = this.licenseService.getActiveLicense();
@@ -23,4 +23,9 @@ export class SelectLicenceComponent {
getStatus(id) {
return id === this.licenseService.activeLicenseId ? translations.active : translations.inactive;
}
+
+ licenseChanged($event: ILicense) {
+ this.valueChanges.emit($event);
+ this.licenseService.selectedLicense$.next($event);
+ }
}
diff --git a/apps/red-ui/src/app/modules/admin/services/licence-report.service.ts b/apps/red-ui/src/app/modules/admin/services/licence-report.service.ts
index 1e80657d7..303112868 100644
--- a/apps/red-ui/src/app/modules/admin/services/licence-report.service.ts
+++ b/apps/red-ui/src/app/modules/admin/services/licence-report.service.ts
@@ -1,18 +1,28 @@
import { Injectable, Injector } from '@angular/core';
import { GenericService, QueryParam, RequiredParam, Validate } from '@iqser/common-ui';
import { ILicenseReport, ILicenseReportRequest } from '@red/domain';
-import { firstValueFrom } from 'rxjs';
-import { LICENSE_DATA } from '../screens/license-information/licence';
+import { BehaviorSubject, firstValueFrom } from 'rxjs';
+import { ILicense, LICENSE_DATA } from '../screens/license-information/licence';
@Injectable()
export class LicenseService extends GenericService {
readonly licenseData = LICENSE_DATA;
readonly activeLicenseId = this.licenseData.activeLicense;
+ readonly selectedLicense$ = new BehaviorSubject(this.getActiveLicense());
constructor(protected readonly _injector: Injector) {
super(_injector, 'report');
}
+ get selectedLicense() {
+ return this.selectedLicense$.value;
+ }
+
+ get totalLicensedNumberOfPages() {
+ const processingPagesFeature = this.selectedLicense$.value.features.find(f => f.name === 'processingPages');
+ return Number(processingPagesFeature.value ?? '0');
+ }
+
getActiveLicense() {
return this.licenseData.licenses.find(license => license.id === this.activeLicenseId);
}