MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Adds error notification on failure email sent, removes funderFormGroup input and get it through grantFormGroup

This commit is contained in:
apapachristou 2019-08-23 18:27:58 +03:00
parent 6ac737e68d
commit 73d776cdc3
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
View File

@ -49,7 +49,7 @@
<mat-icon class="mr-2">work_outline</mat-icon> <mat-icon class="mr-2">work_outline</mat-icon>
{{ 'DMP-LISTING.COLUMNS.GRANT' | translate }} {{ 'DMP-LISTING.COLUMNS.GRANT' | translate }}
</ng-template> </ng-template>
<app-grant-tab [formGroup]="formGroup.get('grant')" [projectFormGroup]="formGroup.get('project')" [funderFormGroup]="formGroup.get('grant').get('funder')" [isNew]="isNew" [isFinalized]="isFinalized"></app-grant-tab> <app-grant-tab [formGroup]="formGroup.get('grant')" [projectFormGroup]="formGroup.get('project')" [isNew]="isNew" [isFinalized]="isFinalized"></app-grant-tab>
</mat-tab> </mat-tab>
<mat-tab *ngIf="!isNew"> <mat-tab *ngIf="!isNew">
<ng-template mat-tab-label> <ng-template mat-tab-label>

10
dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.html
View File

@ -5,7 +5,7 @@
<div class="row"> <div class="row">
<div class="col-6 pb-2 pl-4 pt-4" *ngIf="!isCreateNewFunder"> <div class="col-6 pb-2 pl-4 pt-4" *ngIf="!isCreateNewFunder">
<mat-form-field> <mat-form-field>
<app-single-auto-complete [formControl]="funderFormGroup.get('existFunder')" placeholder="{{'DMP-EDITOR.FIELDS.FUNDER' | translate}}" [configuration]="funderAutoCompleteConfiguration"> <app-single-auto-complete [formControl]="formGroup.get('funder').get('existFunder')" placeholder="{{'DMP-EDITOR.FIELDS.FUNDER' | translate}}" [configuration]="funderAutoCompleteConfiguration">
</app-single-auto-complete> </app-single-auto-complete>
</mat-form-field> </mat-form-field>
</div> </div>
@ -13,10 +13,10 @@
<!-- Create New Funder --> <!-- Create New Funder -->
<div class="col-6 pl-4 pt-4" *ngIf="isCreateNewFunder"> <div class="col-6 pl-4 pt-4" *ngIf="isCreateNewFunder">
<mat-form-field> <mat-form-field>
<input matInput placeholder="{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.FIELDS.FUNDER-LABEL' | translate}}" type="text" name="label" [formControl]="funderFormGroup.get('label')" required> <input matInput placeholder="{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.FIELDS.FUNDER-LABEL' | translate}}" type="text" name="label" [formControl]="formGroup.get('funder').get('label')" required>
<mat-error *ngIf="funderFormGroup.get('label').hasError('backendError')"> <mat-error *ngIf="formGroup.get('funder').get('label').hasError('backendError')">
{{funderFormGroup.get('label').getError('backendError').message}}</mat-error> {{formGroup.get('funder').get('label').getError('backendError').message}}</mat-error>
<mat-error *ngIf="funderFormGroup.get('label').hasError('required')"> <mat-error *ngIf="formGroup.get('funder').get('label').hasError('required')">
{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error> {{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>

18
dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts
View File

@ -20,7 +20,7 @@ export class GrantTabComponent implements OnInit {
@Input() formGroup: FormGroup; @Input() formGroup: FormGroup;
@Input() projectFormGroup: FormGroup; @Input() projectFormGroup: FormGroup;
@Input() funderFormGroup: FormGroup; // @Input() funderFormGroup: FormGroup;
@Input() isNew: boolean; @Input() isNew: boolean;
@Input() isFinalized: boolean; @Input() isFinalized: boolean;
isCreateNew = false; isCreateNew = false;
@ -67,7 +67,7 @@ export class GrantTabComponent implements OnInit {
this.isCreateNew = (this.formGroup.get('label').value != null && this.formGroup.get('label').value.length > 0); this.isCreateNew = (this.formGroup.get('label').value != null && this.formGroup.get('label').value.length > 0);
this.isCreateNewProject = (this.projectFormGroup.get('label').value != null && this.projectFormGroup.get('label').value.length > 0); this.isCreateNewProject = (this.projectFormGroup.get('label').value != null && this.projectFormGroup.get('label').value.length > 0);
this.isCreateNewFunder = (this.funderFormGroup.get('label').value != null && this.funderFormGroup.get('label').value.length > 0); this.isCreateNewFunder = (this.formGroup.get('funder').get('label').value != null && this.formGroup.get('funder').get('label').value.length > 0);
this.setValidators(); this.setValidators();
this.setProjectValidators(); this.setProjectValidators();
this.setFunderValidators(); this.setFunderValidators();
@ -149,16 +149,16 @@ export class GrantTabComponent implements OnInit {
setFunderValidators() { setFunderValidators() {
if (this.isCreateNewFunder) { if (this.isCreateNewFunder) {
this.funderFormGroup.get('existFunder').disable(); this.formGroup.get('funder').get('existFunder').disable();
this.funderFormGroup.get('label').enable(); this.formGroup.get('funder').get('label').enable();
} else if (this.isFinalized) { } else if (this.isFinalized) {
this.funderFormGroup.get('existFunder').disable(); this.formGroup.get('funder').get('existFunder').disable();
this.funderFormGroup.get('label').disable(); this.formGroup.get('funder').get('label').disable();
} }
else { else {
this.funderFormGroup.get('existFunder').enable(); this.formGroup.get('funder').enable();
this.funderFormGroup.get('label').disable(); this.formGroup.get('funder').get('label').disable();
this.funderFormGroup.get('label').reset(); this.formGroup.get('funder').get('label').reset();
} }
} }

1
dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts
View File

@ -68,6 +68,7 @@ export class SidebarFooterComponent extends BaseComponent implements OnInit {
onCallbackError(errorResponse: any) { onCallbackError(errorResponse: any) {
this.setErrorModel(errorResponse.error); this.setErrorModel(errorResponse.error);
this.validateAllFormFields(this.formGroup); this.validateAllFormFields(this.formGroup);
this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.UNSUCCESSFUL-EMAIL-SEND'), SnackBarNotificationLevel.Error);
} }
public setErrorModel(validationErrorModel: ValidationErrorModel) { public setErrorModel(validationErrorModel: ValidationErrorModel) {

3
dmp-frontend/src/assets/i18n/en.json
View File

@ -21,7 +21,8 @@
"UNSUCCESSFUL-LOGIN": "Unsuccessful Login", "UNSUCCESSFUL-LOGIN": "Unsuccessful Login",
"SUCCESSFUL-DATASET-PROFILE-DELETE": "Successful Delete", "SUCCESSFUL-DATASET-PROFILE-DELETE": "Successful Delete",
"UNSUCCESSFUL-DATASET-PROFILE-DELETE": "This template can not deleted, because Dataset Descriptions are associated with it", "UNSUCCESSFUL-DATASET-PROFILE-DELETE": "This template can not deleted, because Dataset Descriptions are associated with it",
"UNSUCCESSFUL-DELETE": "Unsuccessful Delete" "UNSUCCESSFUL-DELETE": "Unsuccessful Delete",
"UNSUCCESSFUL-EMAIL-SEND": "Failed sending email"
}, },
"ERRORS": { "ERRORS": {
"HTTP-REQUEST-ERROR": "An Unexpected Error Has Occurred" "HTTP-REQUEST-ERROR": "An Unexpected Error Has Occurred"