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
eb1d0463
Commit
eb1d0463
authored
Jul 30, 2014
by
Dave St.Germain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show the enrollment counts for each mode on the instructor dashboard.
parent
a0b4f8b6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
8 deletions
+30
-8
common/static/js/vendor/ova/share-annotator.js
+3
-3
lms/djangoapps/instructor/views/instructor_dashboard.py
+2
-2
lms/static/sass/course/instructor/_instructor_2.scss
+8
-0
lms/templates/instructor/instructor_dashboard_2/course_info.html
+17
-3
No files found.
common/static/js/vendor/ova/share-annotator.js
View file @
eb1d0463
...
...
@@ -141,7 +141,7 @@ Annotator.Plugin.Share = (function(_super) {
event
.
preventDefault
();
// disable normal link function so that it doesn't refresh the page
annotation
=
share
.
getAnnotationFromId
(
event
.
currentTarget
.
attributes
.
annotationid
);
var
_field
=
this
;
var
ovaId
=
annotation
.
id
,
var
ovaId
=
annotation
.
id
;
var
title
;
if
(
method
==
1
)
{
title
=
'Share'
;
...
...
@@ -221,7 +221,7 @@ Annotator.Plugin.Share = (function(_super) {
source
=
this
.
annotation
.
id
;
}
else
{
// method 2
var
annotator
=
this
.
annotator
;
var
editor
=
annotator
.
editor
,
var
editor
=
annotator
.
editor
;
var
textarea
=
$
(
editor
.
element
).
find
(
'textarea'
)[
0
];
if
(
source
==
'ovaText'
)
...
...
@@ -258,7 +258,7 @@ Annotator.Plugin.Share = (function(_super) {
The first option is to give a known id of an annotation
Example http:// url.com/#id=rTcpOjIMT2aF1apDtboC-Q
*/
var
API
=
{}
,
var
API
=
{}
;
var
ovaId
=
this
.
getParameterByName
(
'ovaId'
);
// Method 1 (Obligatory)
var
start
=
this
.
getParameterByName
(
'ovaStart'
);
// Method 2 (Obligatory)
var
end
=
this
.
getParameterByName
(
'ovaEnd'
);
// Method 2 (Obligatory)
...
...
lms/djangoapps/instructor/views/instructor_dashboard.py
View file @
eb1d0463
...
...
@@ -97,7 +97,7 @@ def instructor_dashboard_2(request, course_id):
if
is_studio_course
:
studio_url
=
get_cms_course_link
(
course
)
enrollment_count
=
sections
[
0
][
'enrollment_count'
]
enrollment_count
=
sections
[
0
][
'enrollment_count'
]
[
'total'
]
disable_buttons
=
False
max_enrollment_for_buttons
=
settings
.
FEATURES
.
get
(
"MAX_ENROLLMENT_INSTR_BUTTONS"
)
if
max_enrollment_for_buttons
is
not
None
:
...
...
@@ -160,7 +160,7 @@ def _section_course_info(course_key, access):
'access'
:
access
,
'course_id'
:
course_key
,
'course_display_name'
:
course
.
display_name
,
'enrollment_count'
:
CourseEnrollment
.
num_enrolled_in
(
course_key
),
'enrollment_count'
:
CourseEnrollment
.
enrollment_counts
(
course_key
),
'has_started'
:
course
.
has_started
(),
'has_ended'
:
course
.
has_ended
(),
'list_instructor_tasks_url'
:
reverse
(
'list_instructor_tasks'
,
kwargs
=
{
'course_id'
:
course_key
.
to_deprecated_string
()}),
...
...
lms/static/sass/course/instructor/_instructor_2.scss
View file @
eb1d0463
...
...
@@ -774,6 +774,14 @@ input[name="subject"] {
color
:
green
;
font-weight
:
bold
;
}
table
{
tr
{
height
:
21px
;
td
{
width
:
120px
;
}
}
}
}
.ecommerce-wrapper
{
...
...
lms/templates/instructor/instructor_dashboard_2/course_info.html
View file @
eb1d0463
...
...
@@ -3,10 +3,24 @@
<div
class=
"enrollment-wrapper"
>
<h2>
${_("Enrollment Information")}
</h2>
<span
class=
"tip"
>
${_("Total number of enrollees (instructors, staff members, and students)")}
</span>
## Translators: 'track' refers to the enrollment type ('honor', 'verified', or 'audit')
<span
class=
"tip"
>
${_("Number of enrollees (instructors, staff members, and students) by track")}
</span>
<br/><br/>
<span
style=
"color: green;"
><b>
${ section_data['enrollment_count'] }
</b></span>
<
%
modes =
section_data['enrollment_count']
%
>
<table>
<tr>
<td>
${_("Verified")}
</td><td>
${modes['verified']}
</td>
</tr>
<tr>
<td>
${_("Audit")}
</td><td>
${modes['audit']}
</td>
</tr>
<tr>
<td>
${_("Honor")}
</td><td>
${modes['honor']}
</td>
</tr>
<tr
style=
"color:green;border-top:1px solid #000"
>
<td
style=
"padding-top:10px;"
><b>
${_("Total")}
</b></td><td
style=
"padding-top:10px;"
><b>
${modes['total']}
</b></td>
</tr>
</table>
</div>
<hr>
...
...
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