Skip to content
Draft
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
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</ng-container>
<ng-container *ngIf="isCurrentNodeFolder === false && isCurrentNodeRoot !== true">
<lib-contentplayer-page *ngIf="!isQumlPlayer" [contentMetadata]="selectedNodeData" ></lib-contentplayer-page>
<lib-qumlplayer-page *ngIf="isQumlPlayer" [questionMetaData]="selectedNodeData" [questionSetHierarchy]="collectionTreeNodes?.data"
<lib-qumlplayer-page *ngIf="isQumlPlayer" [leafFormConfig]="leafFormConfig" [questionMetaData]="selectedNodeData" [questionSetHierarchy]="collectionTreeNodes?.data"
(toolbarEmitter)="toolbarEventListener($event)">
</lib-qumlplayer-page>
<div *ngIf="relationFormConfig" class="p-2">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,71 +31,4 @@
</div>

<hr class="my-20">
<div class="ui grid text-font">
<div class="five wide column">
<div class="sb-field-group">
<label class="sb-color-gray-100">{{configService.labelConfig?.lbl?.name}}</label>
<div class="fs-0-92 text-capitalize break-word">{{questionMetaData?.name}}</div>
</div>
</div>
<div class="four wide column">
<div class="sb-field-group">
<label class="sb-color-gray-100">{{configService.labelConfig?.lbl?.board}}</label>
<div class="fs-0-92 text-capitalize">{{questionMetaData?.board}}</div>
</div>
</div>
<div class="three wide column">
<div class="sb-field-group">
<label class="sb-color-gray-100">{{configService.labelConfig?.lbl?.medium}}</label>
<div class="fs-0-92 text-capitalize">{{questionMetaData?.medium}}</div>
</div>
</div>
<div class="five wide column">
<div class="sb-field-group">
<label class="sb-color-gray-100">{{configService.labelConfig?.lbl?.grade}}</label>
<div class="fs-0-92 text-capitalize">{{questionMetaData?.gradeLevel}}</div>
</div>
</div>
<div class="four wide column">
<div class="sb-field-group">
<label class="sb-color-gray-100">{{configService.labelConfig?.lbl?.subject}}</label>
<div class="fs-0-92 text-capitalize">{{questionMetaData?.subject}}</div>
</div>
</div>
<div class="three wide column">
<div class="sb-field-group">
<label class="sb-color-gray-100">{{configService.labelConfig?.lbl?.attributions}}</label>
<div class="fs-0-92 text-capitalize">{{questionMetaData?.attributions}}</div>
</div>
</div>
<div class="five wide column">
<div class="sb-field-group">
<label class="sb-color-gray-100">{{configService.labelConfig?.lbl?.author}}</label>
<div class="fs-0-92 text-capitalize">{{questionMetaData?.author}}</div>
</div>
</div>
<div class="four wide column">
<div class="sb-field-group">
<label class="sb-color-gray-100">{{configService.labelConfig?.lbl?.audience}}</label>
<div class="fs-0-92 text-capitalize">{{questionMetaData?.audience}}</div>
</div>
</div>
<div class="three wide column">
<div class="sb-field-group">
<label class="sb-color-gray-100">{{configService.labelConfig?.lbl?.copyRight}}</label>
<div class="fs-0-92 text-capitalize">{{questionMetaData?.copyright}}</div>
</div>
</div>
<div class="five wide column">
<div class="sb-field-group">
<label class="sb-color-gray-100">{{configService.labelConfig?.lbl?.licensedBy}}</label>
<div class="fs-0-92 text-capitalize">{{questionMetaData?.license}}</div>
</div>
</div>
<div class="four wide column" *ngIf="questionMetaData?.qType === 'MCQ'">
<div class="sb-field-group">
<label class="sb-color-gray-100">{{configService.labelConfig?.lbl?.marks}}</label>
<div class="fs-0-92 text-capitalize">{{questionMetaData.maxScore? questionMetaData.maxScore : 1}}</div>
</div>
</div>
</div>
<sb-dynamic-form *ngIf="showForm" [config]="questionFormConfig"></sb-dynamic-form>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import { EditorTelemetryService } from '../../services/telemetry/telemetry.servi
import { EditorService } from '../../services/editor/editor.service';
import { ConfigService } from '../../services/config/config.service';
import { TreeService } from '../../services/tree/tree.service';
import { FrameworkService } from '../../services/framework/framework.service';
import { filter } from 'rxjs/operators';

