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

Fixed isActive check

Browse Source
This commit is contained in:
Adina Țeudan 2022-02-23 17:02:35 +02:00
parent 280c7903e9
commit 670e19f98e
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
View File

@ -158,13 +158,13 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
}
#getForm(): FormGroup {
const formFieldWithArchivedCheck = value => ({ value, disabled: !!this.dossier.archivedTime });
const formFieldWithArchivedCheck = value => ({ value, disabled: !this.dossier.isActive });
return this._formBuilder.group({
dossierName: [formFieldWithArchivedCheck(this.dossier.dossierName), Validators.required],
dossierTemplateId: [
{
value: this.dossier.dossierTemplateId,
disabled: this._dossierStatsService.get(this.dossier.dossierId).hasFiles || !!this.dossier.archivedTime,
disabled: this._dossierStatsService.get(this.dossier.dossierId).hasFiles || !this.dossier.isActive,
},
Validators.required,
],

8
apps/red-ui/src/app/services/permissions.service.ts
View File

@ -23,11 +23,11 @@ export class PermissionsService {
}
displayReanalyseBtn(dossier: Dossier): boolean {
return !dossier.archivedTime && this.isApprover(dossier);
return dossier.isActive && this.isApprover(dossier);
}
canUploadFiles(dossier: Dossier): boolean {
return !dossier.archivedTime;
return dossier.isActive;
}
canEditFileAttributes(file: File): boolean {
@ -145,8 +145,8 @@ export class PermissionsService {
return dossier.ownerId === this._userService.currentUser.id;
}
canArchiveDossier(dossier: IDossier): boolean {
return !dossier.archivedTime && dossier.ownerId === this._userService.currentUser.id;
canArchiveDossier(dossier: Dossier): boolean {
return dossier.isActive && dossier.ownerId === this._userService.currentUser.id;
}
canEditDossier(dossier: Dossier, user = this._userService.currentUser): boolean {

6
libs/red-domain/src/lib/dossiers/dossier.model.ts
View File

@ -1,6 +1,6 @@
import { IListable, List } from '@iqser/common-ui';
import { IDossier } from './dossier';
import { DossierStatus } from './types';
import { DossierStatus, DossierStatuses } from './types';
import { DownloadFileType } from '../shared';
export class Dossier implements IDossier, IListable {
@ -60,6 +60,10 @@ export class Dossier implements IDossier, IListable {
return this.dossierName;
}
get isActive(): boolean {
return this.status === DossierStatuses.ACTIVE;
}
hasMember(memberId: string): boolean {
return !!this.memberIds && this.memberIds.indexOf(memberId) >= 0;
}

1
libs/red-domain/src/lib/dossiers/types.ts
View File

@ -1,6 +1,7 @@
export const DossierStatuses = {
ACTIVE: 'ACTIVE',
DELETED: 'DELETED',
ARCHIVED: 'ARCHIVED',
} as const;
export type DossierStatus = keyof typeof DossierStatuses;