Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

fixed user endpoint, search and annotation remove, file-status refresh

Browse Source
This commit is contained in:
Timo Bejan 2021-08-04 12:10:23 +03:00
parent c3bcec9669
commit 6dec34a126
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
View File

@ -28,7 +28,7 @@
<div class="right-content"> <div class="right-content">
<div *ngIf="isReadOnly" [class.justify-center]="!isProcessing" class="read-only d-flex"> <div *ngIf="isReadOnly" [class.justify-center]="!isProcessing" class="read-only d-flex">
<div *ngIf="isProcessing" class="flex-align-items-center"> <div *ngIf="isProcessing" class="flex-align-items-center">
<span [translate]="fileData.fileStatus.status" class="read-only-text"></span> <span [translate]="'filestatus.processing'" class="read-only-text"></span>
<mat-progress-bar [mode]="'indeterminate'" class="w-100"></mat-progress-bar> <mat-progress-bar [mode]="'indeterminate'" class="w-100"></mat-progress-bar>
</div> </div>
<div class="flex-center"> <div class="flex-center">

2
apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts
View File

@ -36,7 +36,7 @@ export class RemoveAnnotationsDialogComponent {
} }
confirm() { confirm() {
this.dialogRef.close(this.redactionForm.getRawValue().comment); this.dialogRef.close({ comment: this.redactionForm.getRawValue().comment });
} }
printable(annotation: AnnotationWrapper) { printable(annotation: AnnotationWrapper) {

1
apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts
View File

@ -141,6 +141,7 @@ export class DossierOverviewScreenComponent
} }
async ngOnAttach() { async ngOnAttach() {
await this._appStateService.reloadActiveDossierFiles();
this._loadEntitiesFromState(); this._loadEntitiesFromState();
await this.ngOnInit(); await this.ngOnInit();
this.scrollViewport.scrollTo({ top: this._lastScrollPosition }); this.scrollViewport.scrollTo({ top: this._lastScrollPosition });

2
apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html
View File

@ -44,7 +44,7 @@
</div> </div>
</ng-container> </ng-container>
<div *ngIf="item.unmatched as unmatched" class="small-label"> <div *ngIf="item.unmatched?.length && item.unmatched as unmatched" class="small-label">
<span> <span>
{{ 'search-screen.missing' | translate }}:<span *ngFor="let term of unmatched" {{ 'search-screen.missing' | translate }}:<span *ngFor="let term of unmatched"
>&nbsp;<s>{{ term }}</s></span >&nbsp;<s>{{ term }}</s></span

4
apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts
View File

@ -73,10 +73,10 @@ export class AnnotationActionsService {
removeFromDictionary: boolean, removeFromDictionary: boolean,
annotationsChanged: EventEmitter<AnnotationWrapper> annotationsChanged: EventEmitter<AnnotationWrapper>
) { ) {
this._dialogService.openRemoveFromDictionaryDialog($event, annotations, removeFromDictionary, comment => { this._dialogService.openRemoveFromDictionaryDialog($event, annotations, removeFromDictionary, result => {
annotations.forEach(annotation => { annotations.forEach(annotation => {
this._processObsAndEmit( this._processObsAndEmit(
this._manualAnnotationService.removeOrSuggestRemoveAnnotation(annotation, removeFromDictionary, comment), this._manualAnnotationService.removeOrSuggestRemoveAnnotation(annotation, removeFromDictionary, result.comment),
annotation, annotation,
annotationsChanged annotationsChanged
); );

2
libs/common-ui

@ -1 +1 @@
Subproject commit 3625e295161fddd62c6f8f45623279773bbb8a16 Subproject commit 1633911e1339b39f96f243885defec4a92b6e6eb