Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #745 from edx/mushtaq/change_course_duration
Browse files Browse the repository at this point in the history 
Course duration weeks
  • Loading branch information
Mushtaq Ali authored Jul 22, 2019
2 parents 65f9350 + 1b23c12 commit c28f775
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion edx/analytics/tasks/enterprise/enterprise_enrollments.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def insert_query(self):
course.end_time AS course_end,
course.pacing_type AS course_pacing_type,
CASE
WHEN course.pacing_type = 'self_paced' THEN 'Self Paced'
WHEN course.pacing_type = 'self_paced' THEN CAST(course.weeks_to_complete AS STRING)
ELSE CAST(CEIL(DATEDIFF(course.end_time, course.start_time) / 7) AS STRING)
END AS course_duration_weeks,
course.min_effort AS course_min_effort,
Expand Down
6 changes: 3 additions & 3 deletions edx/analytics/tasks/tests/acceptance/fixtures/input/course_runs.json
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{ "course": "edX+Open_DemoX", "key": "edX/Open_DemoX/edx_demo_course", "title": "All about acceptance testing!", "short_description": "Learn about the frameworks, tools and techniques you can apply to your acceptance testing today!", "full_description": "In theory, this would contain a long description.", "start": "2016-09-01T00:00:00Z", "end": "2016-12-01T00:00:00Z", "enrollment_start": "2016-06-01T00:00:00Z", "enrollment_end": "2016-09-01T00:00:00Z", "announcement": null, "image": { "src": "https://example.com/not-a-real-image.jpg", "description": null, "height": null, "width": null }, "video": null, "seats": [ { "type": "honor", "price": "0.00", "currency": "USD", "upgrade_deadline": "2017-04-01T00:00:00Z", "credit_provider": "edx", "credit_hours": 4 }, { "type": "verified", "price": "50.00", "currency": "USD", "upgrade_deadline": "2016-10-01T08:00:00Z", "credit_provider": "edx", "credit_hours": 3 } ], "content_language": "en-us", "transcript_languages": [], "instructors": [], "staff": [], "pacing_type": "instructor_paced", "min_effort": 2, "max_effort": 4, "modified": "2016-09-07T18:38:32.207371Z", "marketing_url": "https://www.edx.org/course/all-about-acceptance-testing-edx-testing101-3t2016", "level_type": "Intermediate", "availability": "Current", "programs": [ { "uuid": "acb243a0-1234-5abe-099e-ffcae2a340d4", "title": "Testing", "type": "XSeries", "marketing_slug": "tests", "marketing_url": "https://example.com/xseries/testing" } ], "partner_short_code": "openedx", "announcement": "2016-08-02T00:00:00Z", "reporting_type": "test" }
{ "course": "edX+Open_DemoX", "key": "course-v1:edX+Open_DemoX+edx_demo_course2", "title": "All about acceptance testing!", "short_description": "Learn about the frameworks, tools and techniques you can apply to your acceptance testing today!", "full_description": "In theory, this would contain a long description.", "start": "2016-06-01T00:00:00Z", "end": "2016-09-01T00:00:00Z", "enrollment_start": "2016-03-01T00:00:00Z", "enrollment_end": "2016-06-01T00:00:00Z", "announcement": null, "image": { "src": "https://example.com/not-a-real-image.jpg", "description": null, "height": null, "width": null }, "video": null, "seats": [ { "type": "honor", "price": "0.00", "currency": "USD", "upgrade_deadline": "2017-03-01T00:00:00Z", "credit_provider": "edx", "credit_hours": 4 }, { "type": "verified", "price": "50.00", "currency": "USD", "upgrade_deadline": "2016-08-01T09:00:00Z", "credit_provider": "edx", "credit_hours": 4 } ], "content_language": "en-us", "transcript_languages": [], "instructors": [], "staff": [], "pacing_type": "self_paced", "min_effort": 3, "max_effort": 5, "modified": "2016-09-07T18:38:32.207371Z", "marketing_url": "https://www.edx.org/course/all-about-acceptance-testing-edx-testing101-2t2016", "level_type": "Introductory", "availability": "Archived", "programs": [ ], "partner_short_code": "openedx", "announcement": "2016-06-05T00:00:00Z", "reporting_type": "mooc" }
{ "course": "edX+Testing102", "key": "course-v1:edX+Testing102x+1T2017", "title": "All about acceptance testing Part 3!", "short_description": "Learn about the frameworks, tools and techniques you can apply to your acceptance testing today!", "full_description": "In theory, this would contain a long description.", "start": "2016-12-01T00:00:00Z", "end": "2017-02-01T00:00:00Z", "enrollment_start": "2016-09-01T00:00:00Z", "enrollment_end": "2016-12-01T00:00:00Z", "announcement": null, "image": { "src": "https://example.com/not-a-real-image.jpg", "description": null, "height": null, "width": null }, "video": null, "seats": [ { "type": "honor", "price": "0.00", "currency": "USD", "upgrade_deadline": "2017-02-01T00:00:00Z", "credit_provider": "edx", "credit_hours": 3 }, { "type": "verified", "price": "50.00", "currency": "USD", "upgrade_deadline": "2016-01-01T10:00:00Z", "credit_provider": "edx", "credit_hours": 4 } ], "content_language": "en-us", "transcript_languages": [], "instructors": [], "staff": [], "pacing_type": "instructor_paced", "min_effort": 2, "max_effort": 5, "modified": "2016-09-07T18:38:32.207371Z", "marketing_url": "https://www.edx.org/course/all-about-acceptance-testing-edx-testing-part-3-102-1t2017", "level_type": "Advanced", "availability": "Upcoming", "programs": [ { "uuid": "acb243a0-1234-5abe-099e-ffcae2a340d4", "title": "Testing", "type": "XSeries", "marketing_slug": "tests", "marketing_url": "https://example.com/xseries/testing" } ], "partner_short_code": "openedx", "announcement": "2016-12-03T00:00:00Z", "reporting_type": "demo" }
{ "course": "edX+Open_DemoX", "key": "edX/Open_DemoX/edx_demo_course", "title": "All about acceptance testing!", "short_description": "Learn about the frameworks, tools and techniques you can apply to your acceptance testing today!", "full_description": "In theory, this would contain a long description.", "start": "2016-09-01T00:00:00Z", "end": "2016-12-01T00:00:00Z", "enrollment_start": "2016-06-01T00:00:00Z", "enrollment_end": "2016-09-01T00:00:00Z", "announcement": null, "image": { "src": "https://example.com/not-a-real-image.jpg", "description": null, "height": null, "width": null }, "video": null, "seats": [ { "type": "honor", "price": "0.00", "currency": "USD", "upgrade_deadline": "2017-04-01T00:00:00Z", "credit_provider": "edx", "credit_hours": 4 }, { "type": "verified", "price": "50.00", "currency": "USD", "upgrade_deadline": "2016-10-01T08:00:00Z", "credit_provider": "edx", "credit_hours": 3 } ], "content_language": "en-us", "transcript_languages": [], "instructors": [], "staff": [], "pacing_type": "instructor_paced", "min_effort": 2, "max_effort": 4, "weeks_to_complete": 15, "modified": "2016-09-07T18:38:32.207371Z", "marketing_url": "https://www.edx.org/course/all-about-acceptance-testing-edx-testing101-3t2016", "level_type": "Intermediate", "availability": "Current", "programs": [ { "uuid": "acb243a0-1234-5abe-099e-ffcae2a340d4", "title": "Testing", "type": "XSeries", "marketing_slug": "tests", "marketing_url": "https://example.com/xseries/testing" } ], "partner_short_code": "openedx", "announcement": "2016-08-02T00:00:00Z", "reporting_type": "test" }
{ "course": "edX+Open_DemoX", "key": "course-v1:edX+Open_DemoX+edx_demo_course2", "title": "All about acceptance testing!", "short_description": "Learn about the frameworks, tools and techniques you can apply to your acceptance testing today!", "full_description": "In theory, this would contain a long description.", "start": "2016-06-01T00:00:00Z", "end": "2016-09-01T00:00:00Z", "enrollment_start": "2016-03-01T00:00:00Z", "enrollment_end": "2016-06-01T00:00:00Z", "announcement": null, "image": { "src": "https://example.com/not-a-real-image.jpg", "description": null, "height": null, "width": null }, "video": null, "seats": [ { "type": "honor", "price": "0.00", "currency": "USD", "upgrade_deadline": "2017-03-01T00:00:00Z", "credit_provider": "edx", "credit_hours": 4 }, { "type": "verified", "price": "50.00", "currency": "USD", "upgrade_deadline": "2016-08-01T09:00:00Z", "credit_provider": "edx", "credit_hours": 4 } ], "content_language": "en-us", "transcript_languages": [], "instructors": [], "staff": [], "pacing_type": "self_paced", "min_effort": 3, "max_effort": 5, "weeks_to_complete": 15, "modified": "2016-09-07T18:38:32.207371Z", "marketing_url": "https://www.edx.org/course/all-about-acceptance-testing-edx-testing101-2t2016", "level_type": "Introductory", "availability": "Archived", "programs": [ ], "partner_short_code": "openedx", "announcement": "2016-06-05T00:00:00Z", "reporting_type": "mooc" }
{ "course": "edX+Testing102", "key": "course-v1:edX+Testing102x+1T2017", "title": "All about acceptance testing Part 3!", "short_description": "Learn about the frameworks, tools and techniques you can apply to your acceptance testing today!", "full_description": "In theory, this would contain a long description.", "start": "2016-12-01T00:00:00Z", "end": "2017-02-01T00:00:00Z", "enrollment_start": "2016-09-01T00:00:00Z", "enrollment_end": "2016-12-01T00:00:00Z", "announcement": null, "image": { "src": "https://example.com/not-a-real-image.jpg", "description": null, "height": null, "width": null }, "video": null, "seats": [ { "type": "honor", "price": "0.00", "currency": "USD", "upgrade_deadline": "2017-02-01T00:00:00Z", "credit_provider": "edx", "credit_hours": 3 }, { "type": "verified", "price": "50.00", "currency": "USD", "upgrade_deadline": "2016-01-01T10:00:00Z", "credit_provider": "edx", "credit_hours": 4 } ], "content_language": "en-us", "transcript_languages": [], "instructors": [], "staff": [], "pacing_type": "instructor_paced", "min_effort": 2, "max_effort": 5, "weeks_to_complete": 15, "modified": "2016-09-07T18:38:32.207371Z", "marketing_url": "https://www.edx.org/course/all-about-acceptance-testing-edx-testing-part-3-102-1t2017", "level_type": "Advanced", "availability": "Upcoming", "programs": [ { "uuid": "acb243a0-1234-5abe-099e-ffcae2a340d4", "title": "Testing", "type": "XSeries", "marketing_slug": "tests", "marketing_url": "https://example.com/xseries/testing" } ], "partner_short_code": "openedx", "announcement": "2016-12-03T00:00:00Z", "reporting_type": "demo" }
Loading

0 comments on commit c28f775

Please sign in to comment.