1. refactor description 2. translations

This commit is contained in:
CITE\spapacharalampous 2024-08-13 14:57:47 +03:00
parent af930d9c73
commit 3b1c5681e3
15 changed files with 69 additions and 47 deletions

View File

@ -34,7 +34,7 @@
</div>
<div *ngIf="isLocked" class="col-auto"><span>.</span></div>
<div class="col-auto d-flex mr-2" [class.deleted-item]="!isActive">
{{isActive ? 'DESCRIPTION-OVERVIEW.EDITED' : 'DESCRIPTION-OVERVIEW.DELETED' | translate}} :
{{(isActive ? 'DESCRIPTION-OVERVIEW.EDITED' : 'DESCRIPTION-OVERVIEW.DELETED') | translate}} :
{{description.updatedAt | dateTimeFormatter: "d MMMM y"}}
</div>
<div *ngIf="description.status === descriptionStatusEnum.Finalized" class="col-auto d-flex">

View File

@ -53,7 +53,7 @@ import { RouterUtilsService } from '@app/core/services/router/router-utils.servi
})
export class DescriptionOverviewComponent extends BaseComponent implements OnInit {
description: any | Description | PublicDescription;
description: Description | PublicDescription;
researchers: PlanReference[] = [];
isNew = true;
isFinalized = false;
@ -204,7 +204,7 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni
}
get isActive(): boolean {
return this.description && this.description.isActive === IsActive.Active;
return this.description && this.description.isActive != IsActive.Inactive;
}
get unauthorizedTootipText(): string {
@ -276,7 +276,7 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni
data: {
planId: this.description.plan.id,
planName: this.description.plan.label,
blueprint: this.description.plan.blueprint
blueprint: this.isPublicView ? null : (this.description?.plan as Plan)?.blueprint,
}
});
}
@ -362,7 +362,9 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni
getSectionNameById(sectionId: Guid): string {
if (sectionId == null) return '';
let sections: PlanBlueprintDefinitionSection[] = this.description?.plan?.blueprint?.definition?.sections?.filter((section: PlanBlueprintDefinitionSection) => sectionId === section.id);
const blueprint = this.isPublicView ? null : (this.description?.plan as Plan)?.blueprint;
let sections: PlanBlueprintDefinitionSection[] = blueprint?.definition?.sections?.filter((section: PlanBlueprintDefinitionSection) => sectionId === section.id);
return sections == null ? '' : sections[0].label;
}

View File

@ -782,6 +782,7 @@
"LOCKED": "Blokeatuta",
"VERSION": "Version",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"GRANT": "Diru-laguntza",
"DESCRIPTION": "Description",
@ -833,6 +834,7 @@
"PUBLIC": "Public",
"LOCKED": "Locked",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"PART-OF": "Part of",
"GRANT": "Grant",

View File

@ -782,6 +782,7 @@
"LOCKED": "Locked",
"VERSION": "Version",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"GRANT": "Förderung",
"DESCRIPTION": "Description",
@ -833,6 +834,7 @@
"PUBLIC": "Public",
"LOCKED": "Locked",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"PART-OF": "Part of",
"GRANT": "Grant",

View File

@ -782,6 +782,7 @@
"LOCKED": "Bloqueado",
"VERSION": "Version",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"GRANT": "Subvención",
"DESCRIPTION": "Description",
@ -833,6 +834,7 @@
"PUBLIC": "Public",
"LOCKED": "Locked",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"PART-OF": "Part of",
"GRANT": "Grant",

View File

@ -782,6 +782,7 @@
"LOCKED": "Κλειδωμένο",
"VERSION": "Version",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"GRANT": "Επιχορήγηση",
"DESCRIPTION": "Description",
@ -833,6 +834,7 @@
"PUBLIC": "Public",
"LOCKED": "Locked",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"PART-OF": "Part of",
"GRANT": "Grant",

View File

@ -782,6 +782,7 @@
"LOCKED": "Zaključano",
"VERSION": "Version",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"GRANT": "Potpora",
"DESCRIPTION": "Description",
@ -833,6 +834,7 @@
"PUBLIC": "Public",
"LOCKED": "Locked",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"PART-OF": "Part of",
"GRANT": "Grant",

View File

@ -782,6 +782,7 @@
"LOCKED": "Zablokowany",
"VERSION": "Version",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"GRANT": "Dotacja",
"DESCRIPTION": "Description",
@ -833,6 +834,7 @@
"PUBLIC": "Public",
"LOCKED": "Locked",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"PART-OF": "Part of",
"GRANT": "Grant",

View File

@ -782,6 +782,7 @@
"LOCKED": "Bloqueado",
"VERSION": "Version",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"GRANT": "Grant",
"DESCRIPTION": "Description",
@ -833,6 +834,7 @@
"PUBLIC": "Public",
"LOCKED": "Locked",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"PART-OF": "Part of",
"GRANT": "Grant",

View File

@ -782,6 +782,7 @@
"LOCKED": "Zamknuté",
"VERSION": "Version",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"GRANT": "Grant",
"DESCRIPTION": "Description",
@ -833,6 +834,7 @@
"PUBLIC": "Public",
"LOCKED": "Locked",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"PART-OF": "Part of",
"GRANT": "Grant",

View File

@ -782,6 +782,7 @@
"LOCKED": "Zaključano",
"VERSION": "Version",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"GRANT": "Grant",
"DESCRIPTION": "Description",
@ -833,6 +834,7 @@
"PUBLIC": "Public",
"LOCKED": "Locked",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"PART-OF": "Part of",
"GRANT": "Grant",

View File

@ -782,6 +782,7 @@
"LOCKED": "Kilitli",
"VERSION": "Version",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"GRANT": "Hibe",
"DESCRIPTION": "Description",
@ -833,6 +834,7 @@
"PUBLIC": "Public",
"LOCKED": "Locked",
"EDITED": "Edited",
"DELETED": "Deleted",
"FINALISED": "Finalized",
"PART-OF": "Part of",
"GRANT": "Grant",