Commit Graph

144 Commits

Author SHA1 Message Date
jansenk
4c93bcbf8f Add put endpoint for program enrollments, rework program enrollment view 2019-07-01 09:33:30 -04:00
Feanil Patel
729495e1aa Merge pull request #20871 from amitvadhel/INCR-475
Incr 475
2019-06-26 14:51:15 -04:00
Feanil Patel
615b9c7dae Merge pull request #20868 from amitvadhel/INCR-474
Incr 474
2019-06-26 14:17:09 -04:00
Simon Chen
d48ba26d50 Update LMS API to send correct response status code 2019-06-25 19:40:42 -04:00
Simon Chen
a86e8d4f19 EDUCATOR-4361 Add PUT api endpoint to the edx-plaform program course enrollment view 2019-06-25 15:12:22 -04:00
Ned Batchelder
aa13a634a6 Merge pull request #20821 from edx/nedbat/drf-yasg
Upgrade djangorestframework and install drf-yasg to get better OpenAPI support
2019-06-25 13:49:13 -04:00
amitvadhel
b6b1b0c602 INCR-473: Make compatible with Python 3.x 2019-06-23 13:29:43 +03:00
Ned Batchelder
b3a731550c Fix problems that drf-yasg uncovered.
These were originally fixed individually, but had to be reverted, and
are now combined in one commit.  The originals were:

7b9040f6b0 This enum was backwards
8774ff1f9b Use ref_name to disambiguate serializers that drf-yasg would otherwise assume are the same.
8a44397139 Is this field missing because it is None?
4a1154a7ca Give a safer buffer for clearing the rate limiting
64c47856dd DRF 3.7.4 changed how you delegate to another view, so don't
7359ca4fb2 Is this right? It fixes two tests
fdd66e5390 Adjust the expected error message for DRF 3.7.7
9257f68fd8 The default TIME_ZONE should be UTC
2019-06-21 18:04:15 -04:00
amitvadhel
fb4aa2a407 INCR-474: Run python-modernize and isort 2019-06-21 14:00:24 +03:00
amitvadhel
e304ab0c3f INCR-475: Make compatible with Python 3.x 2019-06-21 13:41:23 +03:00
Ned Batchelder
39c7a2db7c Revert "Use drf-yasg for Open API documentation" 2019-06-11 16:05:00 -04:00
Ned Batchelder
9257f68fd8 The default TIME_ZONE should be UTC
In production, we use UTC as the time zone.  DRF 3.7.7 now puts all
times in the currently set timezone where it used to use UTC.  By
setting TIME_ZONE to UTC, we keep the same results we used to get.

In a few places, we had to change the expected test results to be UTC.
2019-06-10 15:27:39 -04:00
jansenk
e5c3084e8c return 422 on bad input 2019-06-06 15:39:46 -04:00
jansenk
cf32f5bcf9 allow orgs w/o idp configured to enroll students in a program 2019-06-05 12:55:54 -04:00
jansenk
095c420378 check curriculum rather than courses for program course membership 2019-06-04 14:06:00 -04:00
Alex Dusenbery
e5fd43264d EDUCATOR-4307 | Don't bother with celery to run expire waiting enrollments command. 2019-06-03 13:08:59 -04:00
Kyle McCormick
c487b9a384 Change 'withdrawn' status to 'canceled' in program_enrollments
This makes the LMS program_enrollments API compatible with the
Registrar programs API, as specified in the Master's partner
integration guide.

EDUCATOR-4389
2019-06-03 10:16:19 -04:00
Zachary Hancock
1bb449a742 Merge pull request #20653 from edx/zhancock/complete-waiting-enrollments
complete waiting enrollments. fixed
2019-05-29 10:30:16 -04:00
Matt Hughes
af9dad5214 Merge pull request #20660 from edx/matthugs/EDUCATOR-4327
Add endpoint for checking learner program enrollments
2019-05-24 15:23:16 -04:00
Zach Hancock
a350d327de complete waiting enrollments. fixed 2019-05-24 13:47:49 -04:00
jansenk
65bab28341 add retirement endpoint 2019-05-24 11:29:02 -04:00
Dave St.Germain
fdc785bfb0 Merge pull request #20605 from edx/mroytman/EDUCATOR-4276-get-course-enrollments
program course enrollment overview GET endpoint
2019-05-24 07:39:45 -04:00
Matt Hughes
047c379cab Add endpoint for checking learner program enrollments
JIRA:EDUCATOR-4327
2019-05-23 10:37:13 -04:00
Richard I Reilly
32b70650a4 Merge pull request #20658 from edx/rir/readme
Add UML diagram for the ProgramEnrollments Plugin
2019-05-23 09:49:35 -04:00
Zachary Hancock
8012e3a1ca Merge pull request #20630 from edx/zhancock/expire-prgm-enrollments
command to expire waiting program enrollments
2019-05-23 09:22:32 -04:00
Zach Hancock
d9dc0d4b8d command to expire waiting program enrollments 2019-05-22 13:38:10 -04:00
Michael Roytman
b0f715d1c2 add a GET endpoint to get course run overviews for a user's program enrollment 2019-05-22 13:35:49 -04:00
Stu Young
fa3f71cd13 INCR-284 Run python-modernize on lms/djangoapps/program_enrollments/api (#20591)
* run python modernize

* run isort
2019-05-21 11:29:23 -04:00
Stu Young
4e1f63bd15 INCR-283 Run python-modernize on lms/djangoapps/program_enrollments/migrations and lms/djangoapps/program_enrollments/tests (#20578)
* run python modernize

* run isort

* Fix merge conflicts

* Fix merge conflict--file was deleted on master
2019-05-21 11:27:52 -04:00
Rick Reilly
712f6fc997 Add UML diagram for the ProgramEnrollments Plugin 2019-05-21 09:28:28 -04:00
Simon Chen
0b08867aee Revert "complete waiting enrollments"
This reverts commit b041a1f3e6.
2019-05-15 21:20:45 -04:00
Rick Reilly
604ab4fd15 Add PATCH method for program enrollments 2019-05-10 15:46:40 -04:00
Zach Hancock
b041a1f3e6 complete waiting enrollments 2019-05-10 09:55:24 -04:00
jansenk
1caa647621 add program course enrollment PATCH 2019-05-07 15:52:03 -04:00
Rick Reilly
350b4a2589 Add POST method for program enrollments 2019-05-03 14:14:04 -04:00
Alex Dusenbery
403fb52e93 Add a GET endpoint to list ProgramCourseEnrollment data. 2019-05-03 13:39:10 -04:00
jansenk
6052a4e4c6 add program course enrollment post endpoint 2019-05-02 17:42:18 -04:00
Alex Dusenbery
20f0bc03d4 Add a GET API endpoint for program enrollments. 2019-05-01 11:35:38 -04:00
Alex Dusenbery
4d6458284c Fix the program_enrollments admin classes. 2019-04-25 13:06:06 -04:00
Alex Dusenbery
bf661eaa8d Add unique constraint to ProgramEnrollment model 2019-04-24 13:47:23 -04:00
Zach Hancock
afe3cdb3ec user lookup util 2019-04-24 09:47:38 -04:00
jansenk
8389702765 add program course enrollment admin 2019-04-22 10:05:36 -04:00
jansenk
0622c69d75 add ProgramCourseEnrollment 2019-04-19 12:56:50 -04:00
Rick Reilly
2bf3e6621e Add ProgramEnrollment app and model for masters 2019-04-12 15:50:30 -04:00