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

Question editor fixes #7910

Merged
merged 19 commits into from
Nov 6, 2019
Merged

Question editor fixes #7910

merged 19 commits into from
Nov 6, 2019

Conversation

vinitamurthi
Copy link
Contributor

@vinitamurthi vinitamurthi commented Nov 3, 2019 •
edited
Loading

Explanation

This PR adds the following fixes:

  1. Increase the click area of the the “Add Response” modal when adding a question to be the entire width of the modal.
  2. Left align the "Question Content" data in the question list.
  3. Avoid opening the question editor modal more than once at a time.
  4. Add wording in the story node editor to mention that skill IDs added to the story need to be assigned to the topic.

Screen Shot 2019-11-03 at 2 32 17 PM

5. Change the wording for the question editor warning when misconceptions aren't tagged

Screen Shot 2019-11-03 at 2 53 45 PM

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 linter/Karma presubmit checks have passed.
    • These should run automatically, but if not, you can manually trigger them locally using python -m scripts.pre_commit_linter and python -m scripts.run_frontend_tests.
  • The PR is made from a branch that's not called "develop".
  • The PR has an appropriate "PROJECT: ..." label (Please add this label for the first-pass review of the PR).
  • The PR has an appropriate "CHANGELOG: ..." label (If you are unsure of which label to add, ask the reviewers for guidance).
  • The PR follows the style guide.
  • The PR addresses the points mentioned in the codeowner checks for the files/folders changed. (See the codeowner's wiki page.)
  • The PR is assigned to an appropriate reviewer.
    • If you're a new contributor, please ask on Gitter for someone to assign a reviewer and don't tick this checkbox.
    • If you're not sure who the appropriate reviewer is, please assign to the issue's "owner" -- see the "talk-to" label on the issue. Do not only request the review but also add the reviewer as an assignee.

@oppiabot
Copy link

oppiabot bot commented Nov 3, 2019

Assigning @aks681 for the first-pass review of this pull request. Thanks!

@vinitamurthi
Copy link
Contributor Author

PTAL @seanlip @aks681

seanlip
seanlip requested changes Nov 3, 2019
View reviewed changes
Copy link
Member

@seanlip seanlip left a comment

Choose a reason for hiding this comment

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

Thanks @vinitamurthi! Left a comment, otherwise LGTM.

...templates/dev/head/components/question-directives/questions-list/questions-list.directive.ts Outdated
@@ -88,6 +88,7 @@ angular.module('oppia').directive('questionsList', [
ctrl.getQuestionSummaries =
QuestionsListService.getCachedQuestionSummaries;
ctrl.getCurrentPageNumber = QuestionsListService.getCurrentPageNumber;
ctrl.isEditorOpen = false;
Copy link
Member

Choose a reason for hiding this comment

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

Could you make this editorIsOpen, following the existing convention of starting with verbs only for method/function names?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@seanlip seanlip assigned vinitamurthi and unassigned seanlip Nov 3, 2019
@codecov
Copy link

codecov bot commented Nov 3, 2019 •
edited
Loading

Codecov Report

Merging #7910 into develop will decrease coverage by 0.01%.
The diff coverage is 25%.

@@             Coverage Diff             @@
##           develop    #7910      +/-   ##
===========================================
- Coverage    83.99%   83.98%   -0.01%     
===========================================
  Files         1130     1130              
  Lines        67991    67996       +5     
  Branches      3815     3816       +1     
===========================================
- Hits         57104    57103       -1     
- Misses        9607     9613       +6     
  Partials      1280     1280
Flag Coverage Δ
#backend 100% <ø> (ø) ⬆️
#frontend 73.61% <25%> (-0.01%) ⬇️
Impacted Files Coverage Δ
.../head/domain/question/QuestionObjectFactorySpec.ts 100% <ø> (ø) ⬆️
...ectives/questions-list/questions-list.directive.ts 6.34% <0%> (-0.14%) ⬇️
.../dev/head/domain/question/QuestionObjectFactory.ts 86.96% <100%> (-0.19%) ⬇️

@vinitamurthi vinitamurthi assigned seanlip and unassigned vinitamurthi Nov 3, 2019
@vinitamurthi
Copy link
Contributor Author

@seanlip Made the changes, PTAL

seanlip
seanlip approved these changes Nov 3, 2019
View reviewed changes
Copy link
Member

@seanlip seanlip left a comment

Choose a reason for hiding this comment

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

Thanks! One small question, everything else looks good.

core/templates/dev/head/domain/question/QuestionObjectFactorySpec.ts Outdated
'above as [All other answers]) and tag the following misconceptions' +
' to that answer group: name, name_2, name_3');
'above as [All other answers]) and tag the following misconceptions ' +
'to that answer group: name, name_2, name_3');
Copy link
Member

Choose a reason for hiding this comment

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

Odd -- is the extra space here intentional? Seems like a typo (there's usually just one space after a colon).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah that was an extra space, removed it

@seanlip
Copy link
Member

seanlip commented Nov 3, 2019

@DubeySandeep @aks681 PTAL as codeowners. This needs to be merged into the November release.

aks681
aks681 approved these changes Nov 4, 2019
View reviewed changes
Copy link
Contributor

@aks681 aks681 left a comment

Choose a reason for hiding this comment

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

lgtm!

@aks681 aks681 removed their assignment Nov 4, 2019
@seanlip seanlip removed their assignment Nov 5, 2019
@vinitamurthi
Copy link
Contributor Author

@DubeySandeep can you take a look?

@oppiabot
Copy link

oppiabot bot commented Nov 5, 2019

Hi @vinitamurthi. Due to recent changes in the "develop" branch, this PR now has a merge conflict. Please follow this link if you need help resolving the conflict, so that the PR can be merged. Thanks!

DubeySandeep
DubeySandeep approved these changes Nov 5, 2019
View reviewed changes
Copy link
Member

@DubeySandeep DubeySandeep left a comment

Choose a reason for hiding this comment

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

LGTM for the code owner file.

@seanlip seanlip assigned vinitamurthi and unassigned DubeySandeep Nov 5, 2019
@seanlip seanlip merged commit 087af5a into oppia:develop Nov 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aks681 aks681 aks681 approved these changes

@DubeySandeep DubeySandeep DubeySandeep approved these changes

@seanlip seanlip seanlip approved these changes

Assignees

@vinitamurthi vinitamurthi

Labels
PR: LGTM
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@vinitamurthi @seanlip @DubeySandeep @aks681