Commit Graph

62 Commits

Author SHA1 Message Date
chrisndodge
f5057b841c Merge pull request #9597 from edx/cdodge/adjust-log-level
reduce logging severity from exception to error
2015-09-09 12:29:43 -04:00
Chris Dodge
56f0043877 reduce logging severity from exception to error 2015-09-08 14:34:05 -04:00
Ahsan Ulhaq
ea40c2f1c6 Credit-Eligible Assessments Appearing in Incorrect Order
ECOM-2118
2015-09-08 14:00:13 +05:00
chrisndodge
f8e44f7832 Merge pull request #9536 from edx/muhhshoaib/PHX-122-remove-the-record-in-the-creditRequirementStatus-table
PHX-122
2015-09-01 16:05:43 -04:00
Muhammad Shoaib
4d0efa2893 PHX-122
Fixed the issue when deleting a proctored exam attempt does not remove the record in the CreditRequirementStatus table
2015-09-01 15:08:11 -04:00
Clinton Blackburn
c6c897e218 Added test for CreditCourse endpoint CSRF validation
This test gives peace-of-mind and ensures that CSRF validation is enforced for session authentication.

XCOM-524
2015-08-31 13:51:22 -04:00
Clinton Blackburn
a1ba77d6b3 Diabled CSRF protection for Credit Course API endpoints
CSRF protection needs to be disabled so that requests made using OAuth and other non-session-based authentication mechanisms can be properly processed. If session authentication is used, DRF will enforce CSRF protection.

XCOM-524
2015-08-29 03:02:05 -04:00
Chris Dodge
ea1e875dfe add ability to return the course name (optionally) when querying about credit requirement fulfillments 2015-08-22 17:24:23 -04:00
Ahsan Ulhaq
e3674e92e3 Credit eligibility email should use the correct staticfiles library
ECOM-2026
2015-08-21 20:17:55 +05:00
chrisndodge
3294b3165d Merge pull request #9386 from edx/cdodge/dont-return-none-for-non-credit-course
Cdodge/dont return none for non credit course
2015-08-20 14:35:13 -04:00
Chris Dodge
9310c82f0f Update credit services to gracefully handle operations on a course which is actually not credit enabled 2015-08-20 11:54:57 -04:00
zubair-arbi
ec28a75f14 In-course reverification access control
* Automatically create user partitions on course publish for each ICRV checkpoint.
* Disable partitions for ICRV checkpoints that have been deleted.
* Skip partitions that have been disabled when checking access.
* Add verification access control UI to visibility settings.
* Add verification access control UI to sequential and vertical settings.
* Add partition scheme for verification partition groups.
* Cache information used by verification partition scheme and invalidate the cache on update.
* Add location parameter to UserPartition so the partition scheme can find the associated checkpoint.
* Refactor GroupConfiguration to allow multiple user partitions.
* Add special messaging to ICRV for students in the honor track.

Authors: Zubair Arbi, Awais Qureshi, Aamir Khan, Will Daly
2015-08-20 08:43:55 -07:00
Will Daly
e4a1ebd11c Specify course key when retrieving credit requirements.
Fix an exception that could occur if a user had completed
the final grade credit requirement in > 1 course.
2015-08-18 09:15:32 -07:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Clinton Blackburn
58865ee0a8 Added API endpoints for CreditCourse
Endpoints support create, read, and list operations.

NOTE: This commit also includes a retrofitted SimpleRouter that supports overriding the lookup regex. This retrofit is simpler to implement than updating edx-ora2 which is pinned to DRF 2.3.x.

