Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

9395-qa-all-activity-items-have-space-for-a-type-icon #2349

Merged
merged 3 commits into from
Sep 11, 2024
Merged

9395-qa-all-activity-items-have-space-for-a-type-icon #2349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4fb201
9395-qa-all-activity-items-have-space-for-a-type-icon
leomendoza123 Sep 11, 2024
982bf2d
9395-qa-all-activity-items-have-space-for-a-type-icon
leomendoza123 Sep 11, 2024
20cc5e5
Merge branch 'main' into lmendoza/9395-qa-all-activity-items-have-spa…
amontenegro Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions src/app/record/components/affiliation-stack/affiliation-stack.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,23 @@
[panelTitle]="affiliation.affiliationName.value"
>
<div class="affiliation-title" header>
<mat-icon
class="material-icons-outlined"
*ngIf="type === 'invited-position'"
>join_inner</mat-icon
>
<mat-icon class="material-icons-outlined" *ngIf="type === 'distinction'"
>stars</mat-icon
>
<mat-icon class="material-icons-outlined" *ngIf="type === 'membership'"
>card_membership</mat-icon
>
<mat-icon class="material-icons-outlined" *ngIf="type === 'service'"
>badge</mat-icon
>
<div class="vl"></div>
<ng-container *ngIf="professionalActivities">
<mat-icon
class="material-icons-outlined"
*ngIf="type === 'invited-position'"
>join_inner</mat-icon
>
<mat-icon class="material-icons-outlined" *ngIf="type === 'distinction'"
>stars</mat-icon
>
<mat-icon class="material-icons-outlined" *ngIf="type === 'membership'"
>card_membership</mat-icon
>
<mat-icon class="material-icons-outlined" *ngIf="type === 'service'"
>badge</mat-icon
>
<div class="vl"></div>
</ng-container>
<h4
class="orc-font-body"
[ngClass]="{
Expand Down
1 change: 1 addition & 0 deletions src/app/record/components/affiliation-stack/affiliation-stack.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export class AffiliationStackComponent implements OnInit, OnDestroy {
@Input() isPublicRecord: string = null
@Input() type: AffiliationType
hasExternalIdentifiers: boolean
@Input() professionalActivities: boolean
@Input()
set affiliationStack(value: AffiliationGroup) {
this.hasExternalIdentifiers = !!value.externalIdentifiers.length
Expand Down
1 change: 1 addition & 0 deletions src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
[affiliationStack]="affiliationGroup"
[type]="affiliationGroup.affiliationType | affiliationType"
[userInfo]="userInfo"
[professionalActivities]="true"
></app-affiliation-stack>
</ng-container>
<ng-container
Expand Down
Loading