From b477905fa18d9309f14f302d8be75c94c007432d Mon Sep 17 00:00:00 2001 From: Edi Cziszter Date: Sat, 18 Dec 2021 21:44:56 +0200 Subject: [PATCH 1/5] changed placeholder and attributes reload --- .../edit-dossier-attributes.component.html | 16 ++++++++++------ .../src/app/services/user-preference.service.ts | 9 +++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html index 6657b935e..c62035d5b 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html @@ -16,15 +16,19 @@ class="iqser-input-group" > - + > + + - + diff --git a/apps/red-ui/src/app/services/user-preference.service.ts b/apps/red-ui/src/app/services/user-preference.service.ts index ac318c13d..cc89c6b6e 100644 --- a/apps/red-ui/src/app/services/user-preference.service.ts +++ b/apps/red-ui/src/app/services/user-preference.service.ts @@ -68,12 +68,9 @@ export class UserPreferenceService extends GenericService { window.location.reload(); } - reload(): Promise { - return this.getAll() - .toPromise() - .then(attributes => { - this._userAttributes = attributes ?? {}; - }); + async reload(): Promise { + const attributes = await this.getAll().toPromise(); + this._userAttributes = attributes ?? {}; } @Validate() From aa795d12599205f49d76570d6dea55636434b9a3 Mon Sep 17 00:00:00 2001 From: Edi Cziszter Date: Mon, 20 Dec 2021 12:38:49 +0200 Subject: [PATCH 2/5] changed input date format --- .../edit-dossier-attributes.component.ts | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts index bb7541497..1e2ebbc45 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts @@ -7,11 +7,31 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import * as moment from 'moment'; import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'; +import { MomentDateAdapter } from '@angular/material-moment-adapter'; + +export const DATE_FORMATS = { + parse: { + dateInput: 'YYYY-MM-DD', + }, + display: { + dateInput: 'YYYY-MM-DD', + monthYearLabel: 'YYYY', + }, +}; @Component({ selector: 'redaction-edit-dossier-attributes', templateUrl: './edit-dossier-attributes.component.html', styleUrls: ['./edit-dossier-attributes.component.scss'], + providers: [ + { + provide: DateAdapter, + useClass: MomentDateAdapter, + deps: [MAT_DATE_LOCALE], + }, + { provide: MAT_DATE_FORMATS, useValue: DATE_FORMATS }, + ], }) export class EditDossierAttributesComponent implements EditDossierSectionInterface, OnInit { readonly iconButtonTypes = IconButtonTypes; @@ -53,7 +73,10 @@ export class EditDossierAttributesComponent implements EditDossierSectionInterfa } get valid(): boolean { - return this.form.valid; + if (this.form) { + return this.form.valid; + } + return false; } async ngOnInit() { From b6e31f4ce4b99bd5121f5fbf05974aace0db1705 Mon Sep 17 00:00:00 2001 From: Edi Cziszter Date: Mon, 20 Dec 2021 13:18:39 +0200 Subject: [PATCH 3/5] refactored get valid() and removed / from input and img --- .../attributes/edit-dossier-attributes.component.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts index 1e2ebbc45..304ba1219 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts @@ -73,10 +73,7 @@ export class EditDossierAttributesComponent implements EditDossierSectionInterfa } get valid(): boolean { - if (this.form) { - return this.form.valid; - } - return false; + return !!this.form?.valid; } async ngOnInit() { From ca8c4a08f90ed40ad8f1e725844fc40ea0bbd81e Mon Sep 17 00:00:00 2001 From: Edi Cziszter Date: Tue, 21 Dec 2021 20:51:27 +0200 Subject: [PATCH 4/5] trim time from date --- .../edit-dossier-attributes.component.html | 2 +- .../edit-dossier-attributes.component.ts | 24 +++---------------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html index c62035d5b..1cc4516d4 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html @@ -28,7 +28,7 @@ - + diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts index 304ba1219..e22722727 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts @@ -7,31 +7,11 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import * as moment from 'moment'; import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'; -import { MomentDateAdapter } from '@angular/material-moment-adapter'; - -export const DATE_FORMATS = { - parse: { - dateInput: 'YYYY-MM-DD', - }, - display: { - dateInput: 'YYYY-MM-DD', - monthYearLabel: 'YYYY', - }, -}; @Component({ selector: 'redaction-edit-dossier-attributes', templateUrl: './edit-dossier-attributes.component.html', styleUrls: ['./edit-dossier-attributes.component.scss'], - providers: [ - { - provide: DateAdapter, - useClass: MomentDateAdapter, - deps: [MAT_DATE_LOCALE], - }, - { provide: MAT_DATE_FORMATS, useValue: DATE_FORMATS }, - ], }) export class EditDossierAttributesComponent implements EditDossierSectionInterface, OnInit { readonly iconButtonTypes = IconButtonTypes; @@ -86,7 +66,9 @@ export class EditDossierAttributesComponent implements EditDossierSectionInterfa async save(): EditDossierSaveResult { const dossierAttributeList = this.attributes.map(attr => ({ dossierAttributeConfigId: attr.id, - value: this.currentAttrValue(attr), + value: this.isSpecificType(attr, DossierAttributeConfigTypes.DATE) + ? moment(this.currentAttrValue(attr)).format('YYYY-MM-DD') + : this.currentAttrValue(attr), })); try { await this._dossierAttributesService.setAttributes(this.dossier, dossierAttributeList).toPromise(); From 02e14fded84b73b6079c2ed47b9cd6e9fbcce541 Mon Sep 17 00:00:00 2001 From: Edi Cziszter Date: Tue, 21 Dec 2021 21:29:30 +0200 Subject: [PATCH 5/5] update configuration.initializer --- apps/red-ui/src/app/utils/configuration.initializer.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/utils/configuration.initializer.ts b/apps/red-ui/src/app/utils/configuration.initializer.ts index 2f31bef07..2f4bc4faf 100644 --- a/apps/red-ui/src/app/utils/configuration.initializer.ts +++ b/apps/red-ui/src/app/utils/configuration.initializer.ts @@ -1,4 +1,4 @@ -import { catchError, filter, mergeMapTo, switchMap, take, tap } from 'rxjs/operators'; +import { catchError, filter, mergeMap, switchMap, take, tap } from 'rxjs/operators'; import { ConfigService } from '@services/config.service'; import { Title } from '@angular/platform-browser'; import { from, of, throwError } from 'rxjs'; @@ -21,9 +21,10 @@ export function configurationInitializer( filter(event => event.type === KeycloakEventType.OnReady), switchMap(() => from(keycloakService.isLoggedIn())), switchMap(loggedIn => (!loggedIn ? throwError('Not Logged In') : of({}))), - mergeMapTo(generalSettingsService.getGeneralConfigurations()), + mergeMap(() => generalSettingsService.getGeneralConfigurations()), tap(configuration => configService.updateDisplayName(configuration.displayName)), - tap(() => userPreferenceService.reload().then(() => languageService.chooseAndSetInitialLanguage())), + switchMap(() => userPreferenceService.reload()), + tap(() => languageService.chooseAndSetInitialLanguage()), catchError(() => { title.setTitle('RedactManager'); return of({});