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.

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

Diagnostic test session #16489

Merged
merged 196 commits into from
Nov 23, 2022
Merged
Changes from 1 commit
Commits
Show all changes
196 commits
Select commit Hold shift + click to select a range
3cc8a69
Adds diagnostic test player page
Nik-09 Oct 10, 2022
d0accc0
Adds html text
Nik-09 Oct 11, 2022
9efdabf
Merge branch 'diagnostic_player' of https://github.com/Nik-09/oppia i…
Nik-09 Oct 11, 2022
f0dd1a6
Adds frontend unit tests
Nik-09 Oct 12, 2022
02bdc42
Adds backend tests
Nik-09 Oct 12, 2022
7544164
Fixes linter issue
Nik-09 Oct 12, 2022
6023501
Fixes mypy issues
Nik-09 Oct 12, 2022
95c0d30
Fixes typescript checks
Nik-09 Oct 12, 2022
3faeeb8
Updates copyright text.
Nik-09 Oct 12, 2022
2eca459
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Oct 13, 2022
6abd20b
Adds diagnostic test model
Nik-09 Oct 15, 2022
4b4175b
Alignes diagnostic test player with the question player
Nik-09 Oct 16, 2022
6aa8064
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Oct 17, 2022
793e1d4
Internationalized diagnostic test texts
Nik-09 Oct 17, 2022
b18e16e
Adds css rules
Nik-09 Oct 17, 2022
a12514b
Adds Qqq text.
Nik-09 Oct 17, 2022
9711984
Adds frontend unit tests
Nik-09 Oct 17, 2022
1e40d37
Fixes lint issues
Nik-09 Oct 18, 2022
3ef4c8a
Adds test file to the backend shard.
Nik-09 Oct 18, 2022
8236fbe
Adds unit test
Nik-09 Oct 18, 2022
d5e8301
Fixes lint issues
Nik-09 Oct 18, 2022
32df356
Fixes lint issues
Nik-09 Oct 18, 2022
84c0a0d
Fixes typescript issue.
Nik-09 Oct 18, 2022
c8cc619
Fixes merge conflict with the diagnostic player
Nik-09 Oct 18, 2022
c4d8add
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Oct 19, 2022
28fe324
Sort i18n keys
Nik-09 Oct 19, 2022
655fb55
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Oct 19, 2022
efd6ef9
Adds frontend unit test for the diagnostic test model.
Nik-09 Oct 19, 2022
e2235b2
Merge branch 'diagnostic_player' of https://github.com/Nik-09/oppia i…
Nik-09 Oct 20, 2022
405e2aa
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Oct 20, 2022
b19b612
Create diagnostic test topic state model
Nik-09 Oct 20, 2022
600b0cd
Adds submit and init metods for engine service
Nik-09 Oct 21, 2022
7ed830b
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Oct 21, 2022
88c188c
Addressed review comments
Nik-09 Oct 21, 2022
c37c740
Updates file docstring + removes extra new line
Nik-09 Oct 21, 2022
4f04ec9
Merge branch 'diagnostic_player' of https://github.com/Nik-09/oppia i…
Nik-09 Oct 21, 2022
72d7768
Adds frontend unit test
Nik-09 Oct 21, 2022
3208bb7
Replaces number with a named constant.
Nik-09 Oct 22, 2022
33b2157
Updates UI for the diagnostic page
Nik-09 Oct 22, 2022
46bbce2
Removes redundant css class
Nik-09 Oct 22, 2022
ea0a7d4
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Oct 22, 2022
0482db6
Loads first card
Nik-09 Oct 23, 2022
571449c
Merge branch 'diagnostic_player' of https://github.com/Nik-09/oppia i…
Nik-09 Oct 23, 2022
bb5d7cf
Fixes merge conflict
Nik-09 Oct 23, 2022
d85d0b4
Adds code comment
Nik-09 Oct 23, 2022
1fce306
Adds diagnostic test topic state model
Nik-09 Oct 24, 2022
e7b00d0
Adds diagnostic test topic state model
Nik-09 Oct 24, 2022
989931b
Fixes lint issues.
Nik-09 Oct 24, 2022
06ea884
Adds code comments and unit tests
Nik-09 Oct 25, 2022
9d29945
Renamed variables
Nik-09 Oct 25, 2022
8f2e3b3
Adds code comment
Nik-09 Oct 25, 2022
9ad7428
Adds diagnostic test questions handler
Nik-09 Oct 26, 2022
702817f
Adds diagnostic test questions API method
Nik-09 Oct 26, 2022
f4d03c8
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Oct 27, 2022
78d434c
Renames into diagnostic test topic tracker model
Nik-09 Oct 27, 2022
e8c636d
Updates variable name
Nik-09 Oct 27, 2022
1c77ef1
Fixes lint issues
Nik-09 Oct 27, 2022
6dd0f12
Updates diagnostic test current topic status model
Nik-09 Oct 28, 2022
0345bea
Fixes lint issues
Nik-09 Oct 28, 2022
dfdca9c
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Oct 28, 2022
cf0201b
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Oct 28, 2022
8fb8c32
Updates code comments
Nik-09 Oct 28, 2022
60692a9
Removes type safety check for pop method
Nik-09 Oct 28, 2022
7ef5db4
Updates API data schema for the diagnostic test skill id to questions
Nik-09 Oct 29, 2022
e47977b
Fixes mypy checks
Nik-09 Oct 29, 2022
fe88ea9
Fixes typescript check
Nik-09 Oct 29, 2022
e67ba79
Fixes lint issue
Nik-09 Oct 29, 2022
4f42474
Fixes backend test
Nik-09 Oct 29, 2022
970a7f7
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Oct 29, 2022
8d1b7fd
Addresses review comments
Nik-09 Oct 29, 2022
7a60b68
Fixes merge conflict with the diagnostic test topic tracker branch
Nik-09 Oct 30, 2022
39d1add
Merge branch 'diagnostic_test_topic_state_model' of https://github.co…
Nik-09 Oct 30, 2022
168e748
Removes unwanted files
Nik-09 Oct 30, 2022
bfb92fe
Fixes merge conflict with the questions handler branch
Nik-09 Oct 30, 2022
3a380e6
Adds submit method
Nik-09 Oct 30, 2022
8a0c2bd
Fixes submit button issue
Nik-09 Oct 31, 2022
7f462c4
Adds logic in the conversation skin component
Nik-09 Oct 31, 2022
1cf03a5
Adds test status service
Nik-09 Nov 1, 2022
fcb3f74
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Nov 1, 2022
93485f9
Addresses review comments
Nik-09 Nov 1, 2022
357e5bb
Fixes lint issue.
Nik-09 Nov 1, 2022
2618d67
Addresses review comments
Nik-09 Nov 1, 2022
b8b9182
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Nov 1, 2022
b912566
Adds test for the question player status service
Nik-09 Nov 1, 2022
1608732
Fixes merge conflict wrt current topic branch
Nik-09 Nov 1, 2022
c51d25b
Merge branch 'diagnostic_test_question_handler' of https://github.com…
Nik-09 Nov 1, 2022
489760d
Fixes merge conflict
Nik-09 Nov 1, 2022
e08cba6
Fixes mypy issues
Nik-09 Nov 1, 2022
3062b24
Fixes merge conflict
Nik-09 Nov 2, 2022
0e0c293
Fixes merge conflict wrt question handler branch
Nik-09 Nov 2, 2022
c915665
Adds frontend tests
Nik-09 Nov 2, 2022
4f3bf3a
Addresses review comments
Nik-09 Nov 3, 2022
0f01e09
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Nov 3, 2022
b5a47b9
Fixes lint and typescript checks
Nik-09 Nov 3, 2022
a51c635
Removes print stamt
Nik-09 Nov 3, 2022
17ef4aa
Fixes lint and typescript checks
Nik-09 Nov 3, 2022
4f755ba
Removes redundant code
Nik-09 Nov 3, 2022
cb4d2b2
Adds questions for testing
Nik-09 Nov 3, 2022
14b8f7d
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Nov 3, 2022
8c61ce3
Adds customizations
Nik-09 Nov 4, 2022
7b0a829
Adds guidance tile on the math classroom page.
Nik-09 Nov 4, 2022
1b86501
Adds diagnostic test result page UI
Nik-09 Nov 4, 2022
c0c2f26
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Nov 5, 2022
8011916
Updates handler logic to avoid duplicate questions
Nik-09 Nov 5, 2022
ea54002
Merge branch 'diagnostic_test_question_handler' of https://github.com…
Nik-09 Nov 5, 2022
a584f6c
Addresses review comments
Nik-09 Nov 5, 2022
ce508d6
Adds progress functionality.
Nik-09 Nov 6, 2022
22433c2
Updates backend logic to avoid duplicate questions
Nik-09 Nov 6, 2022
aafa20b
Adds backend unit test for coverage
Nik-09 Nov 6, 2022
b83d7f1
Fixes typo
Nik-09 Nov 6, 2022
5902a87
Fixes merge conflict
Nik-09 Nov 6, 2022
dd67c8e
Adds progress bar
Nik-09 Nov 6, 2022
0e03219
Updates min question requirement for the diagnostic test skill
Nik-09 Nov 7, 2022
c496c5a
Fixes frontend tests
Nik-09 Nov 7, 2022
3db1208
Fixes e2e test
Nik-09 Nov 7, 2022
56bdd7d
Updates code comments
Nik-09 Nov 7, 2022
df034fe
Merge branch 'diagnostic_test_question_handler' of https://github.com…
Nik-09 Nov 8, 2022
847e390
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Nov 8, 2022
3da8f48
Merge branch 'diagnostic_test_engine_service' of https://github.com/N…
Nik-09 Nov 8, 2022
1fa7080
Fixes UI
Nik-09 Nov 8, 2022
27577ad
Adds skip functionality
Nik-09 Nov 8, 2022
72ac819
Fixes dummy data creation
Nik-09 Nov 11, 2022
8b235d8
Fixes first topic button
Nik-09 Nov 11, 2022
28f48ad
Fixes result page buttons
Nik-09 Nov 11, 2022
72e1391
Adds back button
Nik-09 Nov 11, 2022
2ecedc8
Adds page unload events
Nik-09 Nov 12, 2022
fe2e3e6
Fixes console error
Nik-09 Nov 12, 2022
15ba848
Fixes merge conflict
Nik-09 Nov 12, 2022
5fed453
Removes unwanted changes
Nik-09 Nov 12, 2022
203f367
Fixes lint issues
Nik-09 Nov 12, 2022
eea7c74
Fixes mypy checks
Nik-09 Nov 12, 2022
79a66d4
Fixes typescript checks
Nik-09 Nov 12, 2022
e0dc245
Fixes mcq questions
Nik-09 Nov 13, 2022
63a739c
Adds different module components
Nik-09 Nov 13, 2022
f8ace39
Fixes merge conflict
Nik-09 Nov 13, 2022
4b6c301
Removes unwanted lines
Nik-09 Nov 14, 2022
a972295
Adds handler to get classroom ID
Nik-09 Nov 14, 2022
539a83d
Adds frontend tests
Nik-09 Nov 15, 2022
8930ac5
Fixes merge conflict
Nik-09 Nov 15, 2022
2b8ad1c
Addresses review comments
Nik-09 Nov 15, 2022
bdbe0c7
Updates mili sec to wait condition
Nik-09 Nov 15, 2022
3ae1712
Fixes lint issues
Nik-09 Nov 15, 2022
ff7e6ae
Adds backend and frontend test coverage
Nik-09 Nov 17, 2022
de8766d
Fixes lint issues
Nik-09 Nov 17, 2022
56a4163
Fixes e2e test yaml file
Nik-09 Nov 17, 2022
8dfac5b
Fixes indentation
Nik-09 Nov 17, 2022
5a309a9
Updates progress component
Nik-09 Nov 17, 2022
884a01a
Adds e2e test for the diagnostic test
Nik-09 Nov 18, 2022
c390f35
Fixes frontend test
Nik-09 Nov 18, 2022
a94027c
Fixes merge conflict
Nik-09 Nov 18, 2022
8e1de7a
Fixes frontend test
Nik-09 Nov 18, 2022
ab72cde
Addresses review comments
Nik-09 Nov 18, 2022
5b183ed
Adds translation text
Nik-09 Nov 18, 2022
447d449
Fixes typo
Nik-09 Nov 18, 2022
9fb630a
Adds code comment
Nik-09 Nov 18, 2022
1cab411
Updates progress nav component
Nik-09 Nov 18, 2022
be508bd
Fixes lint issues
Nik-09 Nov 18, 2022
47ada25
Adds internationalized texts
Nik-09 Nov 19, 2022
0c94160
Fixes typo
Nik-09 Nov 19, 2022
8635616
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Nov 20, 2022
5aeb0c2
Adds test code.
Nik-09 Nov 20, 2022
a50410c
Diagnostic test e2e test
Nik-09 Nov 20, 2022
1745a2e
Removes unwanted code.
Nik-09 Nov 20, 2022
c531f47
Updates varible name.
Nik-09 Nov 20, 2022
901bfb1
Adds code comment
Nik-09 Nov 20, 2022
673dbf2
Adds internationalized text
Nik-09 Nov 20, 2022
ad264d6
Fixes e2e test
Nik-09 Nov 20, 2022
da9efb5
Adds todo comment
Nik-09 Nov 20, 2022
42e5f12
Fixes frontend test
Nik-09 Nov 20, 2022
adff405
Make skip button variable available from the top level
Nik-09 Nov 20, 2022
1e1de9d
Adds feedback flag for embedded explorations
Nik-09 Nov 20, 2022
496493c
Modifies code comment and variable name
Nik-09 Nov 21, 2022
ec2da75
Adds e2e test
Nik-09 Nov 21, 2022
2c8d3c7
Adds info text for mcq questions
Nik-09 Nov 21, 2022
e038d01
Video recording + waitFor in the diagnostic test
Nik-09 Nov 21, 2022
6c4bdae
Adds waitfor in the diagnostic test page
Nik-09 Nov 21, 2022
d96a5dc
Fixes e2e test
Nik-09 Nov 21, 2022
25ebd4c
Removes e2e github workflow for testing
Nik-09 Nov 21, 2022
ac431da
Fix selector for e2e test
Nik-09 Nov 21, 2022
a2b4982
Adds webpack build
Nik-09 Nov 21, 2022
a43abe7
Merge branch 'develop' of https://github.com/oppia/oppia into diagnos…
Nik-09 Nov 21, 2022
aa53f8f
Trial e2e test fix
Nik-09 Nov 21, 2022
ac1c3f1
Trial2 e2e test fix
Nik-09 Nov 21, 2022
c619cfa
Addresses review comments
Nik-09 Nov 21, 2022
3bfdde2
Adds github workflow cmds back
Nik-09 Nov 21, 2022
d4c857b
Fixes e2e test
Nik-09 Nov 22, 2022
a360971
Fixes e2e test
Nik-09 Nov 22, 2022
e29c10c
Fixes lint issues
Nik-09 Nov 22, 2022
a4bfa93
Disables video recording
Nik-09 Nov 22, 2022
e7903a7
Fixes lint issues
Nik-09 Nov 22, 2022
fc03d6e
Fixes merge conflict
Nik-09 Nov 22, 2022
a019c95
Updates buttons css
Nik-09 Nov 22, 2022
43a1444
fixes typescript check
Nik-09 Nov 22, 2022
28cfa2d
Removes unnecessary clickable checks
Nik-09 Nov 23, 2022
80d191d
Removes redundant visbility checks from e2e test
Nik-09 Nov 23, 2022
ea03c54
Merge branch 'develop' into diagnostic_test_session
Nik-09 Nov 23, 2022
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
Prev Previous commit
Next Next commit
Fixes lint issues
  • Loading branch information
