diff --git a/src/helpers/programHelper.js b/src/helpers/programHelper.js index c79b82432ac0b0ae07a8c91ef451c09aa4b0c990..63dabc1b2ff79b23c69362a00495d703d0f836ee 100644 --- a/src/helpers/programHelper.js +++ b/src/helpers/programHelper.js @@ -32,7 +32,7 @@ class ProgramServiceHelper { data: { request: { filters: { - objectType: 'content', + objectType: ['content', 'questionset'], programId: programId, mimeType: {'!=': 'application/vnd.ekstep.content-collection'}, contentType: {'!=': 'Asset'}, diff --git a/src/service/programService.js b/src/service/programService.js index 4a2cb1f91f7f36924df405402997bc30ff9f5809..21548ec10b61b5936d8f8d7314b0317ea1424b6c 100644 --- a/src/service/programService.js +++ b/src/service/programService.js @@ -1696,10 +1696,11 @@ function aggregatedNominationCount(data, result) { .subscribe( (promiseData) => { const contentResult = _.first(promiseData); - if (contentResult && contentResult.data && contentResult.data.result && contentResult.data.result.content) { - const contents = _.get(contentResult, 'data.result.content'); - relatedContents = contents; + if (contentResult && contentResult.data && contentResult.data.result) { + const contents = _.compact(_.concat(_.get(contentResult.data.result, 'QuestionSet'), _.get(contentResult.data.result, 'content'))); + relatedContents = contents; } + nominationSampleCounts = programServiceHelper.setNominationSampleCounts(relatedContents); const userAndOrgResult = _.tail(promiseData, 2); _.forEach(userAndOrgResult, function (data) {