Skip to content
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

Jump to bottom

Issue #IQ-569 feat: Removal of hard-coding specific to Student, Teacher, Parent #112

Merged
merged 4 commits into from
Sep 26, 2023
Merged

Issue #IQ-569 feat: Removal of hard-coding specific to Student, Teacher, Parent #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f4f0bc
Issue #IQ-569 feat: Removal of hardcoding specific to Student, Teache…
rajnishdargan Sep 19, 2023
98dc9c0
Issue #IQ-569 feat: Removal of hard-coding specific to Student, Teach…
rajnishdargan Sep 20, 2023
6114a5a
Merge remote-tracking branch 'upstream/release-7.0.0' into release-7.0.0
rajnishdargan Sep 20, 2023
ea91df5
Issue #IQ-569 feat: Removal of hard-coding specific to Student, Teach…
rajnishdargan Sep 21, 2023
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
6 changes: 3 additions & 3 deletions docs/Practice Question Set.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,9 +481,9 @@
"required": true,
"visible": true,
"range": [
"Student",
"Teacher",
"Administrator"
"Audience1",
"Audience2",
"Audience3"
],
"renderingHints": {
"class": "sb-g-col-lg-1 required"
Expand Down
14 changes: 7 additions & 7 deletions ...r-library/src/lib/components/assign-page-number/assign-page-number.component.spec.data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const mockTreeData = [
"visibility": "Parent",
"showTimer": false,
"groups": {
"Student interview": [
"Audience1 interview": [
"do_113449672558780416163"
]
},
Expand Down Expand Up @@ -234,18 +234,18 @@ export const mockTreeData = [
"visibility": "Parent",
"showTimer": false,
"groups": {
"Student interview": [
"Audience1 interview": [
"do_113449672558780416163",
"do_11364358223115059211484"
],
"Teacher interview": [
"Audience2 interview": [
"do_11358056771369369615004",
"do_1136011660822200321804"
],
"Official interview": [
"Audience3 interview": [
"do_1136011666813255681808"
],
"Parent interview": [
"Audience4 interview": [
"do_11364297206960128011480"
]
},
Expand Down Expand Up @@ -1068,7 +1068,7 @@ export const mockTreeData = [
"visibility": "Parent",
"showTimer": false,
"groups": {
"Teacher interview": [
"Audience2 interview": [
"do_11357919243396710414900"
]
},
Expand Down Expand Up @@ -1321,7 +1321,7 @@ export const mockTreeData = [
"visibility": "Parent",
"showTimer": false,
"groups": {
"Parent interview": [
"Audience4 interview": [
"do_113583348668153856123"
]
},
Expand Down
37 changes: 17 additions & 20 deletions projects/questionset-editor-library/src/lib/components/editor/editor.component.spec.data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,13 +509,13 @@ export const categoryDefinition = {
required: false,
visible: true,
range: [
'Education Official',
'School leaders (HMs)',
'Teachers',
'Students',
'Parents',
'Parent',
'Others',
'Audience1',
'Audience2',
'Audience3',
'Audience4',
'Audience5',
'Audience6',
'Audience7',
],
},
{
Expand Down Expand Up @@ -590,14 +590,11 @@ export const categoryDefinition = {
class: 'sb-g-col-lg-1',
},
options: [
'Student interview',
'Teacher interview',
'HM/HT interview',
'Parent interview',
'Official interview',
'School walkthrough',
'Class observation',
'Document Review',
'Audience1 interview',
'Audience2 interview',
'Audience3 interview',
'Audience4 interview',
'Audience5 interview'
],
},
],
Expand Down Expand Up @@ -673,7 +670,7 @@ export const hierarchyResponse = [
},
"identifier": "do_2138622515299368961170",
"audience": [
"Student"
"Audience1"
],
"visibility": "Default",
"showTimer": true,
Expand Down Expand Up @@ -1082,9 +1079,9 @@ export const categoryDefinitionData = {
"required": true,
"visible": true,
"range": [
"Student",
"Teacher",
"Administrator"
"Audience1",
"Audience2",
"Audience3"
],
"renderingHints": {
"class": "sb-g-col-lg-1 required"
Expand Down Expand Up @@ -3520,7 +3517,7 @@ export const nodesModifiedData = {
'Mathematics'
],
audience: [
'Student'
'Audience1'
],
shuffle: true,
showFeedback: false,
Expand Down
8 changes: 4 additions & 4 deletions ...uestionset-editor-library/src/lib/components/fancy-tree/fancy-tree.component.spec.data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ export const treeData = {
autoBatch: "No",
},
identifier: "do_113289107070615552146",
audience: ["Student"],
audience: ["Audience1"],
visibility: "Default",
discussionForum: {
enabled: "Yes",
Expand Down Expand Up @@ -280,7 +280,7 @@ export const treeData = {
},
identifier: "do_113277071092588544112",
lastStatusChangedOn: "2021-05-11T12:30:17.357+0000",
audience: ["Student"],
audience: ["Audience1"],
os: ["All"],
visibility: "Parent",
discussionForum: {
Expand Down Expand Up @@ -356,7 +356,7 @@ export const tree = [
autoBatch: "No",
},
identifier: "do_113276371461185536128",
audience: ["Student"],
audience: ["Audience1"],
visibility: "Default",
consumerId: "dab07952-5d6c-459e-86ce-0bc31d90277f",
discussionForum: {
Expand Down Expand Up @@ -469,7 +469,7 @@ export const tree = [
autoBatch: "No",
},
identifier: "do_113276369323016192113",
audience: ["Student"],
audience: ["Audience1"],
visibility: "Default",
author: "[email protected]",
consumerId: "33fb55ad-344e-4849-ab9b-e8e5e59e39ad",
Expand Down
16 changes: 8 additions & 8 deletions .../questionset-editor-library/src/lib/components/meta-form/meta-form.component.spec.data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,13 @@ export const mockData = {
required: false,
visible: true,
range: [
'Education Official',
'School leaders (HMs)',
'Teachers',
'Students',
'Parents',
'Parent',
'Others'
'Audience1',
'Audience2',
'Audience3',
'Audience4',
'Audience5',
'Audience6',
'Audience7'
]
},
{
Expand Down Expand Up @@ -363,7 +363,7 @@ export const mockData = {
showSolutions: false,
identifier: 'do_113263678834016256111',
audience: [
'Student'
'Audience1'
],
visibility: 'Default',
showTimer: true,
Expand Down
4 changes: 2 additions & 2 deletions projects/questionset-editor-library/src/lib/components/meta-form/meta-form.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ describe('MetaFormComponent', () => {
component.appIcon = 'https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/do_11320764935163904015/artifact/2020101299.png';
component.showAppIcon = true;
const event = {
instance: 'Add Student',
instance: 'Add Audience1',
appIcon: 'https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/do_11320764935163904015/artifact/2020101299.png',
allowECM : 'No',
levels : ['good', 'bad', 'average'],
Expand Down Expand Up @@ -217,7 +217,7 @@ describe('MetaFormComponent', () => {
component.appIcon = 'https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/do_11320764935163904015/artifact/2020101299.png';
component.showAppIcon = true;
const event = {
instance: 'Add Student',
instance: 'Add Audience1',
appIcon: 'https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/do_11320764935163904015/artifact/2020101299.png',
shuffle: true
};
Expand Down
8 changes: 4 additions & 4 deletions ...ts/questionset-editor-library/src/lib/components/question/question.component.spec.data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,10 +1018,10 @@ export const collectionHierarchyMock = {
mimeType: "application/vnd.sunbird.questionset",
showHints: false,
ecm: [
"Student interview",
"Teacher interview",
"Parent interview",
"HM/HT interview",
"Audience1 interview",
"Audience2 interview",
"Audience3 interview",
"Audience4 interview",
],
objectType: "QuestionSet",
gradeLevel: ["Grade 1"],
Expand Down
14 changes: 7 additions & 7 deletions ...stionset-editor-library/src/lib/components/quml-player/quml-player.component.spec.data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ export const mockData = {
"identifier": "do_11326368076523929611",
"lastStatusChangedOn": "2021-04-22T14:27:35.932+0000",
"audience": [
"Student"
"Audience1"
],
"visibility": "Parent",
"showTimer": false,
Expand Down Expand Up @@ -256,7 +256,7 @@ export const mockData = {
"identifier": "do_113264100861919232115",
"lastStatusChangedOn": "2021-04-23T04:42:17.246+0000",
"audience": [
"Student"
"Audience1"
],
"visibility": "Parent",
"showTimer": false,
Expand Down Expand Up @@ -314,7 +314,7 @@ export const mockData = {
"identifier": "do_113264103767826432118",
"lastStatusChangedOn": "2021-04-23T04:48:11.971+0000",
"audience": [
"Student"
"Audience1"
],
"visibility": "Parent",
"showTimer": false,
Expand Down Expand Up @@ -373,7 +373,7 @@ export const mockData = {
"identifier": "do_113264105505570816124",
"lastStatusChangedOn": "2021-04-23T04:51:44.098+0000",
"audience": [
"Student"
"Audience1"
],
"visibility": "Parent",
"showTimer": false,
Expand Down Expand Up @@ -434,7 +434,7 @@ export const mockData = {
"identifier": "do_113264162822283264127",
"lastStatusChangedOn": "2021-04-23T06:48:20.767+0000",
"audience": [
"Student"
"Audience1"
],
"visibility": "Parent",
"showTimer": false,
Expand Down Expand Up @@ -492,7 +492,7 @@ export const mockData = {
"identifier": "do_113264164671733760129",
"lastStatusChangedOn": "2021-04-23T06:52:06.530+0000",
"audience": [
"Student"
"Audience1"
],
"visibility": "Parent",
"showTimer": false,
Expand Down Expand Up @@ -526,7 +526,7 @@ export const mockData = {
"showSolutions": false,
"identifier": "do_113263678834016256111",
"audience": [
"Student"
"Audience1"
],
"visibility": "Default",
"showTimer": true,
Expand Down
16 changes: 8 additions & 8 deletions ...-editor-library/src/lib/components/qumlplayer-page/qumlplayer-page.component.spec.data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const mockData = {
"identifier": "do_11326368076523929611",
"lastStatusChangedOn": "2021-04-22T14:27:35.932+0000",
"audience": [
"Student"
"Audience1"
],
"visibility": "Parent",
"showTimer": false,
Expand Down Expand Up @@ -106,7 +106,7 @@ export const mockData = {
"identifier": "do_11326368076523929611",
"lastStatusChangedOn": "2021-04-22T14:27:35.932+0000",
"audience": [
"Student"
"Audience1"
],
"visibility": "Parent",
"showTimer": false,
Expand Down Expand Up @@ -164,7 +164,7 @@ export const mockData = {
"identifier": "do_113264100861919232115",
"lastStatusChangedOn": "2021-04-23T04:42:17.246+0000",
"audience": [
"Student"
"Audience1"
],
"visibility": "Parent",
"showTimer": false,
Expand Down Expand Up @@ -222,7 +222,7 @@ export const mockData = {
"identifier": "do_113264103767826432118",
"lastStatusChangedOn": "2021-04-23T04:48:11.971+0000",
"audience": [
"Student"
"Audience1"
],
"visibility": "Parent",
"showTimer": false,
Expand Down Expand Up @@ -281,7 +281,7 @@ export const mockData = {
"identifier": "do_113264105505570816124",
"lastStatusChangedOn": "2021-04-23T04:51:44.098+0000",
"audience": [
"Student"
"Audience1"
],
"visibility": "Parent",
"showTimer": false,
Expand Down Expand Up @@ -342,7 +342,7 @@ export const mockData = {
"identifier": "do_113264162822283264127",
"lastStatusChangedOn": "2021-04-23T06:48:20.767+0000",
"audience": [
"Student"
"Audience1"
],
"visibility": "Parent",
"showTimer": false,
Expand Down Expand Up @@ -400,7 +400,7 @@ export const mockData = {
"identifier": "do_113264164671733760129",
"lastStatusChangedOn": "2021-04-23T06:52:06.530+0000",
"audience": [
"Student"
"Audience1"
],
"visibility": "Parent",
"showTimer": false,
Expand Down Expand Up @@ -434,7 +434,7 @@ export const mockData = {
"showSolutions": false,
"identifier": "do_113263678834016256111",
"audience": [
"Student"
"Audience1"
],
"visibility": "Default",
"showTimer": true,
Expand Down
Loading