From 84f3c33df70dfce525bba574dc3e0d86329b8963 Mon Sep 17 00:00:00 2001 From: Daniel Friedman Date: Mon, 11 May 2015 13:31:47 -0400 Subject: [PATCH] Address doc review --- common/test/acceptance/pages/lms/instructor_dashboard.py | 4 ++-- .../acceptance/tests/lms/test_lms_instructor_dashboard.py | 8 ++++---- lms/djangoapps/instructor/views/api.py | 8 +++----- lms/djangoapps/instructor_task/api.py | 2 +- lms/djangoapps/instructor_task/tasks.py | 2 +- lms/djangoapps/instructor_task/tests/test_tasks_helper.py | 2 +- .../coffee/src/instructor_dashboard/data_download.coffee | 2 +- 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/common/test/acceptance/pages/lms/instructor_dashboard.py b/common/test/acceptance/pages/lms/instructor_dashboard.py index 525b5cd88e..e54f4d76f3 100644 --- a/common/test/acceptance/pages/lms/instructor_dashboard.py +++ b/common/test/acceptance/pages/lms/instructor_dashboard.py @@ -717,9 +717,9 @@ class DataDownloadPage(PageObject): return self.q(css='input[name=calculate-grades-csv]') @property - def generate_weighted_problem_grade_report_button(self): + def generate_problem_grade_report_button(self): """ - Returns the "Generate Weighted Problem Grade Report" button. + Returns the "Generate Problem Grade Report" button. """ return self.q(css='input[name=problem-grade-report]') diff --git a/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py b/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py index b58299859f..f06baa724c 100644 --- a/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py +++ b/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py @@ -387,20 +387,20 @@ class DataDownloadsTest(BaseInstructorDashboardTest): self.verify_report_requested_event(report_name) self.verify_report_download(report_name) - def test_weighted_problem_grade_report_download(self): + def test_problem_grade_report_download(self): """ - Scenario: Verify that an instructor can download a weighted problem grade report + Scenario: Verify that an instructor can download a problem grade report Given that I am an instructor And I visit the instructor dashboard's "Data Downloads" tab - And I click on the "Generate Weighted Problem Grade Report" button + And I click on the "Generate Problem Grade Report" button Then a report should be generated And a report requested event should be emitted When I click on the report Then a report downloaded event should be emitted """ report_name = u"problem_grade_report" - self.data_download_section.generate_weighted_problem_grade_report_button.click() + self.data_download_section.generate_problem_grade_report_button.click() self.data_download_section.wait_for_available_report() self.verify_report_requested_event(report_name) self.verify_report_download(report_name) diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py index 78fd631cde..407d8bfcf7 100644 --- a/lms/djangoapps/instructor/views/api.py +++ b/lms/djangoapps/instructor/views/api.py @@ -1956,7 +1956,7 @@ def calculate_grades_csv(request, course_id): @require_level('staff') def problem_grade_report(request, course_id): """ - Request a CSV showing students' weighted grades for all problems in the + Request a CSV showing students' grades for all problems in the course. AlreadyRunningError is raised if the course's grades are already being @@ -1965,13 +1965,11 @@ def problem_grade_report(request, course_id): course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id) try: instructor_task.api.submit_problem_grade_report(request, course_key) - # TODO: verify copy with documentation team - success_status = _("Your weighted problem report is being generated! " + success_status = _("Your problem grade report is being generated! " "You can view the status of the generation task in the 'Pending Instructor Tasks' section.") return JsonResponse({"status": success_status}) except AlreadyRunningError: - # TODO: verify copy with documentation team - already_running_status = _("A weighted problem generation task is already in progress. " + already_running_status = _("A problem grade report is already being generated. " "Check the 'Pending Instructor Tasks' table for the status of the task. " "When completed, the report will be available for download in the table below.") return JsonResponse({ diff --git a/lms/djangoapps/instructor_task/api.py b/lms/djangoapps/instructor_task/api.py index 8c16cef652..b02fc1470b 100644 --- a/lms/djangoapps/instructor_task/api.py +++ b/lms/djangoapps/instructor_task/api.py @@ -337,7 +337,7 @@ def submit_calculate_grades_csv(request, course_key): def submit_problem_grade_report(request, course_key): """ - Submits a task to generate a CSV grade report containing weighted problem + Submits a task to generate a CSV grade report containing problem values. """ task_type = 'grade_problems' diff --git a/lms/djangoapps/instructor_task/tasks.py b/lms/djangoapps/instructor_task/tasks.py index 6ee49b4b53..fa84cf5ca7 100644 --- a/lms/djangoapps/instructor_task/tasks.py +++ b/lms/djangoapps/instructor_task/tasks.py @@ -159,7 +159,7 @@ def calculate_grades_csv(entry_id, xmodule_instance_args): @task(base=BaseInstructorTask, routing_key=settings.GRADES_DOWNLOAD_ROUTING_KEY) # pylint: disable=not-callable def calculate_problem_grade_report(entry_id, xmodule_instance_args): """ - Generate a CSV for a course containing all students' weighted problem + Generate a CSV for a course containing all students' problem grades and push the results to an S3 bucket for download. """ # Translators: This is a past-tense phrase that is inserted into task progress messages as {action}. diff --git a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py index 6afaccdb81..a81e52d8e7 100644 --- a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py +++ b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py @@ -271,7 +271,7 @@ class TestInstructorGradeReport(TestReportMixin, InstructorTaskCourseTestCase): class TestProblemGradeReport(TestReportMixin, InstructorTaskModuleTestCase): """ - Test that the weighted problem CSV generation works. + Test that the problem CSV generation works. """ def setUp(self): super(TestProblemGradeReport, self).setUp() diff --git a/lms/static/coffee/src/instructor_dashboard/data_download.coffee b/lms/static/coffee/src/instructor_dashboard/data_download.coffee index dcd2e7ba91..ccca75ba83 100644 --- a/lms/static/coffee/src/instructor_dashboard/data_download.coffee +++ b/lms/static/coffee/src/instructor_dashboard/data_download.coffee @@ -112,7 +112,7 @@ class DataDownload @onClickGradeDownload @$calculate_grades_csv_btn, gettext("Error generating grades. Please try again.") @$problem_grade_report_csv_btn.click (e) => - @onClickGradeDownload @$problem_grade_report_csv_btn, gettext("Error generating weighted problem report. Please try again.") + @onClickGradeDownload @$problem_grade_report_csv_btn, gettext("Error generating problem grade report. Please try again.") onClickGradeDownload: (button, errorMessage) -> # Clear any CSS styling from the request-response areas