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

Fix #2689: Corrected options in exploration with id text_exp_id_4 of Second Test Topic. #2690

Merged
merged 24 commits into from
Feb 12, 2021
Merged

Fix #2689: Corrected options in exploration with id text_exp_id_4 of Second Test Topic. #2690

merged 24 commits into from
Feb 12, 2021

Conversation

veena14cs
Copy link
Contributor

@veena14cs veena14cs commented Feb 11, 2021 •
edited
Loading

Explanation

This PR fixes #2689. This includes change in Json data of text_exp_id_4, now the file contains options, that has correct ordering of answers. This also fixes the StateRetrieverTest

Screenshot
Screenshot_20210212_003932

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The PR follows the style guide.
  • The PR does not contain any unnecessary auto-generated code from Android Studio.
  • The PR is made from a branch that's not called "develop".
  • The PR is made from a branch that is up-to-date with "develop".
  • The PR's branch is based on "develop" and not on any other branch.
  • The PR is assigned to an appropriate reviewer in both the Assignees and the Reviewers sections.

@veena14cs
implemented recommendation system
0d0e0d6
@veena14cs
Merge remote-tracking branch 'upstream/develop' into recommended-story
94d179c
@veena14cs
writing testcases
3b374c6
@veena14cs
Update TopicListControllerTest.kt
9d2d9e4
@veena14cs
reverted changes
5309299
@veena14cs
optimized list
7282650
@veena14cs
fixed recommended list
02bba56
@veena14cs
fixed index error
27112a3
@veena14cs
Merge remote-tracking branch 'upstream/develop' into promoted-story
a0abcc3
@veena14cs
added timestamp for recently played
1a9fdc4
@veena14cs
removed walkthrough field
f2b6271
@veena14cs
writting testcases
4e6926c
@veena14cs
fixing testcase
872ccc3
@veena14cs
Merge remote-tracking branch 'upstream/develop' into promoted-story
1115eaf
@veena14cs
Merge remote-tracking branch 'upstream/develop' into develop
d2bcbea
@veena14cs
Merge branch 'promoted-story' into develop
a6a940f
@veena14cs
Merge remote-tracking branch 'upstream/develop' into develop
32824aa
@veena14cs
updated with develop
29171ba
@veena14cs
Update TopicTestActivityForStory.kt
c1fea02
@veena14cs
Fixed exploration id 4 json and testcase
4216726
@veena14cs veena14cs assigned veena14cs and rt4914 and unassigned veena14cs Feb 11, 2021
rt4914
rt4914 suggested changes Feb 12, 2021
View reviewed changes
Copy link
Contributor

@rt4914 rt4914 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This solution works but the PR introduces a lot of other changes which should not be part of this PR.

app/src/main/java/org/oppia/android/app/home/topiclist/PromotedItemViewModel.kt Outdated Show resolved Hide resolved
app/src/main/res/drawable/bottom_left_rounded_rect_coming_soon_background.xml Outdated Show resolved Hide resolved
app/src/main/res/layout/promoted_story_list.xml Outdated Show resolved Hide resolved
app/src/main/res/layout/fraction_interaction_item.xml Outdated Show resolved Hide resolved
domain/src/main/assets/coming_soon_topics.json Outdated Show resolved Hide resolved
@rt4914 rt4914 assigned veena14cs and unassigned rt4914 Feb 12, 2021
@veena14cs
Copy link
Contributor Author

@rt4914 fixed unrelated file changes in the PR PTAL.

@veena14cs veena14cs assigned rt4914 and unassigned veena14cs Feb 12, 2021
BenHenning
BenHenning approved these changes Feb 12, 2021
View reviewed changes
Copy link
Sponsor Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @veena14cs.

rt4914
rt4914 approved these changes Feb 12, 2021
View reviewed changes
Copy link
Contributor

@rt4914 rt4914 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, Thanks

@rt4914
Copy link
Contributor

rt4914 commented Feb 12, 2021

Checks are failing. Rerunning the now.

@rt4914 rt4914 assigned BenHenning and unassigned rt4914 Feb 12, 2021
@BenHenning BenHenning mentioned this pull request Feb 12, 2021
Open
8 tasks
@veena14cs veena14cs merged commit fa67542 into oppia:develop Feb 12, 2021
@veena14cs veena14cs deleted the fix-second-test-topic-json branch February 12, 2021 19:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rt4914 rt4914 rt4914 approved these changes

@BenHenning BenHenning BenHenning approved these changes

Assignees

@BenHenning BenHenning

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Not able to submit answer in Second Test Topic.
3 participants
@veena14cs @rt4914 @BenHenning