Nik-09 committed Oct 18, 2022
commit d5e8301de86c811b34248d95fc63babde93bb728
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
import { TestBed } from '@angular/core/testing';
import { DiagnosticTestModelData } from './diagnostic-test.model';

fdescribe('Diagnostic test model', () => {
describe('Diagnostic test model', () => {
let diagnosticTestModelData: DiagnosticTestModelData;
beforeEach(() => {
TestBed.configureTestingModule({
@@ -37,26 +37,25 @@ fdescribe('Diagnostic test model', () => {
topicID7: ['topicID2', 'topicID3', 'topicID6'],
topicID8: ['topicID7'],
topicID9: ['topicID5', 'topicID8'],

}
};
diagnosticTestModelData = new DiagnosticTestModelData(
topicIdToPrerequisiteTopicIds);
});

it('should be able to get topic ID to ancestor topic IDs', () => {
const expectedAncestorTopicIds = {
topicID1: [],
topicID2: ['topicID1'],
topicID3: ['topicID2', 'topicID1'],
topicID4: ['topicID3', 'topicID2', 'topicID1'],
topicID5: ['topicID4', 'topicID3', 'topicID2', 'topicID1'],
topicID6: [],
topicID7: ['topicID6', 'topicID3', 'topicID2', 'topicID1'],
topicID8: [
'topicID7', 'topicID6', 'topicID3', 'topicID2', 'topicID1'],
topicID9: [
'topicID8', 'topicID7', 'topicID6', 'topicID3', 'topicID2',
'topicID1', 'topicID5', 'topicID4']
topicID1: [],
topicID2: ['topicID1'],
topicID3: ['topicID2', 'topicID1'],
topicID4: ['topicID3', 'topicID2', 'topicID1'],
topicID5: ['topicID4', 'topicID3', 'topicID2', 'topicID1'],
topicID6: [],
topicID7: ['topicID6', 'topicID3', 'topicID2', 'topicID1'],
topicID8: [
'topicID7', 'topicID6', 'topicID3', 'topicID2', 'topicID1'],
topicID9: [
'topicID8', 'topicID7', 'topicID6', 'topicID3', 'topicID2',
'topicID1', 'topicID5', 'topicID4']
};

expect(diagnosticTestModelData.getTopicIdToAncestorTopicIds()).toEqual(
@@ -96,4 +95,4 @@ fdescribe('Diagnostic test model', () => {
expect(diagnosticTestModelData.getEligibleTopicIds()).toEqual(
expectedEligibleTopicIDs);
});
})
});
Original file line number Diff line number Diff line change
@@ -70,7 +70,8 @@ export class DiagnosticTestModelData {
this._topicIdToAncestorTopicIds = {};
for (let topicId in this._topicIdToPrerequisiteTopicIds) {
let ancestors = [];
let prerequisites = cloneDeep(this._topicIdToPrerequisiteTopicIds[topicId]);
let prerequisites = cloneDeep(
this._topicIdToPrerequisiteTopicIds[topicId]);

while (prerequisites.length > 0) {
let len = prerequisites.length;
@@ -107,7 +108,7 @@ export class DiagnosticTestModelData {
this._topicIdToSuccessorTopicIds = {};
for (let topicid in topicIdToChildTopicId) {
let successors = [];
let children = topicIdToChildTopicId[topicid];
let children = cloneDeep(topicIdToChildTopicId[topicid]);

while (children.length > 0) {
let len = children.length;
@@ -119,7 +120,6 @@ export class DiagnosticTestModelData {
this._topicIdToSuccessorTopicIds[lastTopicId]);
}
this._topicIdToSuccessorTopicIds[topicid] = successors;
console.log(this._topicIdToSuccessorTopicIds);
}
}