XCOM-524
2015-08-11 15:44:37 -04:00
aamir-khan
9f0f081a1f ECOM-1916: updated the dispaly 2015-07-28 14:59:48 +05:00
Awais
1d2bc6fd67 ECOM-1807 Adding provider thumbnail url. 2015-07-27 20:04:05 +05:00
zubair-arbi
a2dd5d91f6 update caching for eligibility email content and edx-logo
ECOM-1525
2015-07-27 11:14:38 +05:00
Will Daly
17f713aa4a ECOM-1911: Fixes to credit requirements in Studio.
* Exclude orphaned XBlocks from requirements because they have been deleted.
* Sort ICRV requirements by start date, then by display name.
2015-07-23 13:07:13 -07:00
chrisndodge
5e195c8eeb Merge pull request #8962 from edx/cdodge/proctoring-studio
Integrate timed and proctored exam authoring into Studio
2015-07-23 15:53:17 -04:00
Chris Dodge
3748119961 Integrate timed and proctored exam authoring into Studio 2015-07-23 14:43:17 -04:00
Ahsan Ulhaq
06b085f8b4 credit eligibility and payment receipt email
ECOM-1796
ECOM-1525
2015-07-22 12:34:38 +05:00
Will Daly
d3f58b689f Credit progress page formatting bugfixes.
* Correctly format the student's full name on the progress page.
* Add tests for progress page credit requirements display.
* Display grade percentage for credit requirement on progress page
2015-07-20 13:08:13 -07:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
Awais Jibran
2d19eafa7c Merge pull request #7404 from edx/waheed/plat407-decorate-instructor-dashboard-with-sudo-required
Decorated instructor dashboard with sudo_required.
2015-07-16 21:12:43 +05:00
aamir-khan
d5dda6470e ECOM-1816: added the provider detail on the receipt page. 2015-07-16 18:25:03 +05:00
Tasawer
1ded8b546c Update code of get_eligibility api.
ECOM-1858
2015-07-16 12:52:16 +05:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Tasawer
6e788d95b9 new view added "get_provider_detail" for getting provider info with provider_id
ECOM-1858
2015-07-15 12:25:26 +05:00
zubair-arbi
71ce4d071b add 'provider_description' field for CreditProvider model
ECOM-1842
2015-07-09 13:13:37 +05:00
zubair-arbi
8a65167d79 Merge pull request #8795 from edx/zub/story/ecom-1815-update-creditprovider-model
add 'fulfillment_instructions' for 'CreditProvider' model
2015-07-09 12:04:53 +05:00
Will Daly
4b64df74b1 Fix migrations 0012 and 0013 in the credit app
Adds the "order" field that was introduced in 0011 to the "models"
dictionary of migrations 0012 and 0013 so South knows that
the field should exist after 0011 is run.
2015-07-08 16:55:37 -04:00
zubair-arbi
66e18eda56 add 'fulfillment_instructions' for 'CreditProvider' model + add api method to get credit provider data
ECOM-1815
2015-07-08 15:12:36 +05:00
Will Daly
104bcd5143 Merge remote-tracking branch 'origin/release' into merge-release-into-master
Conflicts:
	common/djangoapps/student/views.py
	openedx/core/djangoapps/credit/tests/test_api.py
2015-07-07 09:58:45 -07:00
Will Daly
e67975b275 Feature flag credit provider messaging on the dashboard.
When the credit eligibility is disabled, skip the code
that access the CreditProvider table.  This will allow us
to safely delete a column from the table in rc/2015-07-08.
2015-07-06 12:56:15 -07:00
Will Daly
8824d032d4 Merge pull request #8767 from edx/will/optimize-credit-reqs-update
Credit requirement optimizations
2015-07-02 12:37:26 -07:00
Will Daly
06ddb2f359 Credit requirement optimizations
* Skip adding the credit req tasks to the queue for non-credit courses.
* Load only ICRV XBlocks instead of traversing the course tree.
2015-07-02 11:35:46 -07:00
Will Daly
e2acf3ab87 Credit eligibility/provider refactor
* Remove m2m relation between credit course and credit providers.
* Separate eligibility and provider APIs into different modules.
* Add API call for retrieving a user's eligibilities.
* Cache credit course list.
* Style the dashboard purchase button.
* Display a link for the credit provider on the dashboard.
* Add analytics events for clicks on the purchase button.
* Expose more credit models to Django admin and add search functionality.
2015-07-02 10:03:52 -07:00
Ahsan Ulhaq
7787974dd5 Order of Credit Eligibility line items
Displayed eligibility line items on the Progress page of a Credit course
in the order of appearance in the courseware.

ECOM-1782
2015-07-01 13:40:39 +05:00
Awais
b8e04f30a1 ECOM-1597 adding signals to update min-grade requirement. 2015-06-29 15:01:19 +05:00
Will Daly
da982341e7 Accept string-encoded timestamps 2015-06-25 13:18:30 -07:00
Will Daly
62742952a2 Make credit provider callback CSRF exempt 2015-06-25 13:04:45 -07:00
Will Daly
8548d55700 Gracefully handle credit provider keys with unicode type 2015-06-25 10:53:36 -07:00
Will Daly
75d194e279 Update credit eligibility
* Update credit eligibility when a user satisfies an eligibility requirement.
* Refactor set_credit_requirement_status arguments.
* Use django-simple-history to track requirement status changes.
* Refactor progress page by moving credit into a helper function and adding comments.
2015-06-24 15:19:27 -07:00
aamir-khan
987889fc37 ECOM-1524: Display credit availability on the dashboard 2015-06-24 16:50:38 +05:00
Will Daly
c426f5506b Respond to code review feedback. 2015-06-22 10:11:28 -07:00
Will Daly
cea06e1217 Update the format of the credit provider timestamp.
Use the number of seconds since the epoch (Jan 1 1970 UTC)
instead of an ISO-formatted datetime string.  This is easier
for credit providers to parse.
2015-06-22 10:03:31 -07:00
Ahsan Ulhaq
6fdff766bc Credit eligibility requirements display on student progress page
ECOM-1523
2015-06-22 18:36:54 +05:00
Ahsan Ulhaq
7d11768358 update the ICRV requirments status
After receiving the response from software secure update the ICRV
requirement status in CreditRequirementstatus table.

ECOM-1602
2015-06-16 22:27:54 +05:00
Ahsan Ulhaq
d35b652843 Display Eligibility table on progress page
1-Adding basic html for displaying eligibility table
2-Updated Eligibility Requirements Dynamically

ECOM-1523
2015-06-16 16:19:33 +05:00