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

remove unnecessary event emmiters and move open dialog in dossier stats

Browse Source
This commit is contained in:
Dan Percic 2021-11-17 18:26:44 +02:00
parent ef50bdc366
commit 56241eba6b
4 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html
View File

@ -23,8 +23,8 @@
[tooltip]="'dossier-details.edit-owner' | translate"
class="ml-14"
icon="iqser:edit"
tooltipPosition="below"
iqserHelpMode="edit-dossier-owner"
tooltipPosition="below"
></iqser-circle-button>
</ng-container>
</div>
@ -33,7 +33,7 @@
<div class="mt-16">
<div class="all-caps-label" translate="dossier-details.members"></div>
<redaction-team-members
(openAssignDossierMembersDialog)="openAssignDossierMembersDialog.emit()"
(openAssignDossierMembersDialog)="openEditDossierDialog(dossier, 'members')"
[memberIds]="dossier.memberIds"
[perLine]="9"
></redaction-team-members>
@ -66,7 +66,7 @@
<div [class.mt-24]="!stats.hasFiles" class="pb-32">
<redaction-dossier-details-stats
(openDossierDictionaryDialog)="openDossierDictionaryDialog.emit()"
(openDossierDictionaryDialog)="openEditDossierDialog(dossier, 'dossierDictionary')"
[dossierAttributes]="dossierAttributes"
[dossier]="dossier"
></redaction-dossier-details-stats>

11
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts
View File

@ -12,6 +12,7 @@ import { ActivatedRoute } from '@angular/router';
import { Observable } from 'rxjs';
import { DossierStatsService } from '@services/entity-services/dossier-stats.service';
import { pluck, switchMap } from 'rxjs/operators';
import { DossiersDialogService } from '../../../../services/dossiers-dialog.service';
@Component({
selector: 'redaction-dossier-details',
@ -22,8 +23,6 @@ import { pluck, switchMap } from 'rxjs/operators';
export class DossierDetailsComponent {
editingOwner = false;
@Input() dossierAttributes: DossierAttributeWithValue[];
@Output() readonly openAssignDossierMembersDialog = new EventEmitter();
@Output() readonly openDossierDictionaryDialog = new EventEmitter();
@Output() readonly toggleCollapse = new EventEmitter();
collapseTooltip = _('dossier-details.collapse');
expandTooltip = _('dossier-details.expand');
@ -43,6 +42,7 @@ export class DossierDetailsComponent {
private readonly _userService: UserService,
private readonly _dossierStatsService: DossierStatsService,
private readonly _toaster: Toaster,
private readonly _dialogService: DossiersDialogService,
activatedRoute: ActivatedRoute,
) {
this.dossierId = activatedRoute.snapshot.paramMap.get('dossierId');
@ -77,4 +77,11 @@ export class DossierDetailsComponent {
const dossierName = dossier.dossierName;
this._toaster.info(_('assignment.owner'), { params: { ownerName, dossierName } });
}
openEditDossierDialog(dossier: Dossier, section: string): void {
const data = { dossierId: this.dossierId, section };
this._dialogService.openDialog('editDossier', null, data, async () => {
await this.appStateService.getFiles(dossier);
});
}
}

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

@ -46,8 +46,6 @@
<div [class.collapsed]="collapsedDetails" class="right-container" iqserHasScrollbar>
<redaction-dossier-details
(openAssignDossierMembersDialog)="openAssignDossierMembersDialog()"
(openDossierDictionaryDialog)="openDossierDictionaryDialog()"
(toggleCollapse)="collapsedDetails = !collapsedDetails"
[dossierAttributes]="dossierAttributes"
></redaction-dossier-details>

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

@ -20,7 +20,6 @@ import * as moment from 'moment';
import { Observable, timer } from 'rxjs';
import { switchMap, tap } from 'rxjs/operators';
import { convertFiles, Files, handleFileDrop } from '@utils/index';
import { DossiersDialogService } from '../../../services/dossiers-dialog.service';
import {
CircleButtonTypes,
DefaultListingServices,
@ -84,7 +83,6 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
private readonly _dossiersService: DossiersService,
private readonly _dossierTemplatesService: DossierTemplatesService,
private readonly _appConfigService: AppConfigService,
private readonly _dialogService: DossiersDialogService,
private readonly _fileUploadService: FileUploadService,
private readonly _statusOverlayService: StatusOverlayService,
private readonly _fileDropOverlayService: FileDropOverlayService,
@ -148,7 +146,10 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
this.addSubscription = this._fileMapService
.get$(this.dossierId)
.pipe(tap(files => this.entitiesService.setEntities(files)))
.pipe(
tap(files => this.entitiesService.setEntities(files)),
tap(() => this._computeAllFilters()),
)
.subscribe();
this._fileDropOverlayService.initFileDropHandling();
@ -224,20 +225,6 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
(this._fileInput as any).nativeElement.value = null;
}
openAssignDossierMembersDialog(): void {
const data = { dossierId: this.dossierId, section: 'members' };
this._dialogService.openDialog('editDossier', null, data, async () => {
await this.reloadFiles();
});
}
openDossierDictionaryDialog() {
const data = { dossierId: this.dossierId, section: 'dossierDictionary' };
this._dialogService.openDialog('editDossier', null, data, async () => {
await this.reloadFiles();
});
}
recentlyModifiedChecker = (file: File) =>
moment(file.lastUpdated).add(this._appConfigService.values.RECENT_PERIOD_IN_HOURS, 'hours').isAfter(moment());