Skip to content

Edit section and subsection at course outline page. - #4425

Merged
cahrens merged 1 commit into
bulk-publishingfrom
alex/edit_course_outline
Jul 31, 2014
Merged

Edit section and subsection at course outline page.#4425
cahrens merged 1 commit into
bulk-publishingfrom
alex/edit_course_outline

Conversation

@auraz

@auraz auraz commented Jul 15, 2014

Copy link
Copy Markdown
Contributor

As a course author, I want to view and change the release date and time for subsections/sections and the due date and time and grading type for subsections from the course outline page.

https://openedx.atlassian.net/browse/STUD-1881

Test instance: http://studio.auraz.m.sandbox.edx.org/course/edX/Open_DemoX/edx_demo_course

VIEWING:

  • From the course outline, release date for sections and subsections should be viewable as per UX visual design.
  • From the course outline, due date for graded subsections and grade type should be viewable as per UX visual design.

EDITING:

  • For sections and subsections: from the course outline page, clicking the gear icon for a subsection should open a popup with fields to edit the release date and time.
    • This action should change the release date of the current subsection and all children units.
    • If the release date and time is removed, the release date and time should be updated to inherit from the parent section (replaces the current “sync” option if due dates for children differ from parent).
  • For subsections only: From the course outline page, clicking the gear icon for a subsection should open a popup with fields to edit the due date and time and the grading type (not graded, homework, lab, midterm exam, final exam, etc.)
    • If the due date/time is removed, the subsection should not have any due date/time. (No inheritance.)
  • You cannot delete the section release date.

NOTES:

  • current implementation does not follow mockups visually but uses existing modal window design.
  • staff only (overrided release date) checkbox present in mockups is not implemented (outside of the scope of the task)
  • modal window does not look good when browser window is resized to less then 1116px

@cahrens @andy-armstrong @frrrances @explorerleslie @mhoeber please review.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Having a separate asset call for this specific page is less than ideal (especially with us using this vendor datepicker UI on other Studio pages, e.g. Course Settings). Its fine for now, but a follow-up story might be worthwhile to better bundle our vendor assets together with our styling for optimization.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

^ @andy-armstrong, do you agree here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@talbs you're right, it makes sense.

@talbs

talbs commented Jul 17, 2014

Copy link
Copy Markdown
Contributor

@auraz, just a heads up - when opening the settings modal on a Section, the title of the modal says "Subsection Settings". This should be changed to "Section Settings". Here's a screengrab to help understand the issue:

studio-section-edit-modal-issue

@talbs

talbs commented Jul 23, 2014

Copy link
Copy Markdown
Contributor

@frrrances, can you review my UI and FED work here once more for final UX sign off?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Since this is already in the "specific modal overrides" section, do you want to make this header describe this particular modal type, like "section settings modal"?

@frrrances

Copy link
Copy Markdown
Contributor

@talbs Nice work! I had a couple small questions on the code above. My only other comment is that the spacing is pretty big in the modal; I would tighten it up, but if you are happy as-is, I'm cool with that. 👍

@talbs

talbs commented Jul 23, 2014

Copy link
Copy Markdown
Contributor

Thanks, @frrrances. I've refactored the UI for the outline item editor modal and new content-based modal styles into the general modal Sass partial. I've also tried to reduce the visual space around elements in the modal. Thanks for the recommendations.

@cahrens

cahrens commented Jul 24, 2014

Copy link
Copy Markdown

Could the dialogs have the name of the Section or Subsection in them so that you can be sure you are editing for the correct thing? @talbs, what do you think?

@cahrens

cahrens commented Jul 24, 2014

Copy link
Copy Markdown

I am seeing a bug where setting the grading type on a subsection causes the subsection to collapse (hide all the units).

Repro steps-

  1. Expand subsection to view units
  2. Change grading type
  3. Subsection collapses

This happens to me for setting dates as well, and changes on the section as well as the subsection.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Can more of the fields you added (start, due_date, graded, due, format) be tested?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Fixed: "Can more of the fields you added (start, due_date, graded, due, format) be tested?"

@cahrens

cahrens commented Jul 24, 2014

Copy link
Copy Markdown

Why can't you clear the Section release date to go back to the default?

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Reset grading type to Not Graded.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I think test had wrong description, as It makes no sense to test html select. UI does not have special button ("remove icon") to clear grading types. Possibility to change values of grading format is tested in other jasmine tests and in bok_choy tests. Fixed test description.

@cahrens

cahrens commented Jul 24, 2014

Copy link
Copy Markdown

@explorerleslie it looks like we will need another story to sync up the styling of how the release date, due date, and grading type are displayed on the course outline page.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Correct comment.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Fixed: "Correct comment."

@talbs

talbs commented Jul 24, 2014

Copy link
Copy Markdown
Contributor

@cahrens, thanks for the UX/UI heads ups. Adding specific Section/Subsection names to the modal titles sounds great and I agree it should be added.

@auraz

auraz commented Jul 29, 2014

Copy link
Copy Markdown
Contributor Author

@frrrances Please clarify .modal-editor issue:

  1. I've removed .modal-editor from basic-modal.underscore
  2. Another place where it is user it is tabs-edit.html of video player. If we want to remove it from there, I think it should be done in separate PR, in order to ensure that video player is not broken. Do we need to remove it from there?
  3. Should I need to clean up scss (_modal-window.scss) from .modal-editor classes or not?
    So there are 2 files left where where modal-editor class is used.

