From 1f4bda6deb5db8cea29fc163cb5fd9c742b01687 Mon Sep 17 00:00:00 2001 From: Edi Cziszter Date: Fri, 29 Oct 2021 18:58:15 +0300 Subject: [PATCH 1/2] added link to deleted files & trash icon --- .../components/pdf-viewer/pdf-viewer.component.ts | 2 +- .../dossier-details-stats.component.html | 12 +++++++++++- .../dossier-details-stats.component.ts | 11 ++++++++--- .../screen/dossiers-listing-screen.component.ts | 3 +-- .../needs-work-badge/needs-work-badge.component.ts | 2 +- apps/red-ui/src/assets/i18n/de.json | 1 + apps/red-ui/src/assets/i18n/en.json | 1 + 7 files changed, 24 insertions(+), 8 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.ts index 89f0532db..4cd21ba90 100644 --- a/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.ts @@ -295,7 +295,7 @@ export class PdfViewerComponent implements OnInit, OnChanges { } private _setSelectionMode(): void { - const textTool = (this.instance.Core.Tools.TextTool) as TextTool; + const textTool = ( this.instance.Core.Tools.TextTool) as TextTool; textTool.SELECTION_MODE = this._configService.values.SELECTION_MODE; } diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html index 7ac4f3f4c..025a07aee 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html @@ -43,6 +43,12 @@ {{ 'dossier-overview.dossier-details.dictionary' | translate }} +
+ \ + + {{ files.length }} {{ 'dossier-overview.dossier-details.deleted' | translate }} + +
@@ -50,7 +56,11 @@
-
+
{{ attr.label + ': -' }} {{ attr.label + ': ' + (attr.value | date: 'd MMM. yyyy') }} diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts index ffc75ae44..037ea0fa5 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts @@ -1,9 +1,10 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { AppStateService } from '@state/app-state.service'; -import { Dossier, DossierAttributeWithValue, DossierTemplate } from '@red/domain'; +import { Dossier, DossierAttributeWithValue, DossierTemplate, FileStatuses } from '@red/domain'; import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; +import { FilesService } from '../../../../../../services/entity-services/files.service'; @Component({ selector: 'redaction-dossier-details-stats', @@ -19,6 +20,7 @@ export class DossierDetailsStatsComponent { private readonly _appStateService: AppStateService, private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _dialogService: DossiersDialogService, + readonly filesService: FilesService, readonly dossiersService: DossiersService, ) {} @@ -26,10 +28,13 @@ export class DossierDetailsStatsComponent { return this._dossierTemplatesService.find(dossier.dossierTemplateId); } - openEditDossierAttributesDialog(dossier: Dossier) { + openEditDossierAttributesDialog(dossier: Dossier, section: string) { this._dialogService.openDialog('editDossier', null, { dossier, - section: 'dossierAttributes', + section: section, }); } + butonel(dossier: Dossier): void { + this.filesService.getDeletedFilesFor(dossier.id).subscribe(res => console.log(res.length)); + } } diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts index 09e2e3e0b..4a5321717 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts @@ -38,8 +38,7 @@ import { DossiersService } from '@services/entity-services/dossiers.service'; }) export class DossiersListingScreenComponent extends ListingComponent - implements OnInit, AfterViewInit, OnDestroy, OnAttach, OnDetach -{ + implements OnInit, AfterViewInit, OnDestroy, OnAttach, OnDetach { readonly currentUser = this._userService.currentUser; readonly tableColumnConfigs = this._configService.tableConfig; readonly tableHeaderLabel = _('dossier-listing.table-header.title'); diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/needs-work-badge/needs-work-badge.component.ts b/apps/red-ui/src/app/modules/dossier/shared/components/needs-work-badge/needs-work-badge.component.ts index 7fe83e885..847c1e6c1 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/needs-work-badge/needs-work-badge.component.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/components/needs-work-badge/needs-work-badge.component.ts @@ -45,7 +45,7 @@ export class NeedsWorkBadgeComponent { } get hasAnnotationComments(): boolean { - return this.needsWorkInput instanceof File && (this.needsWorkInput).hasAnnotationComments; + return this.needsWorkInput instanceof File && ( this.needsWorkInput).hasAnnotationComments; } reanalysisRequired() { diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 7a0edcc5f..a337d7f60 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -613,6 +613,7 @@ }, "description": "Beschreibung", "dictionary": "", + "deleted": "", "stats": { "analysed-pages": "{count} Seiten", "created-on": "Erstellt am {date}", diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index a45e72a65..4add5e0b3 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -678,6 +678,7 @@ }, "description": "Description", "dictionary": "Dossier Dictionary", + "deleted": "deleted files", "stats": { "analysed-pages": "{count} {count, plural, one{page} other{pages}}", "created-on": "Created on {date}", From 9aef5c8c9dfc118f48d8d1f5128096fa90f12035 Mon Sep 17 00:00:00 2001 From: Edi Cziszter Date: Tue, 2 Nov 2021 12:47:28 +0200 Subject: [PATCH 2/2] deleted files count in observable --- .../dossier-details-stats.component.html | 6 ++---- .../dossier-details-stats.component.ts | 18 ++++++++++++------ apps/red-ui/src/assets/i18n/de.json | 4 ++-- apps/red-ui/src/assets/i18n/en.json | 4 ++-- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html index 025a07aee..0abb33ec4 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html @@ -44,10 +44,8 @@ {{ 'dossier-overview.dossier-details.dictionary' | translate }}
- \ - - {{ files.length }} {{ 'dossier-overview.dossier-details.deleted' | translate }} - + + {{ 'dossier-overview.dossier-details.stats.deleted' | translate: { count: deletedFilesCount$ | async } }}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts index 037ea0fa5..d52811feb 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts @@ -1,10 +1,12 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { AppStateService } from '@state/app-state.service'; -import { Dossier, DossierAttributeWithValue, DossierTemplate, FileStatuses } from '@red/domain'; +import { Dossier, DossierAttributeWithValue, DossierTemplate } from '@red/domain'; import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { FilesService } from '../../../../../../services/entity-services/files.service'; +import { Observable } from 'rxjs'; +import { distinctUntilChanged, map, switchMap } from 'rxjs/operators'; @Component({ selector: 'redaction-dossier-details-stats', @@ -13,6 +15,7 @@ import { FilesService } from '../../../../../../services/entity-services/files.s }) export class DossierDetailsStatsComponent { attributesExpanded = false; + deletedFilesCount$: Observable; @Input() dossierAttributes: DossierAttributeWithValue[]; @Output() readonly openDossierDictionaryDialog = new EventEmitter(); @@ -20,9 +23,15 @@ export class DossierDetailsStatsComponent { private readonly _appStateService: AppStateService, private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _dialogService: DossiersDialogService, - readonly filesService: FilesService, + private readonly _filesService: FilesService, readonly dossiersService: DossiersService, - ) {} + ) { + this.deletedFilesCount$ = dossiersService.activeDossier$.pipe( + switchMap(dossier => _filesService.getDeletedFilesFor(dossier.id)), + map(files => files.length), + distinctUntilChanged(), + ); + } dossierTemplate(dossier: Dossier): DossierTemplate { return this._dossierTemplatesService.find(dossier.dossierTemplateId); @@ -34,7 +43,4 @@ export class DossierDetailsStatsComponent { section: section, }); } - butonel(dossier: Dossier): void { - this.filesService.getDeletedFilesFor(dossier.id).subscribe(res => console.log(res.length)); - } } diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index a337d7f60..2b78704fb 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -613,13 +613,13 @@ }, "description": "Beschreibung", "dictionary": "", - "deleted": "", "stats": { "analysed-pages": "{count} Seiten", "created-on": "Erstellt am {date}", "documents": "{count} Dokumente", "due-date": "Geburtstermin", - "people": "{count} Benutzer" + "people": "{count} Benutzer", + "deleted": "{count} " } }, "download-file": "Herunterladen", diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 4add5e0b3..119472d76 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -678,13 +678,13 @@ }, "description": "Description", "dictionary": "Dossier Dictionary", - "deleted": "deleted files", "stats": { "analysed-pages": "{count} {count, plural, one{page} other{pages}}", "created-on": "Created on {date}", "documents": "{count} {count, plural, one{document} other{documents}}", "due-date": "Due {date}", - "people": "{count} {count, plural, one{user} other{users}}" + "people": "{count} {count, plural, one{user} other{users}}", + "deleted": "{count} deleted files" } }, "download-file": "Download",