David Ormsbee
ad261706c8
Merge pull request #1263 from MITx/feature/ichuang/instructor-dashboard-upgrade3
...
Upgrade to instructor dashboard: enrollment, offline grades, remote gradebook
2013-01-15 08:22:19 -08:00
Vik Paruchuri
52164f58ff
Fix self.get call in peer grading service
2013-01-11 11:39:32 -05:00
ichuang
4f869ad382
remove spurious comment
2013-01-11 00:10:52 -05:00
ichuang
b7ad39a0b9
instructor dashboard shouldn't import .grading anymore
2013-01-11 00:09:46 -05:00
ichuang
37f848949d
only is_staff users can add/edit/delete course instructors
2013-01-10 23:32:49 -05:00
ichuang
5cc88ec1ad
example course_id for compute_grades management command
2013-01-10 23:32:48 -05:00
Calen Pennington
9853c6323f
Remove circular dependencies that connect student.models and django_comment_client
...
Includes removal of "from django_comment_client.models import Role" from common/djangoapps/student/models.py
Conflicts:
common/djangoapps/student/models.py
2013-01-10 23:32:48 -05:00
ichuang
ec94f7328c
remove try...except workaround for circular import bug fixed by https://github.com/MITx/mitx/issues/1260
2013-01-10 23:32:48 -05:00
ichuang
e5c958082b
list/add/delete instructors on instructor dashboard
2013-01-10 23:32:48 -05:00
ichuang
04d6f08c0c
add offline grade computation & DB table for this
2013-01-10 23:32:48 -05:00
ichuang
82e31d533b
Hookup CourseEnrollmentAllowed to lms/djangoapps/courseware/access.py
2013-01-10 23:31:46 -05:00
ichuang
97fb054449
add export grades to remote gradebook to instructor dashboard
2013-01-10 23:31:46 -05:00
ichuang
200493a54f
instructor dashboard upgrade - add enrollment management
2013-01-10 23:31:45 -05:00
Victor Shnayder
e97469aee6
Merge pull request #1236 from MITx/diana/peer-grading-views
...
Peer Grading Interface
2013-01-10 13:59:46 -08:00
Diana Huang
81bb2dc979
Better and clearer comments along with some fixes
...
for code review issues
2013-01-10 16:45:19 -05:00
Carlos Andrés Rocha
8f21d7a738
Add property to course module to check if a course is new
...
The property can be set in the policy metadata. If it is not specified
then it is set to true if the course has not started yet.
Also adds a property to check how many days are left until the course starts.
2013-01-10 15:57:29 -05:00
Diana Huang
ef6d77b116
Clean up names and refactor out some common logic
2013-01-10 15:33:17 -05:00
Diana Huang
084a3c33c8
Update comments and remove some unnecessary code
2013-01-10 15:20:46 -05:00
Diana Huang
0bfb1feed4
Log better exceptions
2013-01-10 15:06:16 -05:00
Diana Huang
4909b84966
Clean up code and make the arguments for get and post more logical.
2013-01-10 14:51:32 -05:00
Diana Huang
19bc657487
Use correct version of the grader id.
2013-01-10 12:44:54 -05:00
Diana Huang
c4d1b2e643
Use correct user id and make the reload button a back button
2013-01-09 14:41:23 -05:00
Diana Huang
f0f25296b2
Update documentation
2013-01-08 15:54:49 -05:00
Diana Huang
b7473f8017
Make mock service return useful data
2013-01-07 15:40:01 -05:00
Diana Huang
e1ec4eec71
Get tests to pass by creating a mock peer grading service
2013-01-07 14:46:32 -05:00
Diana Huang
2293a37f7d
Move over old Staff Grading tests to new app.
2013-01-07 09:17:09 -05:00
Diana Huang
fe86c25f72
Bug fixes for the JS and the peer grading service
2013-01-03 17:23:30 -05:00
Diana Huang
28501ca58e
Merge branch 'master' into diana/peer-grading-views
2013-01-03 16:23:14 -05:00
Diana Huang
078b2a5b95
Fix up some minor state issues and
...
complete basic JS functionality for page
2013-01-03 16:19:04 -05:00
Diana Huang
becffd4dbb
Updated html and javascript for new pages as well
...
as a fix for the peer grading service
2013-01-03 14:08:56 -05:00
Diana Huang
1c1034c63b
Pass location as a parameter, not as a part of the url
2013-01-03 13:47:03 -05:00
Diana Huang
bd47b0c79a
New urls and corresponding views in the grading service
2013-01-03 12:59:34 -05:00
Diana Huang
c89ff2ac0e
Basic peer grading view using mocks and some cleanup in
...
the peer grading service
2013-01-02 17:44:58 -05:00
Diana Huang
37f261f906
Move peer grading so that there are the individual problem pages
...
and the problem list page
2013-01-02 15:01:59 -05:00
Jay Zoldak
56d17d8a8a
Improve some comments and names in the acceptance test framework
2013-01-02 10:44:21 -05:00
Jay Zoldak
d5111b9ed9
Get lettuce tests running against test database
2013-01-02 10:44:21 -05:00
Jay Zoldak
ccc8b599f1
Fixed tests to work OK so far.
2013-01-02 10:44:21 -05:00
Jay Zoldak
7e5a67badf
Add new partner universities and remove cs50 from smart accordion testing
2013-01-02 10:44:20 -05:00
Jay Zoldak
7f6d55ad86
Create acceptance tests for open ended grading.
2013-01-02 10:44:20 -05:00
Jay Zoldak
6df565e468
Interim work on open-ended grading acceptance testing POC
2013-01-02 10:44:20 -05:00
Jay Zoldak
d65985b445
Use beautiful soup to massage the HTML for easier comparison.
...
Strip off the data-id tag for HTML diff of courseware
Strip data-id attributes so they are not compared in the HTML
2013-01-02 10:44:20 -05:00
Jay Zoldak
8934f54d6f
Save the HTML to a file for each section and comment out debug msgs
2013-01-02 10:44:20 -05:00
Jay Zoldak
5cad5d5fba
Add scenarios for all Fall 2012 courses to smart accordion feature.
2013-01-02 10:44:20 -05:00
Jay Zoldak
20cc930312
Bring over acceptance test changes from cms master branch.
2013-01-02 10:44:20 -05:00
Jay Zoldak
af4f1668d7
Stub out the video and capture the html files of the high level tabs for diff comparison
...
Conflicts:
lms/templates/video.html
2013-01-02 10:44:20 -05:00
Jay Zoldak
10275e9709
Add item checking within courseware tabs
2013-01-02 10:44:19 -05:00
Jay Zoldak
a40ea202d2
Cleanup of imports in courseware tests
2013-01-02 10:44:19 -05:00
Jay Zoldak
0a77dd4431
Smart accordion walkthrough working for cms-master branch
...
Conflicts:
lms/envs/cms/acceptance.py
2013-01-02 10:44:19 -05:00
Jay Zoldak
668bc81d7f
New branch for clean lms acceptance tests
2013-01-02 10:44:19 -05:00
Diana Huang
652a8eb440
New peer grading view on the lms side
2012-12-28 15:48:06 -05:00
