diff --git a/projects/collection-editor-library/src/lib/components/editor/editor.component.ts b/projects/collection-editor-library/src/lib/components/editor/editor.component.ts index 5d385c8d..2e894099 100755 --- a/projects/collection-editor-library/src/lib/components/editor/editor.component.ts +++ b/projects/collection-editor-library/src/lib/components/editor/editor.component.ts @@ -116,7 +116,7 @@ export class EditorComponent implements OnInit, OnDestroy, AfterViewInit { } ngOnInit() { - debugger + //debugger this.editorService.initialize(this.editorConfig); this.editorMode = this.editorService.editorMode; this.treeService.initialize(this.editorConfig); @@ -128,7 +128,7 @@ export class EditorComponent implements OnInit, OnDestroy, AfterViewInit { // this.treeNodeData = this.treeService.getFirstChild(); if (this.objectType === 'question') { - debugger + //debugger this.collectionId = _.get(this.editorConfig, 'context.collectionIdentifier'); this.initializeFrameworkAndChannel(); this.editorService.getCategoryDefinition(_.get(this.editorConfig, 'context.collectionPrimaryCategory'), @@ -157,10 +157,6 @@ export class EditorComponent implements OnInit, OnDestroy, AfterViewInit { const collection = _.get(hierarchyResponse, `result.${this.objectType}`); this.toolbarConfig.title = collection.name; this.toolbarConfig.isAddCollaborator = (collection.createdBy === _.get(this.editorConfig, 'context.user.id')); - const getframeworkListData = JSON.parse(localStorage.getItem('frameworkDataObj')) - console.log('gettttt',getframeworkListData) - collection.subject = getframeworkListData.subject; - collection.difficultyLevel = getframeworkListData.difficultyLevel this.initializeFrameworkAndChannel(collection); }); } @@ -793,6 +789,7 @@ export class EditorComponent implements OnInit, OnDestroy, AfterViewInit { this.treeService.clearTreeCache(); this.treeService.nextTreeStatus('saved'); resolve(_.get(this.configService, 'labelConfig.messages.success.001')); + localStorage.setItem('frameworkDataObj', ''); }, err => { reject(_.get(this.configService, 'labelConfig.messages.error.001')); }); diff --git a/projects/collection-editor-library/src/lib/components/question/question.component.ts b/projects/collection-editor-library/src/lib/components/question/question.component.ts index 8590725d..f317cd54 100644 --- a/projects/collection-editor-library/src/lib/components/question/question.component.ts +++ b/projects/collection-editor-library/src/lib/components/question/question.component.ts @@ -975,7 +975,7 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { console.log('difficultyLevelList',uniqueSubjectList) console.log('difficultyLevelList',uniqueDiffficultyList) metaData.eval = activeNode?.data.metadata.eval || data?.data.eval, - metaData.assessmentType = assessmentType + metaData.assessmentType = null;//assessmentType const rootMetaData = { difficultyLevel:uniqueDiffficultyList, subject: uniqueSubjectList, diff --git a/projects/collection-editor-library/src/lib/services/editor/editor.service.ts b/projects/collection-editor-library/src/lib/services/editor/editor.service.ts index 3206609e..2fe25b05 100755 --- a/projects/collection-editor-library/src/lib/services/editor/editor.service.ts +++ b/projects/collection-editor-library/src/lib/services/editor/editor.service.ts @@ -411,14 +411,22 @@ export class EditorService { var modified = this.getUpdatedNodeMetaData(); if(data.data?.primaryCategory === 'Course' || data.data?.primaryCategory === 'PIAA Assessment' || data.data?.primaryCategory === 'Self Assessment' ){ const updatedNode = this.getUpdatedNodeMetaData() - const rootMetaData = { - difficultyLevel:data.data.difficultyLevel, - subject: data.data.subject, - "eval": { + let collection={}; + if(localStorage.getItem('frameworkDataObj')){ + const getframeworkListData = JSON.parse(localStorage.getItem('frameworkDataObj')) + console.log('gettttt', getframeworkListData) + collection['subject'] = getframeworkListData.subject; + collection['difficultyLevel'] = getframeworkListData.difficultyLevel + } + const rootMetaData = { + difficultyLevel: data?.data?.difficultyLevel ? [...data?.data?.difficultyLevel, ...collection['difficultyLevel']] : collection['difficultyLevel']?[...collection['difficultyLevel']]:[], + subject: data?.data?.subject ? [...data?.data?.subject, ...collection['subject']] : collection['subject']?[...collection['subject']]:[], + "eval": { "mode": "server" //data.data.eval - }, - } + }, + } + //console.log('-------->',rootMetaData); modified ={ ...updatedNode, [data.data.id]:{ diff --git a/projects/collection-editor-library/src/lib/services/tree/tree.service.ts b/projects/collection-editor-library/src/lib/services/tree/tree.service.ts index 5a5f035f..11452603 100755 --- a/projects/collection-editor-library/src/lib/services/tree/tree.service.ts +++ b/projects/collection-editor-library/src/lib/services/tree/tree.service.ts @@ -351,7 +351,9 @@ export class TreeService { } }) }); - + difficultyLevelList = difficultyLevelList.reduce((acc, current) => { + return acc.concat(Array.isArray(current) ? current : [current]); + }, []); const subjectListfirst = new Set(subjectList);