Display page excluded from redaction in workload

This commit is contained in:
Adina Țeudan 2021-07-13 17:06:52 +03:00
parent c177f7a103
commit 7ef6b208a6
12 changed files with 36 additions and 15 deletions

View File

@ -30,6 +30,6 @@ export class DocumentInfoComponent {
}
edit() {
this._dialogService.openDialog('document-info', null, this.file);
this._dialogService.openDialog('documentInfo', null, this.file);
}
}

View File

@ -24,7 +24,7 @@ export class DossierListingActionsComponent {
) {}
openEditDossierDialog($event: MouseEvent, dossierWrapper: DossierWrapper) {
this._dialogService.openDialog('edit-dossier', $event, {
this._dialogService.openDialog('editDossier', $event, {
dossierWrapper,
afterSave: () => {
this.actionPerformed.emit();

View File

@ -27,7 +27,7 @@
>
<div>
<redaction-circle-button
(action)="closeExcludePagesView.emit()"
(action)="actionPerformed.emit('view-exclude-pages')"
icon="red:close"
tooltip="file-preview.tabs.exclude-pages.close"
tooltipPosition="before"
@ -148,7 +148,21 @@
[verticalPadding]="40"
icon="red:document"
screen="file-preview"
></redaction-empty-state>
>
<ng-container
*ngIf="
fileData?.fileStatus?.excludedPages?.includes(activeViewerPage)
"
>
{{ 'file-preview.tabs.annotations.page-is' | translate }}
<a
(click)="actionPerformed.emit('view-exclude-pages')"
translate="file-preview.tabs.annotations.excluded-from-redaction"
>
</a
>.
</ng-container>
</redaction-empty-state>
<div class="no-annotations-buttons-container mt-32">
<redaction-icon-button
(action)="jumpToPreviousWithAnnotations()"
@ -267,8 +281,8 @@
<ng-template #annotationFilterActionTemplate let-filter="filter">
<redaction-circle-button
*ngIf="filter.key === 'skipped'"
(action)="toggleSkipped.emit($event)"
*ngIf="filter.key === 'skipped'"
[icon]="hideSkipped ? 'red:visibility-off' : 'red:visibility'"
type="dark-bg"
></redaction-circle-button>

View File

@ -50,7 +50,6 @@ export class FileWorkloadComponent {
@Output() selectPage = new EventEmitter<number>();
@Output() toggleSkipped = new EventEmitter<any>();
@Output() annotationsChanged = new EventEmitter<AnnotationWrapper>();
@Output() closeExcludePagesView = new EventEmitter();
@Output() actionPerformed = new EventEmitter<string>();
displayedPages: number[] = [];
pagesPanelActive = true;

View File

@ -9,7 +9,7 @@
type="file"
/>
<div *ngIf="utils.totalPages && utils.currentPage" class="pagination noselect">
<div *ngIf="utils?.totalPages && utils?.currentPage" class="pagination noselect">
<div (click)="utils.previousPage()">
<mat-icon class="chevron-icon" svgIcon="red:nav-prev"></mat-icon>
</div>

View File

@ -196,7 +196,7 @@ export class DossierListingScreenComponent
this._calculateData();
await this._router.navigate([`/main/dossiers/${addResponse.dossier.dossierId}`]);
if (addResponse.addMembers) {
this._dialogService.openDialog('edit-dossier', null, {
this._dialogService.openDialog('editDossier', null, {
dossierWrapper: addResponse.dossier,
section: 'members'
});

View File

@ -293,14 +293,14 @@ export class DossierOverviewScreenComponent
}
openEditDossierDialog($event: MouseEvent) {
this._dialogService.openDialog('edit-dossier', $event, {
this._dialogService.openDialog('editDossier', $event, {
dossierWrapper: this.activeDossier
});
}
openAssignDossierMembersDialog(): void {
this._dialogService.openDialog(
'edit-dossier',
'editDossier',
null,
{
dossierWrapper: this.activeDossier,

View File

@ -174,7 +174,6 @@
#fileWorkloadComponent
(actionPerformed)="fileActionPerformed($event)"
(annotationsChanged)="annotationsChangedByReviewAction($event)"
(closeExcludePagesView)="excludePages = false"
(deselectAnnotations)="deselectAnnotations($event)"
(selectAnnotations)="selectAnnotations($event)"
(selectPage)="selectPage($event)"

View File

@ -33,7 +33,7 @@ const dialogConfig = {
// TODO: Continue refactor
type DialogType = 'confirm' | 'document-info' | 'edit-dossier';
type DialogType = 'confirm' | 'documentInfo' | 'editDossier';
type DossiersDialogConfig = {
[key in DialogType]: {
@ -48,11 +48,11 @@ export class DossiersDialogService extends DialogService<DialogType> {
confirm: {
component: ConfirmationDialogComponent
},
'document-info': {
documentInfo: {
component: DocumentInfoDialogComponent,
dialogConfig: { autoFocus: true }
},
'edit-dossier': {
editDossier: {
component: EditDossierDialogComponent,
dialogConfig: { ...this._largeConfig, autoFocus: true }
}

View File

@ -7,6 +7,9 @@
class="empty-state"
>
<mat-icon [svgIcon]="icon"></mat-icon>
<div class="ng-content-wrapper heading-l">
<ng-content></ng-content>
</div>
<div [translate]="text || screen + '.' + type + '.title'" class="heading-l"></div>
<redaction-icon-button
(action)="action.emit()"

View File

@ -20,4 +20,8 @@
redaction-icon-button {
margin-top: 24px;
}
.ng-content-wrapper:not(:empty) + .heading-l {
display: none;
}
}

View File

@ -948,7 +948,9 @@
"label": "Workload",
"select": "Select",
"select-all": "All",
"select-none": "None"
"select-none": "None",
"page-is": "This page is",
"excluded-from-redaction": "excluded from redaction"
},
"document-info": {
"close": "Close Document Info",