Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
89cf7ee9
Commit
89cf7ee9
authored
Nov 18, 2016
by
Gregory Martin
Committed by
GitHub
Nov 18, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14022 from edx/yro_add-unset-dateutils
instructor dash course start and end
parents
1f987f18
2d60c65e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
8 deletions
+13
-8
lms/djangoapps/instructor/views/instructor_dashboard.py
+2
-3
lms/templates/courseware/accordion.html
+0
-1
lms/templates/instructor/instructor_dashboard_2/course_info.html
+7
-4
lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
+4
-0
No files found.
lms/djangoapps/instructor/views/instructor_dashboard.py
View file @
89cf7ee9
...
@@ -48,7 +48,6 @@ from certificates.models import (
...
@@ -48,7 +48,6 @@ from certificates.models import (
)
)
from
certificates
import
api
as
certs_api
from
certificates
import
api
as
certs_api
from
bulk_email.models
import
BulkEmailFlag
from
bulk_email.models
import
BulkEmailFlag
from
util.date_utils
import
get_default_time_display
from
class_dashboard.dashboard_data
import
get_section_display_name
,
get_array_section_has_problem
from
class_dashboard.dashboard_data
import
get_section_display_name
,
get_array_section_has_problem
from
.tools
import
get_units_with_due_date
,
title_or_url
from
.tools
import
get_units_with_due_date
,
title_or_url
...
@@ -430,8 +429,8 @@ def _section_course_info(course, access):
...
@@ -430,8 +429,8 @@ def _section_course_info(course, access):
'course_display_name'
:
course
.
display_name
,
'course_display_name'
:
course
.
display_name
,
'has_started'
:
course
.
has_started
(),
'has_started'
:
course
.
has_started
(),
'has_ended'
:
course
.
has_ended
(),
'has_ended'
:
course
.
has_ended
(),
'start_date'
:
get_default_time_display
(
course
.
start
)
,
'start_date'
:
course
.
start
,
'end_date'
:
get_default_time_display
(
course
.
end
)
or
_
(
'No end date set'
)
,
'end_date'
:
course
.
end
,
'num_sections'
:
len
(
course
.
children
),
'num_sections'
:
len
(
course
.
children
),
'list_instructor_tasks_url'
:
reverse
(
'list_instructor_tasks'
,
kwargs
=
{
'course_id'
:
unicode
(
course_key
)}),
'list_instructor_tasks_url'
:
reverse
(
'list_instructor_tasks'
,
kwargs
=
{
'course_id'
:
unicode
(
course_key
)}),
}
}
...
...
lms/templates/courseware/accordion.html
View file @
89cf7ee9
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
<
%
namespace
name=
'static'
file=
'../static_content.html'
/>
<
%
namespace
name=
'static'
file=
'../static_content.html'
/>
<
%!
<
%!
from
django
.
core
.
urlresolvers
import
reverse
from
django
.
core
.
urlresolvers
import
reverse
from
util
.
date_utils
import
get_time_display
from
django
.
utils
.
translation
import
ugettext
as
_
from
django
.
utils
.
translation
import
ugettext
as
_
from
django
.
conf
import
settings
from
django
.
conf
import
settings
from
openedx
.
core
.
djangolib
.
markup
import
HTML
,
Text
from
openedx
.
core
.
djangolib
.
markup
import
HTML
,
Text
...
...
lms/templates/instructor/instructor_dashboard_2/course_info.html
View file @
89cf7ee9
...
@@ -66,14 +66,17 @@ from openedx.core.djangolib.markup import HTML, Text
...
@@ -66,14 +66,17 @@ from openedx.core.djangolib.markup import HTML, Text
<li
class=
"field text is-not-editable"
id=
"field-course-start-date"
>
<li
class=
"field text is-not-editable"
id=
"field-course-start-date"
>
<label
for=
"course-start-date"
>
${_("Course Start Date:")}
</label>
<label
for=
"course-start-date"
>
${_("Course Start Date:")}
</label>
<b
>
${ section_data['start_date'] }
</b>
<b
class=
"localized-datetime"
data-datetime=
"${section_data['start_date']}"
data-timezone=
"${user_timezone}"
data-language=
"${user_language}"
>
</b>
</li>
</li>
<li
class=
"field text is-not-editable"
id=
"field-course-end-date"
>
<li
class=
"field text is-not-editable"
id=
"field-course-end-date"
>
<label
for=
"course-end-date"
>
${_("Course End Date:")}
</label>
<label
for=
"course-end-date"
>
${_("Course End Date:")}
</label>
<b>
${ section_data['end_date'] }
</b>
% if course.end is None:
<b>
${_("No end date set")}
</b>
% else:
<b
class=
"localized-datetime"
data-datetime=
"${section_data['end_date']}"
data-timezone=
"${user_timezone}"
data-language=
"${user_language}"
></b>
% endif
</li>
</li>
<li
class=
"field text is-not-editable"
id=
"field-course-started"
>
<li
class=
"field text is-not-editable"
id=
"field-course-started"
>
<label
for=
"start-date"
>
${_("Has the course started?")}
</label>
<label
for=
"start-date"
>
${_("Has the course started?")}
</label>
...
@@ -110,8 +113,8 @@ from openedx.core.djangolib.markup import HTML, Text
...
@@ -110,8 +113,8 @@ from openedx.core.djangolib.markup import HTML, Text
)}
)}
</p>
</p>
%endif
%endif
</div>
</div>
%if settings.FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS'):
%if settings.FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS'):
<div
class=
"running-tasks-container action-type-container"
>
<div
class=
"running-tasks-container action-type-container"
>
...
...
lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
View file @
89cf7ee9
...
@@ -126,3 +126,7 @@ from django.core.urlresolvers import reverse
...
@@ -126,3 +126,7 @@ from django.core.urlresolvers import reverse
</main>
</main>
</div>
</div>
</div>
</div>
<
%
static:require_module_async
module_name=
"js/dateutil_factory"
class_name=
"DateUtilFactory"
>
DateUtilFactory.transform(iterationKey=".localized-datetime");
</
%
static:require
_module_async
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment