diff --git a/src/app/cdk/trusted-summary/component/summary-panel/summary-panel.component.ts b/src/app/cdk/trusted-summary/component/summary-panel/summary-panel.component.ts index c7dbfb64b..41db5c648 100644 --- a/src/app/cdk/trusted-summary/component/summary-panel/summary-panel.component.ts +++ b/src/app/cdk/trusted-summary/component/summary-panel/summary-panel.component.ts @@ -14,7 +14,7 @@ import { ActivitySummary } from 'src/app/types/trust-summary' preserveWhitespaces: true, }) export class SummaryPanelComponent implements OnInit { - @Input() activitySummary: ActivitySummary[] + @Input() activitySummary: ActivitySummary[] @Input() url: string = '' @Input() count: number = 0 @Input() moreLabel: string = '' diff --git a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html index 4242e5f31..235bac471 100644 --- a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html +++ b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html @@ -144,6 +144,36 @@

[activitySection]="'affiliations'" > + + +

+ EMAIL DOMAINS +

+
+ +

KEY DATES @@ -271,6 +301,32 @@

[simpleActivities]="funds" > + + +

+ RESEARCH RESOURCES +

+
+ + +
[activitySection]="'professional-activities'" > + + +

+ EDUCATION AND QUALIFICATIONS +

+
+ +
1 + ? this.labelValidatedResearchResources + : this.labelValidatedResearchResource, + }) + } + if (this.trustedSummary.selfAssertedResearchResources) { + this.researchResoruces.push({ + verified: false, + countA: this.trustedSummary.selfAssertedResearchResources, + stringA: + this.trustedSummary.selfAssertedResearchResources > 1 + ? this.labelSelfAssertedResearchResources + : this.labelSelfAssertedResearchResource, + }) + } + if (this.trustedSummary.selfAssertedFunds) { this.funds.push({ verified: false, @@ -204,6 +247,12 @@ export class TrustedSummaryComponent implements OnInit, OnDestroy { } } ) + this.emailDomains = this.trustedSummary.emailDomains?.map((domain) => { + return { + verified: true, + stringA: domain.value, + } + }) if ( (this.works.length > 0 || @@ -211,7 +260,9 @@ export class TrustedSummaryComponent implements OnInit, OnDestroy { this.peerReviews.length > 0) && (this.externalIdentifiers?.length > 0 || this.trustedSummary.professionalActivitiesCount > 0 || - this.trustedSummary.externalIdentifiers.length > 0) + this.trustedSummary.externalIdentifiers.length > 0 || + this.trustedSummary.externalIdentifiers.length > 0 || + this.researchResoruces.length > 0) ) { this.threeColumns = true } else if ( @@ -219,7 +270,8 @@ export class TrustedSummaryComponent implements OnInit, OnDestroy { this.funds.length > 0 || this.peerReviews.length > 0 || this.externalIdentifiers?.length > 0 || - this.trustedSummary.professionalActivitiesCount > 0 + this.trustedSummary.professionalActivitiesCount > 0 || + this.researchResoruces.length > 0 ) { this.twoColumns = true } else { @@ -230,15 +282,27 @@ export class TrustedSummaryComponent implements OnInit, OnDestroy { ) this.ariaLabelWorks = this.getAriaLabelSection(this.labelViewWorks) this.ariaLabelFundings = this.getAriaLabelSection(this.labelViewFundings) + this.ariaLabelResearchResources = this.getAriaLabelSection( + this.labelViewResearchResources + ) this.ariaLabelPeerReviews = this.getAriaLabelSection( this.labelViewPeerReviews ) this.ariaLabelProfessionalActivities = this.getAriaLabelSection( this.labelViewProfessionalActivities ) + + this.ariaLabelEducationQualificationsActions = this.getAriaLabelSection( + this.labelViewEducationQualificationsActivities + ) + this.ariaLabelIdentifiers = this.getAriaLabelSection( this.labelViewIdentifiers ) + + this.ariaLabelEmailDomains = this.getAriaLabelSection( + this.labelViewDomain + ) }) } dateWithOffset(creation: string): any { diff --git a/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.html b/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.html index f75c16f58..dad742dbc 100644 --- a/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.html +++ b/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.html @@ -60,7 +60,8 @@ -