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
1ea65455
Commit
1ea65455
authored
Jun 04, 2013
by
dcadams
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Worked on reducing pep8 violations.
parent
56f81fb1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
15 deletions
+6
-15
common/djangoapps/student/views.py
+0
-6
lms/djangoapps/instructor/tests/test_enrollment.py
+0
-0
lms/djangoapps/instructor/views.py
+6
-9
No files found.
common/djangoapps/student/views.py
View file @
1ea65455
...
@@ -264,7 +264,6 @@ def dashboard(request):
...
@@ -264,7 +264,6 @@ def dashboard(request):
if
not
user
.
is_active
:
if
not
user
.
is_active
:
message
=
render_to_string
(
'registration/activate_account_notice.html'
,
{
'email'
:
user
.
email
})
message
=
render_to_string
(
'registration/activate_account_notice.html'
,
{
'email'
:
user
.
email
})
# Global staff can see what courses errored on their dashboard
# Global staff can see what courses errored on their dashboard
staff_access
=
False
staff_access
=
False
errored_courses
=
{}
errored_courses
=
{}
...
@@ -454,7 +453,6 @@ def login_user(request, error=""):
...
@@ -454,7 +453,6 @@ def login_user(request, error=""):
expires_time
=
time
.
time
()
+
max_age
expires_time
=
time
.
time
()
+
max_age
expires
=
cookie_date
(
expires_time
)
expires
=
cookie_date
(
expires_time
)
response
.
set_cookie
(
settings
.
EDXMKTG_COOKIE_NAME
,
response
.
set_cookie
(
settings
.
EDXMKTG_COOKIE_NAME
,
'true'
,
max_age
=
max_age
,
'true'
,
max_age
=
max_age
,
expires
=
expires
,
domain
=
settings
.
SESSION_COOKIE_DOMAIN
,
expires
=
expires
,
domain
=
settings
.
SESSION_COOKIE_DOMAIN
,
...
@@ -698,7 +696,6 @@ def create_account(request, post_override=None):
...
@@ -698,7 +696,6 @@ def create_account(request, post_override=None):
expires_time
=
time
.
time
()
+
max_age
expires_time
=
time
.
time
()
+
max_age
expires
=
cookie_date
(
expires_time
)
expires
=
cookie_date
(
expires_time
)
response
.
set_cookie
(
settings
.
EDXMKTG_COOKIE_NAME
,
response
.
set_cookie
(
settings
.
EDXMKTG_COOKIE_NAME
,
'true'
,
max_age
=
max_age
,
'true'
,
max_age
=
max_age
,
expires
=
expires
,
domain
=
settings
.
SESSION_COOKIE_DOMAIN
,
expires
=
expires
,
domain
=
settings
.
SESSION_COOKIE_DOMAIN
,
...
@@ -708,7 +705,6 @@ def create_account(request, post_override=None):
...
@@ -708,7 +705,6 @@ def create_account(request, post_override=None):
return
response
return
response
def
exam_registration_info
(
user
,
course
):
def
exam_registration_info
(
user
,
course
):
""" Returns a Registration object if the user is currently registered for a current
""" Returns a Registration object if the user is currently registered for a current
exam of the course. Returns None if the user is not registered, or if there is no
exam of the course. Returns None if the user is not registered, or if there is no
...
@@ -849,7 +845,6 @@ def create_exam_registration(request, post_override=None):
...
@@ -849,7 +845,6 @@ def create_exam_registration(request, post_override=None):
response_data
[
'non_field_errors'
]
=
form
.
non_field_errors
()
response_data
[
'non_field_errors'
]
=
form
.
non_field_errors
()
return
HttpResponse
(
json
.
dumps
(
response_data
),
mimetype
=
"application/json"
)
return
HttpResponse
(
json
.
dumps
(
response_data
),
mimetype
=
"application/json"
)
# only do the following if there is accommodation text to send,
# only do the following if there is accommodation text to send,
# and a destination to which to send it.
# and a destination to which to send it.
# TODO: still need to create the accommodation email templates
# TODO: still need to create the accommodation email templates
...
@@ -872,7 +867,6 @@ def create_exam_registration(request, post_override=None):
...
@@ -872,7 +867,6 @@ def create_exam_registration(request, post_override=None):
# response_data['non_field_errors'] = [ 'Could not send accommodation e-mail.', ]
# response_data['non_field_errors'] = [ 'Could not send accommodation e-mail.', ]
# return HttpResponse(json.dumps(response_data), mimetype="application/json")
# return HttpResponse(json.dumps(response_data), mimetype="application/json")
js
=
{
'success'
:
True
}
js
=
{
'success'
:
True
}
return
HttpResponse
(
json
.
dumps
(
js
),
mimetype
=
"application/json"
)
return
HttpResponse
(
json
.
dumps
(
js
),
mimetype
=
"application/json"
)
...
...
lms/djangoapps/instructor/tests/test_enrollment.py
View file @
1ea65455
lms/djangoapps/instructor/views.py
View file @
1ea65455
...
@@ -9,7 +9,6 @@ import os
...
@@ -9,7 +9,6 @@ import os
import
re
import
re
import
requests
import
requests
from
requests.status_codes
import
codes
from
requests.status_codes
import
codes
import
urllib
from
collections
import
OrderedDict
from
collections
import
OrderedDict
from
StringIO
import
StringIO
from
StringIO
import
StringIO
...
@@ -272,7 +271,6 @@ def instructor_dashboard(request, course_id):
...
@@ -272,7 +271,6 @@ def instructor_dashboard(request, course_id):
except
:
except
:
msg
+=
"<font color='red'>Couldn't reset module state. </font>"
msg
+=
"<font color='red'>Couldn't reset module state. </font>"
elif
"Get link to student's progress page"
in
action
:
elif
"Get link to student's progress page"
in
action
:
unique_student_identifier
=
request
.
POST
.
get
(
'unique_student_identifier'
,
''
)
unique_student_identifier
=
request
.
POST
.
get
(
'unique_student_identifier'
,
''
)
try
:
try
:
...
@@ -315,6 +313,7 @@ def instructor_dashboard(request, course_id):
...
@@ -315,6 +313,7 @@ def instructor_dashboard(request, course_id):
msg2
,
rg_stud_data
=
_do_remote_gradebook
(
request
.
user
,
course
,
'get-membership'
)
msg2
,
rg_stud_data
=
_do_remote_gradebook
(
request
.
user
,
course
,
'get-membership'
)
datatable
=
{
'header'
:
[
'Student email'
,
'Match?'
]}
datatable
=
{
'header'
:
[
'Student email'
,
'Match?'
]}
rg_students
=
[
x
[
'email'
]
for
x
in
rg_stud_data
[
'retdata'
]]
rg_students
=
[
x
[
'email'
]
for
x
in
rg_stud_data
[
'retdata'
]]
def
domatch
(
x
):
def
domatch
(
x
):
return
'<font color="green">yes</font>'
if
x
.
email
in
rg_students
else
'<font color="red">No</font>'
return
'<font color="green">yes</font>'
if
x
.
email
in
rg_students
else
'<font color="red">No</font>'
datatable
[
'data'
]
=
[[
x
.
email
,
domatch
(
x
)]
for
x
in
stud_data
[
'students'
]]
datatable
[
'data'
]
=
[[
x
.
email
,
domatch
(
x
)]
for
x
in
stud_data
[
'students'
]]
...
@@ -350,7 +349,6 @@ def instructor_dashboard(request, course_id):
...
@@ -350,7 +349,6 @@ def instructor_dashboard(request, course_id):
msg2
,
_
=
_do_remote_gradebook
(
request
.
user
,
course
,
'post-grades'
,
files
=
files
)
msg2
,
_
=
_do_remote_gradebook
(
request
.
user
,
course
,
'post-grades'
,
files
=
files
)
msg
+=
msg2
msg
+=
msg2
#----------------------------------------
#----------------------------------------
# Admin
# Admin
...
@@ -416,6 +414,7 @@ def instructor_dashboard(request, course_id):
...
@@ -416,6 +414,7 @@ def instructor_dashboard(request, course_id):
profkeys
=
[
'name'
,
'language'
,
'location'
,
'year_of_birth'
,
'gender'
,
'level_of_education'
,
profkeys
=
[
'name'
,
'language'
,
'location'
,
'year_of_birth'
,
'gender'
,
'level_of_education'
,
'mailing_address'
,
'goals'
]
'mailing_address'
,
'goals'
]
datatable
=
{
'header'
:
[
'username'
,
'email'
]
+
profkeys
}
datatable
=
{
'header'
:
[
'username'
,
'email'
]
+
profkeys
}
def
getdat
(
u
):
def
getdat
(
u
):
p
=
u
.
profile
p
=
u
.
profile
return
[
u
.
username
,
u
.
email
]
+
[
getattr
(
p
,
x
,
''
)
for
x
in
profkeys
]
return
[
u
.
username
,
u
.
email
]
+
[
getattr
(
p
,
x
,
''
)
for
x
in
profkeys
]
...
@@ -424,9 +423,8 @@ def instructor_dashboard(request, course_id):
...
@@ -424,9 +423,8 @@ def instructor_dashboard(request, course_id):
datatable
[
'title'
]
=
'Student profile data for course
%
s'
%
course_id
datatable
[
'title'
]
=
'Student profile data for course
%
s'
%
course_id
return
return_csv
(
'profiledata_
%
s.csv'
%
course_id
,
datatable
)
return
return_csv
(
'profiledata_
%
s.csv'
%
course_id
,
datatable
)
elif
'Download CSV of all responses to problem'
in
action
:
elif
'Download CSV of all responses to problem'
in
action
:
problem_to_dump
=
request
.
POST
.
get
(
'problem_to_dump'
,
''
)
problem_to_dump
=
request
.
POST
.
get
(
'problem_to_dump'
,
''
)
if
problem_to_dump
[
-
4
:]
==
".xml"
:
if
problem_to_dump
[
-
4
:]
==
".xml"
:
problem_to_dump
=
problem_to_dump
[:
-
4
]
problem_to_dump
=
problem_to_dump
[:
-
4
]
...
@@ -444,7 +442,7 @@ def instructor_dashboard(request, course_id):
...
@@ -444,7 +442,7 @@ def instructor_dashboard(request, course_id):
if
smdat
:
if
smdat
:
datatable
=
{
'header'
:
[
'username'
,
'state'
]}
datatable
=
{
'header'
:
[
'username'
,
'state'
]}
datatable
[
'data'
]
=
[
[
x
.
student
.
username
,
x
.
state
]
for
x
in
smdat
]
datatable
[
'data'
]
=
[
[
x
.
student
.
username
,
x
.
state
]
for
x
in
smdat
]
datatable
[
'title'
]
=
'Student state for problem
%
s'
%
problem_to_dump
datatable
[
'title'
]
=
'Student state for problem
%
s'
%
problem_to_dump
return
return_csv
(
'student_state_from_
%
s.csv'
%
problem_to_dump
,
datatable
)
return
return_csv
(
'student_state_from_
%
s.csv'
%
problem_to_dump
,
datatable
)
...
@@ -481,7 +479,6 @@ def instructor_dashboard(request, course_id):
...
@@ -481,7 +479,6 @@ def instructor_dashboard(request, course_id):
msg
+=
_list_course_forum_members
(
course_id
,
rolename
,
datatable
)
msg
+=
_list_course_forum_members
(
course_id
,
rolename
,
datatable
)
track
.
views
.
server_track
(
request
,
'list-{0}'
.
format
(
rolename
),
{},
page
=
'idashboard'
)
track
.
views
.
server_track
(
request
,
'list-{0}'
.
format
(
rolename
),
{},
page
=
'idashboard'
)
elif
action
==
'Remove forum admin'
:
elif
action
==
'Remove forum admin'
:
uname
=
request
.
POST
[
'forumadmin'
]
uname
=
request
.
POST
[
'forumadmin'
]
msg
+=
_update_forum_role_membership
(
uname
,
course
,
FORUM_ROLE_ADMINISTRATOR
,
FORUM_ROLE_REMOVE
)
msg
+=
_update_forum_role_membership
(
uname
,
course
,
FORUM_ROLE_ADMINISTRATOR
,
FORUM_ROLE_REMOVE
)
...
@@ -571,7 +568,6 @@ def instructor_dashboard(request, course_id):
...
@@ -571,7 +568,6 @@ def instructor_dashboard(request, course_id):
ret
=
_do_enroll_students
(
course
,
course_id
,
students
,
overload
=
overload
)
ret
=
_do_enroll_students
(
course
,
course_id
,
students
,
overload
=
overload
)
datatable
=
ret
[
'datatable'
]
datatable
=
ret
[
'datatable'
]
#----------------------------------------
#----------------------------------------
# psychometrics
# psychometrics
...
@@ -1093,6 +1089,7 @@ def get_and_clean_student_list(students):
...
@@ -1093,6 +1089,7 @@ def get_and_clean_student_list(students):
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# answer distribution
# answer distribution
def
get_answers_distribution
(
request
,
course_id
):
def
get_answers_distribution
(
request
,
course_id
):
"""
"""
Get the distribution of answers for all graded problems in the course.
Get the distribution of answers for all graded problems in the course.
...
@@ -1184,5 +1181,5 @@ def dump_grading_context(course):
...
@@ -1184,5 +1181,5 @@ def dump_grading_context(course):
msg
+=
"
%
s (format=
%
s, Assignment=
%
s
%
s)
\n
"
%
(
s
.
display_name
,
format
,
aname
,
notes
)
msg
+=
"
%
s (format=
%
s, Assignment=
%
s
%
s)
\n
"
%
(
s
.
display_name
,
format
,
aname
,
notes
)
msg
+=
"all descriptors:
\n
"
msg
+=
"all descriptors:
\n
"
msg
+=
"length=
%
d
\n
"
%
len
(
gc
[
'all_descriptors'
])
msg
+=
"length=
%
d
\n
"
%
len
(
gc
[
'all_descriptors'
])
msg
=
'<pre>
%
s</pre>'
%
msg
.
replace
(
'<'
,
'<'
)
msg
=
'<pre>
%
s</pre>'
%
msg
.
replace
(
'<'
,
'<'
)
return
msg
return
msg
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