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

RED-6122: Don't autocomplete current date if not set for file attribute, send proper date string when doing inline edits.

Browse Source
This commit is contained in:
George 2023-02-16 18:49:48 +02:00
parent ea89fc871d
commit cc8481f080
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.ts
View File

@ -4,9 +4,11 @@ import { BaseFormComponent, Toaster } from '@iqser/common-ui';
import { PermissionsService } from '@services/permissions.service'; import { PermissionsService } from '@services/permissions.service';
import { FormBuilder, UntypedFormGroup } from '@angular/forms'; import { FormBuilder, UntypedFormGroup } from '@angular/forms';
import { FileAttributesService } from '@services/entity-services/file-attributes.service'; import { FileAttributesService } from '@services/entity-services/file-attributes.service';
import { BehaviorSubject, firstValueFrom, Observable } from 'rxjs'; import { BehaviorSubject, firstValueFrom } from 'rxjs';
import { FilesService } from '@services/files/files.service'; import { FilesService } from '@services/files/files.service';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import dayjs from 'dayjs';
@Component({ @Component({
selector: 'redaction-file-attribute [fileAttribute] [file] [dossier]', selector: 'redaction-file-attribute [fileAttribute] [file] [dossier]',
templateUrl: './file-attribute.component.html', templateUrl: './file-attribute.component.html',
@ -74,10 +76,17 @@ export class FileAttributeComponent extends BaseFormComponent implements OnInit
} }
async save($event?: MouseEvent): Promise<void> { async save($event?: MouseEvent): Promise<void> {
$event.stopPropagation(); $event?.stopPropagation();
try { try {
const attributeIdToValue = this.form.getRawValue(); const rawFormValue = this.form.getRawValue();
const fileAttributeValue = rawFormValue[this.fileAttribute.id];
const attributeIdToValue = {
...rawFormValue,
[this.fileAttribute.id]: this.isDate
? fileAttributeValue && dayjs(fileAttributeValue).format('YYYY-MM-DD')
: fileAttributeValue,
};
await firstValueFrom( await firstValueFrom(
this._fileAttributesService.setFileAttributes({ attributeIdToValue }, this.file.dossierId, this.file.fileId), this._fileAttributesService.setFileAttributes({ attributeIdToValue }, this.file.dossierId, this.file.fileId),
); );

2
apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.ts
View File

@ -53,7 +53,7 @@ export class DocumentInfoDialogComponent extends BaseDialogComponent implements
const attrValue = this.file.fileAttributes?.attributeIdToValue[attr.id]; const attrValue = this.file.fileAttributes?.attributeIdToValue[attr.id];
return { return {
...acc, ...acc,
[attr.id]: [this._isDate(attr.id) ? dayjs(attrValue).toDate() : attrValue], [attr.id]: [this._isDate(attr.id) ? attrValue && dayjs(attrValue).toDate() : attrValue],
}; };
}, {}), }, {}),
); );