Regarding defaults:
In cms/static/js/views/modals/base_modal.js we use two classes : "modal-window'" and "modal-content". What do you mean by "we should have one place to put all the various classes we want on a modal rather than having each one named with defaults".
I'm ready to talk about it.

@auraz

auraz commented Jul 29, 2014

Copy link
Copy Markdown
Contributor Author

@cahrens Do we need changelog for this kind of PRs, which go into bulk-publishing?

@auraz

auraz commented Jul 29, 2014

Copy link
Copy Markdown
Contributor Author

@frrrances your comment is addressed, please check.

@auraz

auraz commented Jul 29, 2014

Copy link
Copy Markdown
Contributor Author

@cahrens all comments are addressed, please continue review

@auraz

auraz commented Jul 29, 2014

Copy link
Copy Markdown
Contributor Author

Screenshots of modal windows:
screenshot 2014-07-29 17 59 31
screenshot 2014-07-29 17 59 39
screenshot 2014-07-29 18 00 09
screenshot 2014-07-29 18 00 20

@frrrances

Copy link
Copy Markdown
Contributor

@auraz Looks good! 👍

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Can you rename isEditable to something like "isEditableOnCourseOutline"? It's confusing because verticals certainly are editable-- on the container page. The current name of the method implies a much more generic definition of editability.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Fixed: "Can you rename isEditable to something like "isEditableOnCourseOutline"

@cahrens

cahrens commented Jul 29, 2014

Copy link
Copy Markdown

Done with re-review-- looking good!

I personally think the modal dialog is much too wide. I have pinged @frrrances about that.

@auraz

auraz commented Jul 30, 2014

Copy link
Copy Markdown
Contributor Author

@cahrens all your comments were addressed. It looks bulk-publishing was rebased. So I will squash commits and rebase on it again.

@auraz

auraz commented Jul 30, 2014

Copy link
Copy Markdown
Contributor Author

That were merge conflicts. Rebased.

@cahrens

cahrens commented Jul 30, 2014

Copy link
Copy Markdown

Setting the release date is causing a collapsed section to expand. The root cause is probably the same as for https://openedx.atlassian.net/browse/STUD-2038.

@cahrens

cahrens commented Jul 30, 2014

Copy link
Copy Markdown

OK, @talbs I might opt to go back to the "large" dialog. The dialog is wrapping on me, even when browser is maximized.
screen shot 2014-07-30 at 2 45 27 pm

@auraz

auraz commented Jul 30, 2014

Copy link
Copy Markdown
Contributor Author

Not quite, in this PR issue for subsections was fixed. But for sections not.
However even fix for subsections shows expanding and collapsing of subsections on slow machines. So this should be fixed more systematically in 2038

Aelxander Kryklia
Sent with Sparrow (http://www.sparrowmailapp.com/?sig)

On Wednesday, July 30, 2014 at 9:45 PM, Christina Roberts wrote:

Setting the release date is causing a collapsed section to expand. The root cause is probably the same as for https://openedx.atlassian.net/browse/STUD-2038.


Reply to this email directly or view it on GitHub (https://github.com/edx/edx-platform/pull/4425#issuecomment-50661268).

@talbs

talbs commented Jul 30, 2014

Copy link
Copy Markdown
Contributor

@cahrens, modal size has been reverted again to large.

@auraz, you'll need to squash my "lil designer commit" into your mega commit again.

@auraz

auraz commented Jul 30, 2014

Copy link
Copy Markdown
Contributor Author

@talbs OK, thanks

@cahrens

cahrens commented Jul 31, 2014

Copy link
Copy Markdown

👍

@auraz

auraz commented Jul 31, 2014

Copy link
Copy Markdown
Contributor Author

Failing tests:
acceptance.tests.video.test_video_handout.VideoHandoutTest.test_handout_download_works_with_save
acceptance.tests.video.test_video_handout.VideoHandoutTest.test_handout_replace_w_save
acceptance.tests.video.test_video_times.VideoTimesTest.test_video_start_time
acceptance.tests.video.test_video_handout.VideoHandoutTest.test_handout_replace_wo_save
acceptance.tests.video.test_video_handout.VideoHandoutTest.test_handout_upload_and_clear_works
acceptance.tests.video.test_video_module.YouTubeVideoTest.test_multiple_videos_in_sequentials_load_and_work

@cahrens do you think I can merge?

Fix bok_choy test by changing course separator.
Change format of the modal title to '[Subsection/Section Name] Settings'.
Improve bok_choy test stability.
Studio: correcting modal window size name for outline settings editor
Specify full date in bok_choy tests.
Refactor bok_choy tests.
Remove .modal-editor from basic-modal.underscore
Set classes in modal window dynamically.
Studio: revising outline edit modal tip content and overall size
Rename isEditable to isEditableOnCourseOutline.
Interpolate display name.
Use graded instead of format as flag.
Studio: revising outline settings edit modal size
Fix selectors in bok_choy tests.
@cahrens
cahrens merged this pull request into bulk-publishing Jul 31, 2014
@cahrens
cahrens deleted the alex/edit_course_outline branch July 31, 2014 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants