Skip to content

Issue #ED-4177 fix: Fixed category keys are not displaying in textbook/course #3600

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

Merged
swayangjit merged 1 commit into from
Apr 30, 2024
Merged

Issue #ED-4177 fix: Fixed category keys are not displaying in textbook/course #3600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/app/collection-detail-etb/collection-detail-etb.page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
[showDownloadBtn]="showDownloadBtn"
[isDepthChild]='isDepthChild'
[defaultAppIcon]="defaultAppIcon"
[trackDownloads]="trackDownloads$">
[trackDownloads]="trackDownloads$"
[frameworkCategories]="categories">
</app-detail-card>
<!-- End of the Parent Card -->

Expand Down
2 changes: 1 addition & 1 deletion src/app/components/detail-card/detail-card.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="sb-dt-card">
<app-toc-header [contentData]="contentDetail?.contentData"></app-toc-header>
<app-toc-header [contentData]="contentDetail?.contentData" [frameworkCategories]="frameworkCategories"></app-toc-header>
<div class="sb-dt-content pt-0">
<div class="left">
</div>
Expand Down
1 change: 1 addition & 0 deletions src/app/components/detail-card/detail-card.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export class DetailCardComponent {
@Input() showDownloadBtn: boolean;
@Input() isDepthChild: boolean;
@Input() trackDownloads: Observable<DownloadTracking>;
@Input() frameworkCategories: any;

@Output() downloadAllContent = new EventEmitter();
@Output() showOverflowMenuEvent = new EventEmitter();
Expand Down
17 changes: 4 additions & 13 deletions src/app/components/toc-header/toc-header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,11 @@
<span class="sb-by">{{ 'CONTENT_CREATED_BY' | translate }}</span>
<span class="sb-user">{{ contentData?.owner || contentData?.creator}}</span>
</div>
<div class="sb-dt-class-info" *ngIf="contentData?.gradeLevel || contentData?.subject">
<span *ngIf="contentData?.board">
<span class="sb-dt-label sb-dt-subject">{{contentData?.board}}</span>
<span class="sb-separator-dot"></span>
<div class="sb-dt-class-info">
<span *ngFor="let category of frameworkCategories; let i = index">
<span class="sb-dt-label sb-dt-subject" *ngIf="contentData?.[category.code] || contentData?.[category.alterNativeCode]">{{contentData[category.code] || contentData[category.alterNativeCode]}}</span>
<span class="sb-separator-dot" *ngIf="i < frameworkCategories.length-1 && contentData?.[category.code]"></span>
</span>
<span *ngIf="contentData?.medium">
<span class="sb-dt-label sb-dt-subject">{{contentData?.medium}}</span>
<span class="sb-separator-dot"></span>
</span>
<span *ngIf="contentData?.gradeLevel">
<span class="sb-dt-label sb-dt-subject">{{contentData?.gradeLevel}}</span>
<span class="sb-separator-dot"></span>
</span>
<span class="sb-dt-label sb-dt-subject">{{contentData?.subject | csa}}</span>
</div>
</div>
<div class="right">
Expand Down
1 change: 1 addition & 0 deletions src/app/components/toc-header/toc-header.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { CommonUtilService } from '../../../services/common-util.service';
})
export class TocHeaderComponent {
@Input() contentData: ContentData;
@Input() frameworkCategories: any;

// defaultIcon
defaultAppIcon: string;
Expand Down
2 changes: 1 addition & 1 deletion src/app/enrolled-course-details-page/enrolled-course-details-page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ion-content>
<div class="p-8" *ngIf="!showOfflineSection">
<ion-card class="sb-dt-card">
<app-toc-header [contentData]="course || courseCardData?.content"></app-toc-header>
<app-toc-header [contentData]="course || courseCardData?.content" [frameworkCategories]="categories"></app-toc-header>
<div class="hr-border-bottom"></div>
<ion-card-content class="sb-content-info">
<div *ngIf="isFromGroupFlow">
Expand Down
2 changes: 1 addition & 1 deletion src/app/profile-settings/profile-settings.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
private onboardingConfigurationService: OnboardingConfigurationService
) {
this.defaultFrameworkID = window.history.state.defaultFrameworkID;
this.defaultRootOrgId = window.history.state.rootOrgId || '*';
this.defaultRootOrgId = window.history.state.rootOrgId;
}

async ngOnInit() {
Expand Down