Merge pull request #10073 from edx/cdodge/add-columns-to-enrollment-report

Add email and manual enrollment reason into the Enrollment Report

lms/djangoapps/instructor/enrollment_report.py

@@ -57,6 +57,7 @@ class BaseAbstractEnrollmentReportProvider(AbstractEnrollmentReportProvider):
         user_data = collections.OrderedDict()
         user_data['User ID'] = user_info.id
         user_data['Username'] = user_info.username
+        user_data['Email'] = user_info.email
         user_data['Full Name'] = user_info.profile.name
         user_data['First Name'] = meta.get('first-name', '')
         user_data['Last Name'] = meta.get('last-name', '')

lms/djangoapps/instructor/paidcourse_enrollment_report.py

@@ -59,8 +59,8 @@ class PaidCourseEnrollmentReportProvider(BaseAbstractEnrollmentReportProvider):
                 manual_enrollment = ManualEnrollmentAudit.get_manual_enrollment(course_enrollment)
                 if manual_enrollment is not None:
                     enrollment_source = _(
-                        'manually enrolled by user_id {user_id}, enrollment state transition: {transition}'
-                    ).format(user_id=manual_enrollment.enrolled_by_id, transition=manual_enrollment.state_transition)
+                        'manually enrolled by {username} - reason: {reason}'
+                    ).format(username=manual_enrollment.enrolled_by.username, reason=manual_enrollment.reason)
                 else:
                     enrollment_source = _('Manually Enrolled')
 

lms/djangoapps/instructor_task/tests/test_tasks_helper.py

@@ -414,8 +414,8 @@ class TestInstructorDetailedEnrollmentReport(TestReportMixin, InstructorTaskCour
         with patch('instructor_task.tasks_helper._get_current_task'):
             result = upload_enrollment_report(None, None, self.course.id, task_input, 'generating_enrollment_report')
 
-        enrollment_source = u'manually enrolled by user_id {user_id}, enrollment state transition: {transition}'.format(
-            user_id=self.instructor.id, transition=ALLOWEDTOENROLL_TO_ENROLLED)  # pylint: disable=no-member
+        enrollment_source = u'manually enrolled by {username} - reason: manually enrolling unenrolled user'.format(
+            username=self.instructor.username)  # pylint: disable=no-member
         self.assertDictContainsSubset({'attempted': 1, 'succeeded': 1, 'failed': 0}, result)
         self._verify_cell_data_in_csv(student.username, 'Enrollment Source', enrollment_source)
         self._verify_cell_data_in_csv(student.username, 'Payment Status', 'TBD')