Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Begin client-side date processing using DateutilFactory

Browse Source
This commit is contained in:
Brian Jacobel
2017-04-10 12:33:59 -04:00
committed by Diana Huang
parent cca52b90aa
commit 31aa776e4e
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
openedx/features/course_experience/templates/course_experience/course-outline-fragment.html
View File

@@ -49,14 +49,14 @@ from django.utils.translation import ugettext as _
## Proctoring exposes a exam status message field as well as a status icon
<%
if subsection.get('due') is None:
data_string = subsection['format']
data_string = subsection.get('format')
else:
if 'special_exam' in subsection:
data_string = _('due {date}')
else:
data_string = _("{subsection_format} due {{date}}").format(subsection_format=subsection['format'])
data_string = _("{subsection_format} due {{date}}").format(subsection_format=subsection.get('format'))
%>
% if subsection['format'] or due_date or 'special_exam' in subsection:
% if subsection.get('format') or 'special_exam' in subsection:
<span class="subtitle">
% if 'special_exam' in subsection:
## Display the proctored exam status icon and status message
@@ -73,7 +73,7 @@ from django.utils.translation import ugettext as _
% if not subsection['special_exam'].get('in_completed_state', False):
<span
class="localized-datetime subtitle-name"
data-datetime="${subsection['due']}"
data-datetime="${subsection.get('due')}"
data-string="${data_string}"
data-timezone="${user_timezone}"
data-language="${user_language}"
@@ -84,7 +84,7 @@ from django.utils.translation import ugettext as _
## this is the standard case in edx-platform
<span
class="localized-datetime subtitle-name"
data-datetime="${subsection['due']}"
data-datetime="${subsection.get('due')}"
data-string="${data_string}"
data-timezone="${user_timezone}"
data-language="${user_language}"
@@ -120,3 +120,7 @@ from django.utils.translation import ugettext as _
% endfor
</ol>
</div>
<%static:require_module_async module_name="js/dateutil_factory" class_name="DateUtilFactory">
DateUtilFactory.transform('.localized-datetime');
</%static:require_module_async>

6
openedx/features/course_experience/views/course_outline.py
View File

@@ -30,12 +30,6 @@ class CourseOutlineFragmentView(EdxFragmentView):
child_id = block['children'][i]
child_detail = self.populate_children(all_blocks[child_id], all_blocks, course_position)
# Fake data; remove
child_detail = dict(child_detail, **{
"format": "",
"due": ""
})
block['children'][i] = child_detail
block['children'][i]['current'] = course_position == child_detail['block_id']