Commit Graph

403 Commits

Author SHA1 Message Date
Dillon Dumesnil
304b000b1b Merge pull request #24134 from edx/ddumesnil/dates-widget-enhancement-AA-103
AA-103: Dates widget enhancements
2020-06-08 06:21:44 -07:00
Aura Milena Alba
b7a838c34b Remove pattern library of course_experience/course-updates-fragment.html. (#24062) 2020-06-05 09:54:03 -04:00
Dillon Dumesnil
f32c51383b AA-103: Dates widget enhancements
Reducing dates widget to one assignment. Adding link to dates
page in the dates widget
2020-06-04 12:48:00 -06:00
Calen Pennington
d3b11ec25b Refactor dates_banner_should_display to only return a single value, and to have a clearer set of conditions 2020-06-03 10:14:11 -04:00
Calen Pennington
f9cfbd8593 Revert "Merge pull request #24131 from edx/revert-24085-use-content-type-gating-in-dates-banner"
This reverts commit c3ec8b837a, reversing
changes made to 4252b14927.
2020-06-03 09:57:22 -04:00
Calen Pennington
561cdab7dd Revert "Use content type gating in dates banner" 2020-06-03 09:52:24 -04:00
Calen Pennington
4252b14927 Merge pull request #24085 from cpennington/use-content-type-gating-in-dates-banner
Use content type gating in dates banner
2020-06-03 09:50:09 -04:00
Calen Pennington
7c4585ebfe Only prompt to upgrade in order to completed graded content (or shift dates) when content_type_gating is enabled 2020-06-02 14:23:28 -04:00
Jason Myatt
4d01a736d2 Check for none on subsection due date 2020-06-02 11:29:09 -04:00
Michael Terry
03860c7359 AA-76: Add is_allowed property to DatesSummary
This takes over some of the logic in the is_enabled property which
previously checked two things: (1) is the date time-sensitive and
(2) is the date even applicable to this course.

Now, is_enabled is only responsible for time-sensitive checks and
the new is_allowed property checks applicability.

In this way, we can more cleanly separate whether a date block
should show up on the dates sidebar (is_enabled and is_allowed)
and the dates tab (is_allowed).
2020-06-02 09:26:24 -04:00
Calen Pennington
6f568d097c Set missed_deadlines in the course outlines template to simplify the logic in the dates_banner.html 2020-06-01 15:48:40 -04:00
Calen Pennington
0c7947c8a2 Pass whether content type gating is enabled for the current user into the dates_banner template 2020-05-28 11:34:05 -04:00
Calen Pennington
34c03bf14a Fix some accidental tuples in the variables passed to the dates_banner 2020-05-27 11:24:10 -04:00
Calen Pennington
fc21a337aa Use a fixed time for course duration limits, so that schedule extensions don't extend FBE duration limits 2020-05-26 16:29:28 -04:00
Nicholas D'Alfonso
b454f9be1d AA-151 dates banner on course outline and refactor
- use new dates banner template on course outline page
- remove old banner from main.html
- let dates tab use new dates banner template
- remove dates banner completely from the courseware problem view
  on the web app
- use new banner on the courseware problem view on the mobile app
- update banner util to use get_course_blocks
2020-05-21 13:23:05 -04:00
Nick
821eb84486 Merge pull request #23963 from edx/ndalfonso/AA-157-dates-page-missed-deadlines
AA-157 dates page missed deadlines
2020-05-13 10:24:10 -04:00
Nicholas D'Alfonso
637b639e78 AA-157 dates page missed deadlines
- add banner to dates page when deadlines are missed
2020-05-12 13:02:26 -04:00
Farhanah Sheets
d37b333d53 Revert "Add financial assistance link in course tools (#23921)"
This reverts commit cbb4cfb988.
2020-05-10 16:43:39 -04:00
Carla Duarte
6fd6605eed Remove Shorten Welcome Message flag
Removed use of the 'shorten_welcome_message' waffle flag

AA-108
2020-05-08 15:25:59 -04:00
Diane Kaplan
cbb4cfb988 Add financial assistance link in course tools (#23921)
Add financial assistance link in course tools for eligible courses, so it'll be more visible to learners
2020-05-08 10:35:10 -04:00
Nick
d24e4fe5a8 Merge pull request #23876 from edx/revert-23871-ndalfonso/AA-138-banner-debug
Revert "add logs for debugging"
2020-05-07 15:31:00 -04:00
Dillon Dumesnil
10759a9046 Merge pull request #23819 from edx/ddumesnil/more-date-pills-aa-99
AA-99: Adding in new date pills for the dates tab
2020-05-06 06:12:50 -07:00
Simon Chen
262574b815 Move all the upgrade display logic into courseware.utils 2020-05-05 17:54:22 -04:00
Nicholas D'Alfonso
4a26d47a06 Check if subsection is graded on course outline page 2020-05-04 12:12:59 -04:00
Dillon Dumesnil
858154a7d6 AA-99: Adding in new date pills for the dates tab 2020-05-04 07:24:01 -07:00
Nick
ede713002d Revert "add logs for debugging" 2020-05-01 17:32:17 -04:00
Simon Chen
34d4d162f7 MST-108 Add masquerading fix to the upgrade message display 2020-05-01 16:54:43 -04:00
Nicholas D'Alfonso
21358b764e add logs for debugging 2020-05-01 15:19:26 -04:00
Calen Pennington
ff88f3d423 Only show the resets date banner if you have missed the due date on a graded subsection
[AA-138]
2020-04-30 11:50:45 -04:00
Michael Terry
0f81765ac7 Show graded icons in more places
In the course outline, if a subsection has any graded content,
show a graded icon (the pencil icon).

Also, show the graded icon for LTI xmodule units (xblocks is a
different repo, but will get same treatment).

AA-75
2020-04-24 14:16:32 -04:00
David Joy
7a400e2917 Factoring redirects out of check_course_access so it can be used with courseware_api (#23651)
TNL-7053

The courseware_api view will use check_course_access - which now returns AccessResponse objects, and all other uses of check_course_access will now use check_course_access_with_redirect, which is a drop-in replacement for the original check_course_access implementation.

We also added a few new helpers to access_utils:

- check_public_access is a replacement for allow_public_access, which now returns AccessResponse objects
 - check_enrollment checks if the learner is enrolled, and uses check_public_access to account for COURSE_ENABLE_UNENROLLED_ACCESS_FLAG
- check_survey checks whether there is a required survey that the learner must complete prior to accessing the course.

There are two new kinds of AccessError subclasses:

- SurveyRequiredAccessError
- EnrollmentRequiredAccessError
2020-04-15 10:29:24 -04:00
Nicholas D'Alfonso
9e41268322 AA-83 special exam icon
- fix template rendering so that pencil icon is displayed for
  a special exam and also ensure it is not rendered twice
2020-04-14 11:08:44 -04:00
Nicholas D'Alfonso
396050703e AA-97 mobile reset message
- remove code for displaying banner in mobile dates fragment
- replace button with link to web app in reset dates banner on
  the mobile problem template
- adjust spacing of reset dates button in banner when button wraps
  on smaller screen
2020-04-09 12:55:26 -04:00
Michael Terry
7a71356cd2 Cut off long course welcome messages
If a course welcome message is very long, cut it off with an
ellipsis and show a Show More button to reveal the full thing.

AA-46
2020-04-07 10:49:40 -04:00
Nicholas D'Alfonso
fe8d28bccf AA fix mobile reset dates banner 2020-04-03 15:22:50 -04:00
Nicholas D'Alfonso
ac9d2bfd30 AA-85 mobile reset dates
- render reset dates banner in webview for mobile app.
- improve banner redirect mechanism
2020-04-02 00:37:54 -04:00
Nicholas D'Alfonso
52309d5541 AA-38 calendar sync email template
- create templates and methods to build/send calendar sync emails.
2020-03-25 16:40:19 -04:00
Michael Terry
7fb18c4ec9 Adjust question count logic on outline
The question counts showed in course outlines assumed that no
blocks would both be a graded assignment and have children. That's
generally true, but this commit avoids that assumption.
2020-03-19 10:20:30 -04:00
Dillon Dumesnil
78baddb60f Merge pull request #23445 from edx/ddumesnil/date-comment
Adding comment about div that can't be removed.
2020-03-18 13:11:11 -07:00
Dillon Dumesnil
b9e6fdfdef Adding comment about div that can't be removed.
Also fixing Meta class being defined twice in one model
2020-03-18 11:45:19 -07:00
Michael Terry
a199c6bfd9 Show number of problems in outline
Specifically, the number of 'problem' blocks that are graded, in
a given subsection. Also shows an icon next to the subsection if so.

AA-45
2020-03-17 12:44:11 -04:00
Jeff LaJoie
11a9a4e471 AA-51: Adds in 'Up next' banner to course home 2020-03-16 15:50:19 -04:00
Nick
18e3c2fd52 Merge pull request #23373 from edx/AA-59-reset-dates-banner-on-courseware
AA-59 show reset dates banner on courseware page
2020-03-13 08:14:00 -04:00
Nicholas D'Alfonso
3cee26feb4 AA-59 show reset dates banner on courseware page
- Also, only show banner if the course end_date has not already
  pass AND if the user is verified within the course.
2020-03-12 19:52:54 -04:00
Dillon Dumesnil
c3493d5138 Merge pull request #23356 from edx/ddumesnil/AA-58
AA-58: Add date-summary-container html back in
2020-03-12 10:51:04 -04:00
Michael Terry
f56a01adbe Reset schedule when mode changes
This way if an audit user upgrades a self paced course to verified,
their schedule will reset to the current time.

AA-60
2020-03-11 11:53:49 -04:00
Dillon Dumesnil
9586a2e3e8 AA-58: Add date-summary-container html back in 2020-03-11 09:24:09 -04:00
Calen Pennington
1ce39a85a4 Merge pull request #23364 from cpennington/reset-schedule-masq
Respect masquerade status when resetting student schedules
2020-03-11 08:54:51 -04:00
Dillon Dumesnil
f395e5f5cf Merge pull request #23284 from edx/ddumesnil/calendar-sync-button-AA-36
AA-36: Link to toggle calendar sync
2020-03-10 15:37:01 -04:00
Calen Pennington
5235fa7bab Respect masquerade status when resetting student schedules 2020-03-10 15:10:01 -04:00