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

RED-1474

Browse Source
This commit is contained in:
Adina Țeudan 2021-06-03 14:19:11 +03:00
parent db6e1f4f52
commit 3ab2e93d32
2 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts
View File

@ -23,26 +23,31 @@ export class AddDossierDialogComponent {
public dialogRef: MatDialogRef<AddDossierDialogComponent>
) {
this._filterInvalidDossierTemplates();
this.dossierForm = this._formBuilder.group({
dossierName: [null, Validators.required],
dossierTemplateId: [null, Validators.required],
downloadFileTypes: [null],
reportTypes: [null, Validators.required],
description: [null],
dueDate: [null]
});
this.dossierForm = this._formBuilder.group(
{
dossierName: [null, Validators.required],
dossierTemplateId: [null, Validators.required],
downloadFileTypes: [null],
reportTypes: [null],
description: [null],
dueDate: [null]
},
{
validators: control =>
control.value.reportTypes?.length > 0 ||
control.value.downloadFileTypes?.length > 0
? null
: { downloadPackage: true }
}
);
}
get reportTypesLength() {
return this.dossierForm.controls['reportTypes']?.value?.length
? this.dossierForm.controls['reportTypes'].value.length
: 0;
return this.dossierForm.controls['reportTypes']?.value?.length || 0;
}
get downloadFileTypesLength() {
return this.dossierForm.controls['downloadFileTypes']?.value?.length
? this.dossierForm.controls['downloadFileTypes'].value.length
: 0;
return this.dossierForm.controls['downloadFileTypes']?.value?.length || 0;
}
get disabled() {

27
apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts
View File

@ -1,6 +1,6 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { DossierTemplateModel } from '@redaction/red-ui-http';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { FormBuilder, FormGroup } from '@angular/forms';
import { AppStateService } from '../../../../../state/app-state.service';
import { DossierWrapper } from '../../../../../state/model/dossier.wrapper';
import { EditDossierSectionInterface } from '../edit-dossier-section.interface';
@ -25,15 +25,11 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS
) {}
get reportTypesLength() {
return this.dossierForm.controls['reportTypes']?.value?.length
? this.dossierForm.controls['reportTypes'].value.length
: 0;
return this.dossierForm.controls['reportTypes']?.value?.length || 0;
}
get downloadFileTypesLength() {
return this.dossierForm.controls['downloadFileTypes']?.value?.length
? this.dossierForm.controls['downloadFileTypes'].value.length
: 0;
return this.dossierForm.controls['downloadFileTypes']?.value?.length || 0;
}
get changed() {
@ -62,10 +58,19 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS
}
ngOnInit() {
this.dossierForm = this._formBuilder.group({
reportTypes: [this.dossierWrapper.dossier.reportTypes, Validators.required],
downloadFileTypes: [this.dossierWrapper.dossier.downloadFileTypes]
});
this.dossierForm = this._formBuilder.group(
{
reportTypes: [this.dossierWrapper.dossier.reportTypes],
downloadFileTypes: [this.dossierWrapper.dossier.downloadFileTypes]
},
{
validators: control =>
control.value.reportTypes?.length > 0 ||
control.value.downloadFileTypes?.length > 0
? null
: { downloadPackage: true }
}
);
}
async save() {