Commit Graph

25 Commits

Author SHA1 Message Date
David Adams
ed980f2189 Port of invitation/enroll/unenroll email functionality
into beta dashboard.

Also includes new functionality, in both legacy and beta
dashboard, to include appropriate email text for a
Shibboleth course.
2013-11-15 10:10:04 -08:00
David Ormsbee
3ce87583ab Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.
Features coming down the pipe will want to be able to:
* Refer to enrollments before they are actually activated (approval step).
* See what courses a user used to be enrolled in for when they re-enroll in
  the same course, or a different run of that course.
* Have different "modes" of enrolling in a course, representing things like
  honor certificate enrollment, auditing (no certs), etc.

This change adds an is_active flag and mode (with default being "honor").
The commit is only as large as it is because many parts of the codebase were
manipulating enrollments by adding and removing CourseEnrollment objects
directly. It was necessary to create classmethods on CourseEnrollment to
encapsulate this functionality and then port everything over to using them.

The migration to add columns has been tested on a prod replica, and seems to be
fine for running on a live system with single digit millions of rows of
enrollments.
2013-08-14 13:23:06 -04:00
Miles Steele
4b671d1195 fix pylint violations 2013-08-02 09:53:21 -04:00
Miles Steele
c6d6698abb change MockEnrollmentState to SettableFakeEnrollmentState 2013-08-02 09:52:18 -04:00
Miles Steele
94ac02e8b4 refactor enrollment action reporting 2013-08-02 09:52:17 -04:00
Miles Steele
096f7dcd23 add docstrings, cleanup (minor) 2013-08-02 09:52:17 -04:00
Miles Steele
f25b414d40 fix pep8 violations, fix pylint violations 2013-08-02 09:52:15 -04:00
Miles Steele
f77ebc82ec add tests 2013-08-02 09:52:15 -04:00
Miles Steele
741f31ab63 move tests to legacy 2013-08-02 09:52:14 -04:00
dcadams
e1a0499678 Added test for email body containing course url and some pep8 fixes. 2013-07-09 14:25:06 -07:00
Jean Manuel Nater
5cb4c1a750 Removed some pep8 violations. 2013-07-01 17:07:24 -04:00
Jean Manuel Nater
72b4561e3a Moved xml_store_config, mongo_store_config, and draft_mongo_store_config to xmodule/modulestore/tests/django_util.py
Removed some repeated instances of xml_store_config.
Reverted some changes to mongo_store_config so each modulestore gets it's own uuid.
2013-07-01 14:45:53 -04:00
Jean Manuel Nater
3c67e2754a Merge branch 'master' into jnater/courseware_tests
Conflicts:
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/instructor/tests/test_enrollment.py
2013-06-27 13:53:47 -04:00
dcadams
306ac48210 Email on enroll/un-enroll actions
Optionally email students on enroll/un-enroll actions
by instructor from enrollment tab in LMS.
2013-06-26 15:28:36 -07:00
Jean Manuel Nater
1b94050ef6 Merge branch 'master' into jnater/courseware_tests
Conflicts:
	lms/djangoapps/open_ended_grading/tests.py
2013-06-21 16:38:31 -04:00
Jean Manuel Nater
9bfddd4891 Addressed pull request feedback. 2013-06-21 14:05:57 -04:00
Ned Batchelder
61b53713d2 Remove unused imports from lms, as detected by pylint. 2013-06-19 16:56:34 -04:00
dcadams
a8ec1ca9d5 Modified code such that non-logged in student activates correctly. 2013-06-04 17:08:34 -07:00
dcadams
1ea6545556 Worked on reducing pep8 violations. 2013-06-04 14:17:13 -07:00
dcadams
67356cdcc8 Merge of master to get Jenkins running. 2013-05-15 09:54:53 -07:00
dcadams
5e75e91322 Takes care of Victor's comments on the PR.
Note, the students_lc list is used in _do_enroll_students when overload
= True so it needs to be left in.
2013-05-13 13:20:37 -07:00
dcadams
2ef3bcc92d Commit just to get Jenkins to rerun. 2013-05-08 14:52:18 -07:00
dcadams
6a1a907339 Fix pep8 violations. 2013-04-30 11:48:23 -07:00
dcadams
aa4b61180c Some cleanup. 2013-04-29 10:03:11 -07:00
dcadams
c64f0b1a18 Modifications to instructor dashboard - enrollment tab:
- Remove single enrollment/unenrollment
- Make unenrollment work with multi-email listbox.
- Provide checkbox for auto-enroll on activate if user not yet signed
up.
- Enroll student when activating if auto-enroll flag set.
2013-04-29 09:38:10 -07:00