From c24923b4296d491e9b230dd442649fdcfc5970a9 Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Date: Fri, 6 Oct 2023 09:05:32 -0600 Subject: [PATCH] Enable Sort Togglz For Professional & Educational activities --- .../affiliation-stacks-groups.component.html | 4 ++-- .../affiliation-stacks-groups.component.ts | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) 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 4b8b51ebda..a0d613da9e 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 @@ -86,7 +86,7 @@ [(expandedContent)]="expandedContent['EDUCATION_AND_QUALIFICATION']" (expandedContentChange)="expandedContentChange.emit(expandedContent)" [isPublicRecord]="isPublicRecord" - [sortTypes]="['title', 'start', 'end', 'source']" + [sortTypes]="educationAndQualification" [sortType]="'end'" (sort)="sortEvent($event, 'EDUCATION_AND_QUALIFICATION')" id="cy-affiliation-education-and-qualification" @@ -289,7 +289,7 @@ [(expandedContent)]="expandedContent['PROFESSIONAL_ACTIVITIES']" (expandedContentChange)="expandedContentChange.emit(expandedContent)" [isPublicRecord]="isPublicRecord" - [sortTypes]="['title', 'type', 'start', 'end', 'source']" + [sortTypes]="professionalActivitiesSortTypes" (sort)="sortEvent($event, 'PROFESSIONAL_ACTIVITIES')" [professionalActivitiesTogglz]="professionalActivitiesTogglz" id="cy-affiliation-professional-activities" diff --git a/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.ts b/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.ts index 46ffd5cd59..fff24b7966 100644 --- a/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.ts +++ b/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.ts @@ -55,7 +55,8 @@ export class AffiliationStacksGroupsComponent implements OnInit { expandedContentChange: EventEmitter = new EventEmitter() professionalActivitiesTogglz = false sortTypes: SortOrderType[] = ['title', 'start', 'end'] - + professionalActivitiesSortTypes: SortOrderType[] = ['title', 'type', 'start', 'end'] + educationAndQualification: SortOrderType[] = ['title', 'start', 'end'] constructor( private _record: RecordService, private _recordAffiliationService: RecordAffiliationService, @@ -73,6 +74,8 @@ export class AffiliationStacksGroupsComponent implements OnInit { .subscribe((sourceSortingTogglz: boolean) => { if (sourceSortingTogglz) { this.sortTypes.push('source') + this.professionalActivitiesSortTypes.push('source') + this.educationAndQualification.push('source') } }) this.$loading = this._recordAffiliationService.$loading