@Component({
selector: 'lib-qumlplayer-page',
templateUrl: './qumlplayer-page.component.html',
Expand All @@ -13,18 +16,63 @@ import { TreeService } from '../../services/tree/tree.service';
export class QumlplayerPageComponent implements OnChanges {
qumlPlayerConfig: any;
@Input() questionMetaData: any;
@Input() leafFormConfig: any
@Input() questionSetHierarchy: any;
@Output() public toolbarEmitter: EventEmitter<any> = new EventEmitter();
prevQuestionId: string;
showPlayerPreview = false;
showPotrait = false;
hierarchy: any;
showForm = false;
questionFormConfig: any;
frameworkDetails: any = {};

constructor(public telemetryService: EditorTelemetryService, public configService: ConfigService, public editorService: EditorService,
private treeService: TreeService) { }
private treeService: TreeService, private frameworkService: FrameworkService) { }

ngOnChanges() {
this.initQumlPlayer();
if (_.has(this.questionMetaData, 'data.metadata')) {
this.initQumlPlayer();
this.questionFormConfig = _.cloneDeep(this.leafFormConfig);
const framework = _.get(this.questionSetHierarchy, 'framework') || _.get(this.editorService.editorConfig, 'context.framework')
if (framework) {
this.fetchFrameWorkDetails(framework);
} else {
this.setFormDefaultValues();
}
}
}

fetchFrameWorkDetails(framework) {
this.frameworkService.frameworkData$.pipe(
filter(data => _.get(data, `frameworkdata.${framework}`))).subscribe((frameworkDetails: any) => {
if (frameworkDetails && !frameworkDetails.err) {
const frameworkData = frameworkDetails.frameworkdata[framework].categories;
this.frameworkDetails.frameworkData = frameworkData;
this.setFieldsTerms();
}
});
}

setFieldsTerms() {
const categoryMasterList = this.frameworkDetails.frameworkData;
_.forEach(categoryMasterList, (category) => {
_.forEach(this.questionFormConfig, (formFieldCategory) => {
if (category.code === formFieldCategory.code) {
formFieldCategory.terms = category.terms;
}
});
});
this.setFormDefaultValues();
}

setFormDefaultValues() {
_.forEach(this.questionFormConfig, (formField) => {
const fieldcode = formField.code;
formField.default = this.questionMetaData[fieldcode];
formField.editable = false;
});
this.showForm = true;
}

initQumlPlayer() {
Expand All @@ -38,19 +86,17 @@ export class QumlplayerPageComponent implements OnChanges {
this.hierarchy.childNodes = [newQuestionId];
this.hierarchy.shuffle = selectedNode.parent.data.metadata.shuffle;
if (selectedNode.parent.data.metadata.shuffle === true) {
// tslint:disable-next-line:no-string-literal
this.hierarchy['maxScore'] = 1;
this.hierarchy['outcomeDeclaration'] = {maxScore: {defaultValue: 1}};
} else {
if (this.questionMetaData.qType === 'SA') {
this.hierarchy = _.omit(this.hierarchy, 'maxScore');
} else if (this.questionMetaData.maxScore) {
// tslint:disable-next-line:no-string-literal
this.hierarchy['maxScore'] = this.questionMetaData.maxScore;
this.hierarchy['outcomeDeclaration'] = {maxScore: {defaultValue: 0}};
} else {
this.hierarchy['outcomeDeclaration'] = {maxScore: {defaultValue: this.questionMetaData?.maxScore}};
}
}
const parent = this.treeService.getParent()?.data?.metadata;
this.hierarchy.showSolutions = parent?.showSolutions || "No";
this.hierarchy.showFeedback = parent?.showFeedback || "No";
this.hierarchy.showSolutions = parent?.showSolutions || false;
this.hierarchy.showFeedback = parent?.showFeedback || false;
this.prevQuestionId = newQuestionId;
setTimeout(() => {
this.showPlayerPreview = true;
Expand Down