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

minor ui changes

This commit is contained in:
Diamantis Tziotzios 2024-04-02 21:23:59 +03:00
parent 2bad85019b
commit fcc3dd7609
6 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts
View File

@ -75,12 +75,6 @@ export class EnumUtils {
} }
} }
toDmpBlueprintTypeString(type: DmpBlueprintType): string {
switch (type) {
case DmpBlueprintType.Input: return this.language.instant('TYPES.DMP-PROFILE-FIELD.TYPE.INPUT');
}
}
toDmpStatusString(status: DmpStatus): string { toDmpStatusString(status: DmpStatus): string {
switch (status) { switch (status) {
case DmpStatus.Draft: return this.language.instant('TYPES.DMP.DRAFT'); case DmpStatus.Draft: return this.language.instant('TYPES.DMP.DRAFT');

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

@ -288,7 +288,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div *ngIf="section.get('hasTemplates').value == true" class="col-lg-6 col-12"> <div *ngIf="section.get('hasTemplates').value == true" class="col-12">
<mat-form-field class="w-100 mt-3"> <mat-form-field class="w-100 mt-3">
<mat-label>{{'DMP-BLUEPRINT-EDITOR.FIELDS.PREFILLING-SOURCES' | translate}}</mat-label> <mat-label>{{'DMP-BLUEPRINT-EDITOR.FIELDS.PREFILLING-SOURCES' | translate}}</mat-label>
<app-multiple-auto-complete [formControl]="section.get('prefillingSourcesIds')" [configuration]="prefillingSourceService.multipleAutocompleteConfiguration"></app-multiple-auto-complete> <app-multiple-auto-complete [formControl]="section.get('prefillingSourcesIds')" [configuration]="prefillingSourceService.multipleAutocompleteConfiguration"></app-multiple-auto-complete>

8
dmp-frontend/src/app/ui/auth/login/post-login/post-login.component.html
View File

@ -1,13 +1,13 @@
<div class="tenant-choose-dialog row"> <div class="tenant-choose-dialog row">
<mat-card class="col-md-4 offset-md-4"> <mat-card class="col-md-4 offset-md-4">
<mat-card-header> <mat-card-header>
<h1 mat-card-title> {{'APP.TENANT-CHOOSE-DIALOG.TITLE' | translate}}</h1> <h1 mat-card-title> {{'TENANT-CHOOSE-DIALOG.TITLE' | translate}}</h1>
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<form *ngIf="formGroup" class="dialog-form" (ngSubmit)="formSubmit()" [formGroup]="formGroup"> <form *ngIf="formGroup" class="dialog-form" (ngSubmit)="formSubmit()" [formGroup]="formGroup">
<div class="row"> <div class="row">
<mat-form-field appearance="fill" class="col-md-12"> <mat-form-field appearance="fill" class="col-md-12">
<mat-label>{{'APP.TENANT-CHOOSE-DIALOG.FIELDS.TENANT-CODE' | translate}}</mat-label> <mat-label>{{'TENANT-CHOOSE-DIALOG.FIELDS.TENANT-CODE' | translate}}</mat-label>
<mat-select formControlName="tenantCode"> <mat-select formControlName="tenantCode">
<mat-option *ngFor="let tenant of tenants" [value]="tenant.code"> <mat-option *ngFor="let tenant of tenants" [value]="tenant.code">
{{tenant.code}} {{tenant.code}}
@ -19,8 +19,8 @@
</div> </div>
<div class="col-12 pt-2"> <div class="col-12 pt-2">
<div class="row editor-actions"> <div class="row editor-actions">
<div class="col"><button mat-raised-button color="button" (click)="cancel()" type="button">{{'APP.EDITOR-ACTIONS.BACK' | translate}}</button></div> <div class="col"><button mat-raised-button color="button" (click)="cancel()" type="button">{{'TENANT-CHOOSE-DIALOG.ACTIONS.BACK' | translate}}</button></div>
<div class="col-auto"><button mat-raised-button color="primary" (click)="save($event)" type="primary">{{'APP.TENANT-CHOOSE-DIALOG.ACTIONS.SUBMIT' | translate}}</button></div> <div class="col-auto"><button mat-raised-button color="primary" (click)="save($event)" type="primary">{{'TENANT-CHOOSE-DIALOG.ACTIONS.SUBMIT' | translate}}</button></div>
</div> </div>
</div> </div>
</form> </form>

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

@ -10,7 +10,7 @@
<ng-container *ngIf="!viewOnly else viewOnlyTemplate"> <ng-container *ngIf="!viewOnly else viewOnlyTemplate">
<div *ngIf="isNew" class="description-title">{{'DESCRIPTION-EDITOR.TITLE-ADD-DESCRIPTION' | translate}}</div> <div *ngIf="isNew" class="description-title">{{'DESCRIPTION-EDITOR.TITLE-ADD-DESCRIPTION' | translate}}</div>
<div *ngIf="!isNew" class="description-title">{{'DESCRIPTION-EDITOR.TITLE-EDIT-DESCRIPTION' | translate}}</div> <div *ngIf="!isNew" class="description-title">{{'DESCRIPTION-EDITOR.TITLE-EDIT-DESCRIPTION' | translate}}</div>
<div class="description-subtitle">{{ formGroup.get('label').value }} <span *ngIf="isDirty()" class="description-changes">({{'DESCRIPTION-EDITOR.CHANGES' | translate}})</span></div> <div class="description-subtitle">{{ formGroup.get('label').value }} <span *ngIf="isDirty()" class="description-changes">{{'DESCRIPTION-EDITOR.UNSAVED-CHANGES' | translate}}</span></div>
</ng-container> </ng-container>
<ng-template #viewOnlyTemplate> <ng-template #viewOnlyTemplate>
<div class="description-title">{{'DESCRIPTION-EDITOR.TITLE-PREVIEW-DESCRIPTION' | translate}}</div> <div class="description-title">{{'DESCRIPTION-EDITOR.TITLE-PREVIEW-DESCRIPTION' | translate}}</div>

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

@ -109,16 +109,16 @@ export class SidebarComponent implements OnInit {
if (this.authentication.hasPermission(AppPermission.ViewDmpBlueprintPage)) this.adminItems.routes.push({ path: '/dmp-blueprints', title: 'SIDE-BAR.DMP-BLUEPRINTS', icon: 'library_books' }); if (this.authentication.hasPermission(AppPermission.ViewDmpBlueprintPage)) this.adminItems.routes.push({ path: '/dmp-blueprints', title: 'SIDE-BAR.DMP-BLUEPRINTS', icon: 'library_books' });
if (this.authentication.hasPermission(AppPermission.ViewDescriptionTemplatePage)) this.adminItems.routes.push({ path: '/description-templates', title: 'SIDE-BAR.DESCRIPTION-TEMPLATES', icon: 'description' }); if (this.authentication.hasPermission(AppPermission.ViewDescriptionTemplatePage)) this.adminItems.routes.push({ path: '/description-templates', title: 'SIDE-BAR.DESCRIPTION-TEMPLATES', icon: 'description' });
if (this.authentication.hasPermission(AppPermission.ViewDescriptionTemplateTypePage)) this.adminItems.routes.push({ path: '/description-template-type', title: 'SIDE-BAR.DESCRIPTION-TEMPLATE-TYPES', icon: 'stack' }); if (this.authentication.hasPermission(AppPermission.ViewDescriptionTemplateTypePage)) this.adminItems.routes.push({ path: '/description-template-type', title: 'SIDE-BAR.DESCRIPTION-TEMPLATE-TYPES', icon: 'stack' });
if (this.authentication.hasPermission(AppPermission.ViewEntityLockPage)) this.adminItems.routes.push({ path: '/entity-locks', title: 'SIDE-BAR.ENTITY-LOCKS', icon: 'build' }); if (this.authentication.hasPermission(AppPermission.ViewEntityLockPage)) this.adminItems.routes.push({ path: '/entity-locks', title: 'SIDE-BAR.ENTITY-LOCKS', icon: 'lock_person' });
if (this.authentication.hasPermission(AppPermission.ViewReferencePage)) this.adminItems.routes.push({ path: '/references', title: 'SIDE-BAR.REFERENCES', icon: 'dataset_linked' }); if (this.authentication.hasPermission(AppPermission.ViewReferencePage)) this.adminItems.routes.push({ path: '/references', title: 'SIDE-BAR.REFERENCES', icon: 'dataset_linked' });
if (this.authentication.hasPermission(AppPermission.ViewReferenceTypePage)) this.adminItems.routes.push({ path: '/reference-type', title: 'SIDE-BAR.REFERENCE-TYPES', icon: 'add_link' }); if (this.authentication.hasPermission(AppPermission.ViewReferenceTypePage)) this.adminItems.routes.push({ path: '/reference-type', title: 'SIDE-BAR.REFERENCE-TYPES', icon: 'add_link' });
if (this.authentication.hasPermission(AppPermission.ViewPrefillingSourcePage)) this.adminItems.routes.push({ path: '/prefilling-sources', title: 'SIDE-BAR.PREFILLING-SOURCES', icon: 'add_link' }); if (this.authentication.hasPermission(AppPermission.ViewPrefillingSourcePage)) this.adminItems.routes.push({ path: '/prefilling-sources', title: 'SIDE-BAR.PREFILLING-SOURCES', icon: 'quick_reference_all' });
if (this.authentication.hasPermission(AppPermission.ViewTenantPage)) this.adminItems.routes.push({ path: '/tenants', title: 'SIDE-BAR.TENANTS', icon: 'tenancy' }); if (this.authentication.hasPermission(AppPermission.ViewTenantPage)) this.adminItems.routes.push({ path: '/tenants', title: 'SIDE-BAR.TENANTS', icon: 'tenancy' });
if (this.authentication.hasPermission(AppPermission.ViewUserPage)) this.adminItems.routes.push({ path: '/users', title: 'SIDE-BAR.USERS', icon: 'people' }); if (this.authentication.hasPermission(AppPermission.ViewUserPage)) this.adminItems.routes.push({ path: '/users', title: 'SIDE-BAR.USERS', icon: 'people' });
if (this.authentication.hasPermission(AppPermission.ViewLanguagePage)) this.adminItems.routes.push({ path: '/languages', title: 'SIDE-BAR.LANGUAGES', icon: 'language' }); if (this.authentication.hasPermission(AppPermission.ViewLanguagePage)) this.adminItems.routes.push({ path: '/languages', title: 'SIDE-BAR.LANGUAGES', icon: 'language' });
if (this.authentication.hasPermission(AppPermission.ViewSupportiveMaterialPage)) this.adminItems.routes.push({ path: '/supportive-material', title: 'SIDE-BAR.SUPPORTIVE-MATERIAL', icon: 'dataset_linked' }); if (this.authentication.hasPermission(AppPermission.ViewSupportiveMaterialPage)) this.adminItems.routes.push({ path: '/supportive-material', title: 'SIDE-BAR.SUPPORTIVE-MATERIAL', icon: 'help_center' });
if (this.authentication.hasPermission(AppPermission.ViewNotificationTemplatePage)) this.adminItems.routes.push({ path: '/notification-templates', title: 'SIDE-BAR.NOTIFICATION-TEMPLATES', icon: 'build' }); if (this.authentication.hasPermission(AppPermission.ViewNotificationTemplatePage)) this.adminItems.routes.push({ path: '/notification-templates', title: 'SIDE-BAR.NOTIFICATION-TEMPLATES', icon: 'grid_guides' });
if (this.authentication.hasPermission(AppPermission.ViewNotificationPage)) this.adminItems.routes.push({ path: '/notifications', title: 'SIDE-BAR.NOTIFICATIONS', icon: 'build' }); if (this.authentication.hasPermission(AppPermission.ViewNotificationPage)) this.adminItems.routes.push({ path: '/notifications', title: 'SIDE-BAR.NOTIFICATIONS', icon: 'notifications' });
if (this.authentication.hasPermission(AppPermission.ViewMaintenancePage)) this.adminItems.routes.push({ path: '/index-managment', title: 'SIDE-BAR.MAINTENANCE', icon: 'build' }); if (this.authentication.hasPermission(AppPermission.ViewMaintenancePage)) this.adminItems.routes.push({ path: '/index-managment', title: 'SIDE-BAR.MAINTENANCE', icon: 'build' });
this.groupMenuItems.push(this.adminItems); this.groupMenuItems.push(this.adminItems);

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

@ -670,6 +670,7 @@
"TITLE-EDIT-DESCRIPTION": "Editing Description", "TITLE-EDIT-DESCRIPTION": "Editing Description",
"TITLE-PREVIEW-DESCRIPTION": "Previewing Description", "TITLE-PREVIEW-DESCRIPTION": "Previewing Description",
"TO-DMP": "Previewing Description", "TO-DMP": "Previewing Description",
"UNSAVED-CHANGES": "(unsaved changes)",
"DMP": "Plan", "DMP": "Plan",
"TOC": { "TOC": {
"TITLE": "Guide steps", "TITLE": "Guide steps",
@ -1464,6 +1465,16 @@
"EXTERNAL-SOURCE": "Source", "EXTERNAL-SOURCE": "Source",
"INTERNAL-SOURCE": "Not bind with source" "INTERNAL-SOURCE": "Not bind with source"
}, },
"TENANT-CHOOSE-DIALOG": {
"TITLE": "Please select your Tenant",
"FIELDS": {
"TENANT-CODE": "Tenant"
},
"ACTIONS": {
"BACK": "Back",
"SUBMIT": "Submit"
}
},
"TYPES": { "TYPES": {
"ANNOTATION-PROTECTION-TYPE": { "ANNOTATION-PROTECTION-TYPE": {
"PRIVATE": "Hidden", "PRIVATE": "Hidden",