Skip to content

C
course-discovery
Commit 3c975287 by rabia23 Committed by Rabia Iftikhar
Options

EDUCATOR-2231 remove course run enrollment dates references

parent 9278e7a2
Showing with 8 additions and 80 deletions
course_discovery/apps/publisher/api/v1/tests/test_views.py
......@@ -145,8 +145,6 @@ class CourseRunViewSetTests(APITestCase):
assert discovery_course_run.full_description_override is None
assert discovery_course_run.start == publisher_course_run.start
assert discovery_course_run.end == publisher_course_run.end
assert discovery_course_run.enrollment_start == publisher_course_run.enrollment_start
assert discovery_course_run.enrollment_end == publisher_course_run.enrollment_end
assert discovery_course_run.pacing_type == publisher_course_run.pacing_type
assert discovery_course_run.min_effort == publisher_course_run.min_effort
assert discovery_course_run.max_effort == publisher_course_run.max_effort
......
course_discovery/apps/publisher/api/v1/views.py
......@@ -140,8 +140,6 @@ class CourseRunViewSet(viewsets.GenericViewSet):
defaults = {
'start': course_run.start,
'end': course_run.end,
'enrollment_start': course_run.enrollment_start,
'enrollment_end': course_run.enrollment_end,
'pacing_type': course_run.pacing_type,
'title_override': course_run.title_override,
'min_effort': course_run.min_effort,
......
course_discovery/apps/publisher/dataloader/create_courses.py
......@@ -124,8 +124,6 @@ def create_course_runs(meta_data_course, publisher_course):
defaults = {
'course': publisher_course,
'start': canonical_course_run.start, 'end': canonical_course_run.end,
'enrollment_start': canonical_course_run.enrollment_start,
'enrollment_end': canonical_course_run.enrollment_end,
'min_effort': canonical_course_run.min_effort, 'max_effort': canonical_course_run.max_effort,
'language': canonical_course_run.language, 'pacing_type': canonical_course_run.pacing_type,
'length': canonical_course_run.weeks_to_complete,
......
course_discovery/apps/publisher/management/commands/tests/test_import_courses.py
......@@ -349,13 +349,6 @@ class CreateCoursesTests(TestCase):
self.assertEqual(publisher_course_run.start, metadata_course_run.start)
self.assertEqual(publisher_course_run.end, metadata_course_run.end)
self.assertEqual(
publisher_course_run.enrollment_start, metadata_course_run.enrollment_start
)
self.assertEqual(
publisher_course_run.enrollment_end, metadata_course_run.enrollment_end
)
self.assertEqual(publisher_course_run.min_effort, metadata_course_run.min_effort)
self.assertEqual(publisher_course_run.max_effort, metadata_course_run.max_effort)
self.assertEqual(publisher_course_run.length, metadata_course_run.weeks_to_complete)
......
course_discovery/apps/publisher/models.py
......@@ -279,8 +279,6 @@ class CourseRun(TimeStampedModel, ChangedByMixin):
start = models.DateTimeField(null=True, blank=True)
end = models.DateTimeField(null=True, blank=True)
enrollment_start = models.DateTimeField(null=True, blank=True)
enrollment_end = models.DateTimeField(null=True, blank=True)
certificate_generation = models.DateTimeField(null=True, blank=True)
pacing_type = models.CharField(
max_length=255, db_index=True, null=True, blank=True, choices=CourseRunPacing.choices,
......
course_discovery/apps/publisher/studio_api_utils.py
......@@ -65,8 +65,6 @@ class StudioAPI:
'schedule': {
'start': serialize_datetime(publisher_course_run.start),
'end': serialize_datetime(publisher_course_run.end),
'enrollment_start': serialize_datetime(publisher_course_run.enrollment_start),
'enrollment_end': serialize_datetime(publisher_course_run.enrollment_end),
},
'team': team,
'pacing_type': publisher_course_run.pacing_type,
......
course_discovery/apps/publisher/templates/publisher/course_run_detail/_studio.html
......@@ -40,32 +40,6 @@
</div>
<div class="info-item">
<div class="heading">
{% trans "Enrollment Start Date (time in UTC)" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% if course_run.enrollment_start %}
{{ course_run.enrollment_start|date:"M d, Y, H:i:s A" }}
{% else %}
{% trans "(Optional) Not yet added" %}
{% endif %}
</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "Enrollment End Date (time in UTC)" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% if course_run.enrollment_end %}
{{ course_run.enrollment_end|date:"M d, Y, H:i:s A" }}
{% else %}
{% trans "(Optional) Not yet added" %}
{% endif %}
</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "Pacing Type" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
......
course_discovery/apps/publisher/tests/factories.py
......@@ -49,8 +49,6 @@ class CourseRunFactory(factory.DjangoModelFactory):
course = factory.SubFactory(CourseFactory)
start = FuzzyDateTime(datetime(2014, 1, 1, tzinfo=UTC))
end = FuzzyDateTime(datetime(2014, 1, 1, tzinfo=UTC)).end_dt
enrollment_start = FuzzyDateTime(datetime(2014, 1, 1, tzinfo=UTC))
enrollment_end = FuzzyDateTime(datetime(2014, 1, 1, tzinfo=UTC)).end_dt
certificate_generation = FuzzyDateTime(datetime(2014, 1, 1, tzinfo=UTC))
min_effort = FuzzyInteger(1, 10)
max_effort = FuzzyInteger(10, 20)
......
course_discovery/apps/publisher/tests/test_studio_api_utils.py
......@@ -56,8 +56,6 @@ def assert_data_generated_correctly(course_run, expected_team_data):
'schedule': {
'start': serialize_datetime(course_run.start),
'end': serialize_datetime(course_run.end),
'enrollment_start': serialize_datetime(course_run.enrollment_start),
'enrollment_end': serialize_datetime(course_run.enrollment_end),
},
'team': expected_team_data,
'pacing_type': course_run.pacing_type,
......
course_discovery/apps/publisher/tests/test_views.py
......@@ -372,7 +372,7 @@ class CreateCourseRunViewTests(SiteMixin, TestCase):
self.course_run_dict.update({'is_self_paced': True})
self._pop_valuse_from_dict(
self.course_run_dict,
['end', 'enrollment_start', 'enrollment_end', 'priority', 'certificate_generation', 'id']
['end', 'priority', 'certificate_generation', 'id']
)
current_datetime = datetime.now(timezone('US/Central'))
self.course_run_dict['start'] = (current_datetime + timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')
......@@ -905,8 +905,7 @@ class CourseRunDetailTests(SiteMixin, TestCase):
def _assert_studio_fields(self, response):
""" Helper method to test studio values and labels. """
fields = [
'Course Name', 'Organization', 'Number', 'Start Date', 'End Date',
'Enrollment Start Date', 'Enrollment End Date', 'Pacing Type'
'Course Name', 'Organization', 'Number', 'Start Date', 'End Date', 'Pacing Type'
]
for field in fields:
self.assertContains(response, field)
......@@ -963,10 +962,7 @@ class CourseRunDetailTests(SiteMixin, TestCase):
def _assert_dates(self, response):
""" Helper method to test all dates. """
for value in [self.course_run.start,
self.course_run.end,
self.course_run.enrollment_start,
self.course_run.enrollment_end]:
for value in [self.course_run.start, self.course_run.end]:
self.assertContains(response, value.strftime(self.date_format))
def test_course_run_with_version(self):
......
course_discovery/apps/publisher/views.py
......@@ -714,8 +714,7 @@ class CreateCourseRunView(mixins.LoginRequiredMixin, mixins.PublisherUserRequire
# Delete all those fields which cannot be copied from previous run
del (last_run_data['id'], last_run_data['start'], last_run_data['end'], last_run_data['pacing_type'],
last_run_data['preview_url'], last_run_data['lms_course_id'], last_run_data['changed_by'],
last_run_data['course'], last_run_data['sponsor'], last_run_data['enrollment_start'],
last_run_data['enrollment_end'])
last_run_data['course'], last_run_data['sponsor'])
staff = Person.objects.filter(id__in=last_run_data.pop('staff'))
transcript_languages = LanguageTag.objects.filter(code__in=last_run_data.pop('transcript_languages'))
......
course_discovery/conf/locale/en/LC_MESSAGES/django.po
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-07 13:49+0000\n"
"POT-Creation-Date: 2018-03-08 09:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -1269,7 +1269,6 @@ msgstr ""
#: apps/publisher/templates/publisher/course_detail.html
#: apps/publisher/templates/publisher/course_run_detail/_credit_seat.html
#: apps/publisher/templates/publisher/course_run_detail/_drupal.html
#: apps/publisher/templates/publisher/course_run_detail/_studio.html
msgid "(Optional) Not yet added"
msgstr ""
......@@ -2541,14 +2540,6 @@ msgid "Enrollment Type"
msgstr ""
#: apps/publisher/templates/publisher/course_run_detail/_studio.html
msgid "Enrollment Start Date (time in UTC)"
msgstr ""
#: apps/publisher/templates/publisher/course_run_detail/_studio.html
msgid "Enrollment End Date (time in UTC)"
msgstr ""
#: apps/publisher/templates/publisher/course_run_detail/_studio.html
msgid "Pacing Type"
msgstr ""
......
course_discovery/conf/locale/en/LC_MESSAGES/djangojs.po
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-07 13:49+0000\n"
"POT-Creation-Date: 2018-03-08 09:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
course_discovery/conf/locale/eo/LC_MESSAGES/django.po
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-07 13:49+0000\n"
"POT-Creation-Date: 2018-03-08 09:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -1479,7 +1479,6 @@ msgstr "Àççépt Àll Ⱡ'σяєм ιρѕυм ∂σłσ#"
#: apps/publisher/templates/publisher/course_detail.html
#: apps/publisher/templates/publisher/course_run_detail/_credit_seat.html
#: apps/publisher/templates/publisher/course_run_detail/_drupal.html
#: apps/publisher/templates/publisher/course_run_detail/_studio.html
msgid "(Optional) Not yet added"
msgstr "(Öptïönäl) Nöt ýét äddéd Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢ση#"
......@@ -3020,16 +3019,6 @@ msgid "Enrollment Type"
msgstr "Énröllmént Týpé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
#: apps/publisher/templates/publisher/course_run_detail/_studio.html
msgid "Enrollment Start Date (time in UTC)"
msgstr ""
"Énröllmént Stärt Däté (tïmé ïn ÛTÇ) Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєт#"
#: apps/publisher/templates/publisher/course_run_detail/_studio.html
msgid "Enrollment End Date (time in UTC)"
msgstr ""
"Énröllmént Énd Däté (tïmé ïn ÛTÇ) Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#"
#: apps/publisher/templates/publisher/course_run_detail/_studio.html
msgid "Pacing Type"
msgstr "Päçïng Týpé Ⱡ'σяєм ιρѕυм ∂σłσя #"
......
course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-07 13:49+0000\n"
"POT-Creation-Date: 2018-03-08 09:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment