Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,897 Commits 1 Branch 0 Tags
bc8fa5eaaaf43befe55b8088a869e23ce2a80e21
Commit Graph

142 Commits

Author SHA1 Message Date
Matt Tuchfarber
1d8613f34e Merge pull request #16602 from edx/tuchfarber/fix_instructor_ordering 
Fix instructors ordering on program marketing page
 2017-11-27 09:52:23 -05:00
bmedx
d827d47b48 Tag LMS Unit 2 tests that fail in Django 1.11 2017-11-22 15:47:22 -05:00
Ned Batchelder
e23e3a0486 Fix a number of unused-import pylint violations 2017-11-21 19:57:06 -05:00
Matt Tuchfarber
2c67f9647b Fix instructors ordering on program marketing page 
Changed to hold the instructors in a list instead of a dict
because a dict does not keep ordering.
 2017-11-20 11:25:19 -05:00
John Eskew
09bd0244b4 Move ccxcon, credit, and programs Django apps to AppConfig standard. 2017-11-08 17:06:09 -05:00
Diana Huang
b0877270bf Add course grades to programs dashboard. 2017-10-25 15:44:47 -04:00
Matt Tuchfarber
7305d6f97d Add trim to instructor deduplicator 
Current instructor list on program marketing page has duplicate
professors because they are manually entered and some have trailing
spaces. This fixes that.
 2017-10-23 14:50:02 -04:00
Albert St. Aubin
724168d605 simplification pr changes 2017-10-06 09:53:58 -04:00
Albert St. Aubin
a4cb374b16 PR update 2017-10-06 09:53:58 -04:00
Albert St. Aubin
d37264ae0c Bug fix for unpublished courses that users have putchased within a program 
[LEARNER-2715]
 2017-10-06 09:53:57 -04:00
Jeremy Bowman
fd6af6b05e ddt usage cleanup 2017-09-05 17:25:51 -04:00
Albert St. Aubin
004f4b75a4 update to resolver complete my program purchase to work with no-id-professional 
LEARNER-2420
 2017-08-31 13:54:33 -04:00
Alex Dusenbery
9009a5b0d3 may_certify_for_course checks if course is self_paced. 2017-08-25 14:37:53 -04:00
Albert St. Aubin
eab62e786f Corrected issue with missing Certificated on Program Dashboard View 
LEARNER-2352
 2017-08-24 11:17:43 -04:00
McKenzie Welter
3e4d20e0d4 bundle purchase tracking 2017-08-21 11:22:52 -04:00
sanfordstudent
5b34264cbc Merge pull request #15809 from edx/aed/EDUCATOR-527 
EDUCATOR-527 | get_certificates() should take CourseOverview.may_certify() into account
 2017-08-17 16:00:15 -04:00
Alex Dusenbery
14fcba4922 EDUCATOR-527 | get_certificates() should take CourseOverview.may_certify() into account. 2017-08-14 14:07:29 -04:00
McKenzie Welter
f11a4cf589 updated exception handling 2017-08-14 10:59:00 -04:00
Albert St. Aubin
de6d48a698 Added Program Purchase button to the Programs dashboard 
Learners can upgrade or enroll as verified in all remaining courses in a program from their programs dashboard

[LEARNER-1899]
 2017-08-09 16:52:51 -04:00
Clinton Blackburn
9efa7770f8 Resolved multi-tenant program issues 
A site must be passed so the system knows which URL to use to contact
the Discovery Service.
 2017-07-25 19:37:14 +05:00
Matthew Piatetsky
de3c802700 Do not count programs with no courses as completed 
LEARNER-1143
 2017-07-13 14:57:47 -04:00
Marko Jevtic
75531b2fef [LEARNER-437] Reflect discount on the Program About Page (WL) 2017-06-23 17:34:06 +02:00
Marko Jevtic
d48100d386 [LEARNER-1367] Move Program Marketing page from private themes repo to edx platform repo 
[LEARNER-311] Enable a purchase button on the Program page - platform (WL)
 2017-06-23 16:27:37 +02:00
Marko Jevtic
bf164ae962 [LEARNER-1183] Prepare program data to be presented on program marketing page 
[LEARNER-1393] Filter program course runs by status
 2017-06-12 10:15:38 +00:00
Marko Jevtic
2422728671 LEARNER-1366 EcommerceService should be able to provide a link to the basket page that contains multiple products 2017-06-09 12:29:29 +02:00
ayub-khan
761db165b5 LEARNER-925 - Allow user to get program certificate if enrolled as verified in credit course 2017-06-06 01:14:52 +05:00
Andy Armstrong
f4b0a76c0b Merge pull request #15204 from edx/andya/clean-imports-2 
Reorder imports using isort (except lms and cms)
 2017-05-30 20:36:41 -04:00
Clinton Blackburn
e9cdc133a6 Updated programs detail page to always call Credentials API 
The programs detail page now always makes a call to the Credentials API to check for program credentials, regardless of whether the user has earned a course certificate. The course certificate constraint adds an additional burden to testing in exchange for slightly decreased load on the API. The cost outweighs the benefit given the limited traffic to this page.

