Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@project-sunbird/sunbird-epub-player-v9": "5.2.1",
"@project-sunbird/sunbird-pdf-player-v9": "5.1.1",
"@project-sunbird/sunbird-quml-player-v9": "5.0.2",
"@project-sunbird/sunbird-sdk": "7.0.13",
"@project-sunbird/sunbird-sdk": "7.0.14",
"@project-sunbird/sunbird-video-player-web-component": "^1.0.1",
"chart.js": "^2.9.4",
"chartjs-plugin-datalabels": "^0.7.0",
Expand Down
2 changes: 1 addition & 1 deletion src/app/content-details/content-details.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
<div class="sb-content-info-heading">
{{content?.description}}</div>
<div class="sb-info" *ngFor="let category of contentCategories">
<div class="sb-content-title" *ngIf="content?.contentData[category.code]">{{category.label}}</div>
<div class="sb-content-title" *ngIf="content?.contentData[category.code]">{{category.label | translateJson}}</div>
<div class="sb-content-title-data" *ngIf="content?.contentData[category.alterNativeCode]">{{content?.contentData[category.alterNativeCode]}}</div>
<div class="sb-content-title-data" *ngIf="!content?.contentData[category.alterNativeCode]">{{content?.contentData[category.code]}}</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/profile/guest-profile/guest-profile.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ export class GuestProfilePage implements OnInit {
e['value'] = this.categoryDetails[e.identifier]
}
});
this.supportedProfileAttributes = categories.supportedAttributes;
// this.supportedProfileAttributes = categories.supportedAttributes;
}
}).catch(e => console.error(e));
}
Expand Down
18 changes: 15 additions & 3 deletions src/app/search/search.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy, OnTabViewWi
enableSearch = false;
searchInfolVisibility = 'show';
refresh: boolean = false;
frameworkCategory: any;

@ViewChild('contentView', { static: false }) contentView: IonContent;
headerObservable: Subscription;
Expand Down Expand Up @@ -257,10 +258,13 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy, OnTabViewWi
await this.headerService.showHeaderWithHomeButton(['download', 'notification']);
}
this.handleDeviceBackButton();
let frameworkCategory = this.appGlobalService.getCachedFrameworkCategory();
this.getCategoriesKeyForContent(frameworkCategory.id);

let framework = this.appGlobalService.getCachedFrameworkCategory();
let frameworkId = this.profile.syllabus[0] || framework.id;
this.frameworkCategory = framework.value;
this.getCategoriesKeyForContent(frameworkId);
const rootOrgId = this.onboardingConfigurationService.getAppConfig().overriddenDefaultChannelId;
this.searchFilterConfig = await this.formAndFrameworkUtilService.getFrameworkCategoryFilter(frameworkCategory.id, {...FormConstants.SEARCH_FILTER, framework: frameworkCategory.id, rootOrgId: rootOrgId});
this.searchFilterConfig = await this.formAndFrameworkUtilService.getFrameworkCategoryFilter(frameworkId, {...FormConstants.SEARCH_FILTER, framework: frameworkId, rootOrgId: rootOrgId});
if ((this.source === PageId.GROUP_DETAIL && this.isFirstLaunch) || this.preAppliedFilter) {
this.isFirstLaunch = false;
await this.handleSearch(true);
Expand Down Expand Up @@ -852,6 +856,14 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy, OnTabViewWi
}
});
});
if (!this.frameworkCategory) {
this.frameworkCategory = await this.formAndFrameworkUtilService.invokedGetFrameworkCategoryList(this.profile.syllabus[0])
}
this.frameworkCategory.forEach((e) => {
if (e.alternative && element.name === e.code) {
element['alternative'] = e.alternative;
}
})
await this.router.navigate(['/filters'], {
state: {
filterCriteria: this.responseData.filterCriteria,
Expand Down