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

no message

This commit is contained in:
Diamantis Tziotzios 2024-03-27 10:55:49 +02:00
parent 55361e6a60
commit 1d5403fc25
5 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/core/services/auth/auth.service.ts
View File

@ -301,7 +301,7 @@ export class AuthService extends BaseService {
onAuthenticateSuccess(returnUrl: string): void { onAuthenticateSuccess(returnUrl: string): void {
this.authState(true); this.authState(true);
this.uiNotificationService.snackBarNotification( this.uiNotificationService.snackBarNotification(
this.language.instant('COMMONS.SNACK-BAR.SUCCESSFUL-LOGIN'), this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-LOGIN'),
SnackBarNotificationLevel.Success SnackBarNotificationLevel.Success
); );
this.zone.run(() => this.router.navigate([returnUrl])); this.zone.run(() => this.router.navigate([returnUrl]));

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

@ -34,15 +34,15 @@
<mat-menu #exportMenu="matMenu" xPosition="before"> <mat-menu #exportMenu="matMenu" xPosition="before">
<button mat-menu-item (click)="downloadPDF(formGroup.get('id').value)"> <button mat-menu-item (click)="downloadPDF(formGroup.get('id').value)">
<i class="fa fa-file-pdf-o pr-2"></i> <i class="fa fa-file-pdf-o pr-2"></i>
<span>{{'GENERAL.FILE-TRANSFOMER.PDF' | translate}}</span> <span>{{'GENERAL.FILE-TRANSFORMER.PDF' | translate}}</span>
</button> </button>
<button mat-menu-item (click)="downloadDOCX(formGroup.get('id').value)"> <button mat-menu-item (click)="downloadDOCX(formGroup.get('id').value)">
<i class="fa fa-file-word-o pr-2"></i> <i class="fa fa-file-word-o pr-2"></i>
<span>{{'GENERAL.FILE-TRANSFOMER.DOC' | translate}}</span> <span>{{'GENERAL.FILE-TRANSFORMER.DOCX' | translate}}</span>
</button> </button>
<button mat-menu-item (click)="downloadXML(formGroup.get('id').value)"> <button mat-menu-item (click)="downloadXML(formGroup.get('id').value)">
<i class="fa fa-file-code-o pr-2"></i> <i class="fa fa-file-code-o pr-2"></i>
<span>{{'GENERAL.FILE-TRANSFOMER.XML' | translate}}</span> <span>{{'GENERAL.FILE-TRANSFORMER.XML' | translate}}</span>
</button> </button>
</mat-menu> </mat-menu>
</div> </div>

30
dmp-frontend/src/app/ui/description/editor/description-editor.model.ts
View File

@ -431,23 +431,19 @@ export class DescriptionFieldEditorModel implements DescriptionFieldPersist {
this.dateValue = item.dateValue; this.dateValue = item.dateValue;
// this.reference = descriptionReferences?.find(x => x.data?.fieldId == descriptionTemplateField?.id && x.isActive == IsActive.Active)?.reference; // this.reference = descriptionReferences?.find(x => x.data?.fieldId == descriptionTemplateField?.id && x.isActive == IsActive.Active)?.reference;
if(descriptionReferences){ this.references = descriptionReferences?.filter(x => x.data?.fieldId == descriptionTemplateField?.id && x.isActive == IsActive.Active).map(x => {
descriptionReferences.forEach(descriptionReference => { return {
if(descriptionReference.data.fieldId == descriptionTemplateField?.id && descriptionReference.isActive == IsActive.Active){ id: x.reference.id,
this.references.push({ label: x.reference.label,
id: descriptionReference.reference.id, reference: x.reference.reference,
label: descriptionReference.reference.label, source: x.reference.source,
reference: descriptionReference.reference.reference, typeId: x.reference.type.id,
source: descriptionReference.reference.source, description: x.reference.source,
typeId: null, definition: x.reference.definition,
description: descriptionReference.reference.source, abbreviation: x.reference.abbreviation,
definition: descriptionReference.reference.definition, sourceType: x.reference.sourceType
abbreviation: descriptionReference.reference.abbreviation, }
sourceType: descriptionReference.reference.sourceType });
})
}
})
}
this.externalIdentifier = new DescriptionExternalIdentifierEditorModel(this.validationErrorModel).fromModel(item.externalIdentifier); this.externalIdentifier = new DescriptionExternalIdentifierEditorModel(this.validationErrorModel).fromModel(item.externalIdentifier);
} }
return this; return this;

2
dmp-frontend/src/app/ui/inapp-notification/editor/inapp-notification-editor.component.ts
View File

@ -121,7 +121,7 @@ export class InAppNotificationEditorComponent extends BaseComponent implements O
} }
onCallbackSuccess(data?: any): void { onCallbackSuccess(data?: any): void {
// this.uiNotificationService.snackBarNotification(this.language.instant('COMMONS.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success); // this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success);
// this.router.navigate(['/mine-notifications']); // this.router.navigate(['/mine-notifications']);
} }

2
dmp-frontend/src/common/base/base-editor.ts
View File

@ -109,7 +109,7 @@ export abstract class BaseEditor<EditorModelType extends BaseEditorModel, Entity
console.log("Success:", data); console.log("Success:", data);
this.uiNotificationService.snackBarNotification(this.isNew ? this.language.instant('COMMONS.SNACK-BAR.SUCCESSFUL-CREATION') : this.language.instant('COMMONS.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success); this.uiNotificationService.snackBarNotification(this.isNew ? this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-CREATION') : this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success);
this.refreshOnNavigateToData(data ? data.id : null); this.refreshOnNavigateToData(data ? data.id : null);
} }