LEARNER-1103
 2017-05-30 17:30:20 -04:00
Andy Armstrong
93235d118d Reorder imports using isort (except lms and cms) 2017-05-30 16:04:54 -04:00
Clinton Blackburn
800bcd8e20 Updated CredentialsApiConfig to pull URLs from settings 
Pulling URLs from settings allows us to rely on site configuration overrides in order to support multi-tenancy.

LEARNER-1103
 2017-05-25 13:30:43 -04:00
Renzo Lucioni
6d1c23b7dc Treat empty upgrade deadlines consistently 
The course and program dashboards interpret an empty upgrade deadline to mean that a given seat is available. Previously, program dashboard pages interpreted empty upgrade deadlines to mean that a given seat was not available.

LEARNER-935
 2017-05-14 13:23:13 -04:00
Ahsan Ulhaq
b6993c392d Stop program cert awarding if cert is not configured in credentials 
ECOM-4478
 2017-04-27 20:13:17 +05:00
Renzo Lucioni
70e13407a3 Fix course completion logic when determining program completion 
We want to treat professional certificates equally for the purposes of program completion.

LEARNER-601
 2017-04-21 17:35:24 -04:00
Matthew Piatetsky
c13ac619c6 Treat no-id-professional enrollments as professional 
ECOM-7746
 2017-04-21 13:38:02 -04:00
John Eskew
1791d141a7 Merge pull request #14894 from edx/jeskew/fix_more_django_19_warnings 
Fix Django 1.9 deprecation warnings by adding app_label.
 2017-04-20 09:29:44 -04:00
Marko Jevtic
3d37635ffa [LEARNER-314] Determine client/learner eligibility 2017-04-20 05:53:13 +00:00
John Eskew
3aa061d4eb Add model migration files for crawlers/programs. 2017-04-19 15:15:54 -04:00
Clinton Blackburn
be02fdb4ae Updated program credential back-population command to account for no-id-professional 
This command has been updated to treat professional and no-id-professional
enrollments in the same manner.

ECOM-7442
 2017-04-19 11:32:19 -04:00
John Eskew
642c500d60 Fix Django 1.9 deprecation warnings by adding app_label. 2017-04-14 10:28:53 -04:00
Clinton Blackburn
d6db981f68 Updated program progress to properly handled no-id-professional enrollments 
Enrollments with the no-id-professional mode are treated as professional
when determining program progress.

ECOM-7442
 2017-04-14 00:36:52 -04:00
Matthew Piatetsky
7330ff99b6 Add notification to program detail view 
ECOM-7385
 2017-04-12 16:59:22 -04:00
Matthew Piatetsky
18ac075a21 Program Progress page redesign 
ECOM-7388
 2017-04-06 16:11:27 -04:00
Renzo Lucioni
f00059f28c Collect data needed for program progress sidebar 
This includes a representation of the user's progress towards completing each course in the program and a list of any relevant course and/or program certificates the user has earned.

ECOM-7386
 2017-04-05 19:06:28 -04:00
Renzo Lucioni
72dd85cebf Modify program progress meter for use on detail pages 
The meter now supports use with a single program, and can return serialized courses instead of counts when measuring progress.

ECOM-6602
 2017-04-03 22:19:04 -04:00
Mike Dikan
06a6d8525a Removing unused fields on ProgramApiConfig model 
ECOM-7196

Updating model to only include the non-deprecated fields.  This work is a follow on to ECOM-7195 and SHOULD NOT be merged until that PR is merged.
 2017-03-06 16:46:04 -05:00
Douglas Hall
d70101a256 Merge pull request #14499 from edx/hasnain-naveed/WL-766/front-end 
WL-766 Program marketing page view
 2017-03-03 11:47:36 -05:00
Mike Dikan
ca64946b99 Remove deprecated references to ProgramsApiConfig model 
ECOM-7195

The (now deprecated) programs service had several fields to set up configuration of the API.  We are removing the property/field references in codeas the first part of deprecating the model fields.  Also being removed are the model properties.
 2017-03-02 18:07:23 -05:00
Hasnain
d6d2b2d50f Add program marketing view 
This change adds the URL configuration and Django view required
to implement a program marketing page. It is left to theme builders
to implement a template that fulfills their own UX requirements.

WL-766
 2017-03-02 14:38:01 -05:00
Hasnain
41f3bba058 Backend code for program detail page. 
This adds functions to the catalog utils which munge data
collected from the program endpoint and LMS database to construct
data structures that are ready for use by view and templates
related to the Open EdX marketing pages that live in LMS.

WL-766
 2017-02-13 20:37:56 -05:00
Renzo Lucioni
0e06e90599 Finish transition to catalog for program data 
Updates Mako and Underscore templates as well as Backbone models and views so they work with catalog programs. Removes all remaining response munging from the back end.

ECOM-4422
 2017-02-09 14:51:26 -05:00