From 1e3f385d7ffe7965261dd6b0a0ab29e3fd8fa411 Mon Sep 17 00:00:00 2001
From: Nik720 <nikunj.beladiya@tarento.com>
Date: Thu, 5 May 2022 10:15:42 +0530
Subject: [PATCH] Issue #SB-29690 fix: question set ui fixes for toc
---
projects/common-consumption/package.json | 2 +-
.../toc-child-item/toc-child-item.component.html | 9 ++++++++-
.../common-consumption/src/lib/pipes-module/mime-type.ts | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/projects/common-consumption/package.json b/projects/common-consumption/package.json
index 02102a6c..fc65a8b2 100644
--- a/projects/common-consumption/package.json
+++ b/projects/common-consumption/package.json
@@ -1,6 +1,6 @@
{
"name": "@project-sunbird/common-consumption-v9",
- "version": "4.7.1",
+ "version": "4.9.0",
"repository": {
"type": "git",
"url": "git+https://github.com/Sunbird-Ed/SunbirdEd-consumption-ngcomponents.git"
diff --git a/projects/common-consumption/src/lib/content-details/toc-child-item/toc-child-item.component.html b/projects/common-consumption/src/lib/content-details/toc-child-item/toc-child-item.component.html
index 7efd285c..40f4c6ef 100644
--- a/projects/common-consumption/src/lib/content-details/toc-child-item/toc-child-item.component.html
+++ b/projects/common-consumption/src/lib/content-details/toc-child-item/toc-child-item.component.html
@@ -14,12 +14,19 @@
<div *ngIf="childData?.children && !(childData?.contentData?.trackable?.enabled === 'Yes' || childData?.trackable?.enabled === 'Yes')">
<div *ngFor="let child of childData?.children; let j = index;" [id]="child.identifier">
- <div *ngIf="child?.mimeType !== 'application/vnd.sunbird.question'">
+ <div *ngIf="child?.mimeType !== 'application/vnd.sunbird.question' && child?.mimeType !== 'application/vnd.sunbird.questionset'">
{{ createUniqueId(childData, child) }}
<sb-toc-child-item [childData]="child" [activeContent]="activeContent" (tocCardClick)="tocCardClickHandler($event)"
[activeMimeTypeFilter]="activeMimeTypeFilter" [type]="type" [contentStatus]="contentStatus" [playBtnConfig]="playBtnConfig"
(playButtonClick)="onPlayButtonClick($event)" [platform]="platform" [trackableDefaultImage]="trackableDefaultImage">
</sb-toc-child-item>
</div>
+ <div *ngIf="child?.mimeType === 'application/vnd.sunbird.questionset'">
+ <div class="child-content-padding">
+ <sb-toc-card [content]="child" (tocCardClick)="tocCardClickHandler($event)" [type]="type"
+ [contentStatus]="contentStatus" [activeContent]="activeContent" [maxAttempts]="maxAttempts" [scoreLabel]="scoreLabel" [disabled]="disabled">
+ </sb-toc-card>
+ </div>
+ </div>
</div>
</div>
\ No newline at end of file
diff --git a/projects/common-consumption/src/lib/pipes-module/mime-type.ts b/projects/common-consumption/src/lib/pipes-module/mime-type.ts
index 37db7436..0450f47f 100644
--- a/projects/common-consumption/src/lib/pipes-module/mime-type.ts
+++ b/projects/common-consumption/src/lib/pipes-module/mime-type.ts
@@ -10,7 +10,7 @@ export class MimeTypeMasterData {
public static readonly DOCS = ['application/pdf', 'application/epub', 'application/msword'];
public static readonly ALL = ['video/mp4', 'video/x-youtube', 'video/webm', 'application/pdf', 'application/epub',
'application/pdf', 'application/epub', 'application/vnd.ekstep.ecml-archive', 'application/vnd.ekstep.h5p-archive',
- 'application/vnd.ekstep.html-archive', 'audio/mp3', 'audio/mp4', 'audio/mpeg', 'audio/ogg', 'audio/webm', 'audio/x-wav', 'audio/wav'
+ 'application/vnd.ekstep.html-archive','application/vnd.sunbird.questionset', 'audio/mp3', 'audio/mp4', 'audio/mpeg', 'audio/ogg', 'audio/webm', 'audio/x-wav', 'audio/wav'
];
}
--
GitLab