Revert "Ora2 dates reprise"
This commit is contained in:
Dillon Dumesnil
@@ -10,7 +10,6 @@ from datetime import datetime
|
||||
import pytz
|
||||
import six
|
||||
from crum import get_current_request
|
||||
from dateutil.parser import parse as parse_date
|
||||
from django.conf import settings
|
||||
from django.http import Http404, QueryDict
|
||||
from django.urls import reverse
|
||||
@@ -72,7 +71,7 @@ log = logging.getLogger(__name__)
|
||||
# Used by get_course_assignments below. You shouldn't need to use this type directly.
|
||||
_Assignment = namedtuple(
|
||||
'Assignment', ['block_key', 'title', 'url', 'date', 'contains_gated_content', 'complete', 'past_due',
|
||||
'assignment_type', 'extra_info']
|
||||
'assignment_type']
|
||||
)
|
||||
|
||||
|
||||
@@ -509,7 +508,6 @@ def get_course_assignment_date_blocks(course, user, request, num_return=None,
|
||||
date_block.past_due = assignment.past_due
|
||||
date_block.link = request.build_absolute_uri(assignment.url) if assignment.url else ''
|
||||
date_block.set_title(assignment.title, link=assignment.url)
|
||||
date_block._extra_info = assignment.extra_info
|
||||
date_blocks.append(date_block)
|
||||
date_blocks = sorted((b for b in date_blocks if b.is_enabled or include_past_dates), key=date_block_key_fn)
|
||||
if num_return:
|
||||
@@ -553,72 +551,9 @@ def get_course_assignments(course_key, user, include_access=False):
|
||||
complete = is_block_structure_complete_for_assignments(block_data, subsection_key)
|
||||
past_due = not complete and due < now
|
||||
assignments.append(_Assignment(
|
||||
subsection_key, title, url, due, contains_gated_content, complete, past_due, assignment_type, None
|
||||
subsection_key, title, url, due, contains_gated_content, complete, past_due, assignment_type
|
||||
))
|
||||
|
||||
# Load all dates for ORA blocks as separate assignments
|
||||
descendents = block_data.get_children(subsection_key)
|
||||
while descendents:
|
||||
descendent = descendents.pop()
|
||||
descendents.extend(block_data.get_children(descendent))
|
||||
if block_data.get_xblock_field(descendent, 'category', None) == 'openassessment':
|
||||
graded = block_data.get_xblock_field(descendent, 'graded', False)
|
||||
has_score = block_data.get_xblock_field(descendent, 'has_score', False)
|
||||
weight = block_data.get_xblock_field(descendent, 'weight', 1)
|
||||
if not (graded and has_score and (weight is None or weight > 0)):
|
||||
continue
|
||||
|
||||
all_assessments = [{
|
||||
'name': 'submission',
|
||||
'due': block_data.get_xblock_field(descendent, 'submission_due'),
|
||||
'start': block_data.get_xblock_field(descendent, 'submission_start'),
|
||||
'required': True
|
||||
}]
|
||||
valid_assessments = block_data.get_xblock_field(descendent, 'valid_assessments')
|
||||
|
||||
if valid_assessments:
|
||||
all_assessments.extend(valid_assessments)
|
||||
|
||||
assignment_type = block_data.get_xblock_field(descendent, 'format', None)
|
||||
complete = is_block_structure_complete_for_assignments(block_data, descendent)
|
||||
|
||||
block_title = block_data.get_xblock_field(descendent, 'title', _('Open Response Assessment'))
|
||||
|
||||
for assessment in valid_assessments:
|
||||
due = parse_date(assessment['due']).replace(tzinfo=pytz.UTC) if assessment['due'] else None
|
||||
if due is None:
|
||||
continue
|
||||
|
||||
if assessment['name'] == 'self-assessment':
|
||||
assessment_type = _("Self Assessment")
|
||||
elif assessment['name'] == 'peer-assessment':
|
||||
assessment_type = _("Peer Assessment")
|
||||
elif assessment['name'] == 'staff-assessment':
|
||||
assessment_type = _("Staff Assessment")
|
||||
elif assessment['name'] == 'submission':
|
||||
assessment_type = _("Submission")
|
||||
else:
|
||||
assessment_type = assessment['name']
|
||||
title = "{} ({})".format(block_title, assessment_type)
|
||||
url = ''
|
||||
start = parse_date(assessment['start']).replace(tzinfo=pytz.UTC) if assessment['start'] else None
|
||||
assignment_released = not start or start < now
|
||||
if assignment_released:
|
||||
url = reverse('jump_to', args=[course_key, descendent])
|
||||
|
||||
past_due = not complete and due and due < now
|
||||
assignments.append(_Assignment(
|
||||
descendent,
|
||||
title,
|
||||
url,
|
||||
due,
|
||||
contains_gated_content,
|
||||
complete,
|
||||
past_due,
|
||||
assignment_type,
|
||||
_("Open Response Assessment due dates are set by your instructor and can't be shifted.")
|
||||
))
|
||||
|
||||
return assignments
|
||||
|
||||
|
||||
|
||||
@@ -77,11 +77,6 @@ class DateSummary(object):
|
||||
"""The detail text displayed by this summary."""
|
||||
return ''
|
||||
|
||||
@property
|
||||
def extra_info(self):
|
||||
"""Extra detail to display as a tooltip."""
|
||||
return None
|
||||
|
||||
def register_alerts(self, request, course):
|
||||
"""
|
||||
Registers any relevant course alerts given the current request.
|
||||
@@ -393,7 +388,6 @@ class CourseAssignmentDate(DateSummary):
|
||||
self.contains_gated_content = False
|
||||
self.complete = None
|
||||
self.past_due = None
|
||||
self._extra_info = None
|
||||
|
||||
@property
|
||||
def date(self):
|
||||
@@ -411,10 +405,6 @@ class CourseAssignmentDate(DateSummary):
|
||||
def link(self):
|
||||
return self.assignment_link
|
||||
|
||||
@property
|
||||
def extra_info(self):
|
||||
return self._extra_info
|
||||
|
||||
@link.setter
|
||||
def link(self, link):
|
||||
self.assignment_link = link
|
||||
|
||||
Reference in New Issue
Block a user