Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,619 Commits 1 Branch 0 Tags
7b5f9b80098b9a8100dc0acc9bb19f7ef6804713
Commit Graph

39 Commits

Author SHA1 Message Date
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
zubair-arbi
3204c8b3fe show credit eligibility requirements in studio 
ECOM-1591
 2015-06-12 13:19:57 +05:00
Will Daly
8988aa1c9e Credit provider integration Python API 
* Add end-point for initiating a request for credit from a provider.
* Add an end-point for a provider to update the status of a request (approved / denied).
 2015-06-11 11:34:25 -04:00
Will Daly
e5a62aaaba Credit provider integration Python API 
* Add Python API functions for creating and updating requests for credit.
* Add Django models and migrations for tracking credit requests and status.
 2015-06-08 13:30:32 -04:00
Ahsan Ulhaq
5f74a1406e Set up Credit Provider Model 
Update credit Provider model and register in admin

ECOM-1555
 2015-06-05 12:25:02 +05:00
zubair-arbi
38b859fd40 use 'name' field in 'CreditRequirement' model to save the location of xblocks 2015-06-03 18:54:33 +05:00
Aamir
110a7b1af4 Merge pull request #8232 from edx/aamir-khan/ECOM-1592-ICRV-credit-requirement-new 
ECOM-1592: Adding incourse reverification as a credit requirement in …
 2015-06-03 11:58:23 +05:00
Will Daly
58d24111f5 Add additional "reason" field to CreditRequirementStatus 
* Add "reason" JSON-encoded field to CreditRequirementStatus.
* Add a "failed" status to CreditRequirementStatus.status choices.
 2015-06-02 11:17:11 -04:00
aamir-khan
41db8d8ec1 ECOM-1592: code refactoring 2015-06-02 16:31:23 +05:00
aamir-khan
810733db2c ECOM-1592: Adding incourse reverification as a credit requirement in course 2015-06-02 11:55:26 +05:00
Will Daly
05ea62fb78 Fix credit requirement "criteria" name 
The CreditRequirement "configuration" field was renamed in Django
code without updating the migration.  This commit adds a second
migration to delete the incorrect field and add a new field.
The credit feature is currently disabled in production, so
the model isn't currently used by application code.
 2015-05-29 08:22:45 -04:00
aamir-khan
97b5ff7e8b ECOM-1590: added the min_grade as a requirements 2015-05-28 12:28:38 +05:00
Awais
2599445190 ECOM-1590 adding models for credit eligibility. 2015-05-20 14:18:37 +05:00