Commit Graph

12296 Commits

Author SHA1 Message Date
Jay Zoldak
64e8f9c0cd Add BDD lettuce tests for studio overview toggle section feature. 2013-01-10 16:00:40 -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
Calen Pennington
cb3b17d44c Catch ItemNotFound errors at the top of get_module, rather than in get_module_for_descriptor, to maintain previous LMS behavior 2013-01-10 14:30:12 -05:00
Calen Pennington
0726294c35 Use get_child_descriptors for grades.py 2013-01-10 13:55:46 -05:00
Calen Pennington
89a0b82e5c Decrease the number of queries needed for LMS courseware
This cuts the number of queries in 6.002 courseware loads from ~650 to
~5-40. Still to do: cache CustomTag templates so that we only load them
once per request.
2013-01-10 13:55:46 -05:00
Diana Huang
19bc657487 Use correct version of the grader id. 2013-01-10 12:44:54 -05:00
Chris Dodge
d4f30b378e remove commented out line and add a new comment. also remove debugging trace output 2013-01-09 16:05:09 -05:00
Chris Dodge
e11706ef07 change over the 'get all discussion models' to use get_items() which is better supported in Mongo-backed stores 2013-01-09 15:53:22 -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
Jay Zoldak
f056f0624d Set up the framework for running lettuce tests against studio 2013-01-08 14:44:45 -05:00
Chris Dodge
99750a6812 make sure we turn off module wrappers for the 'ancillary' course content 2013-01-08 11:18:41 -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
Chris Dodge
3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2
Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt
2013-01-07 12:34:48 -05:00
Diana Huang
2293a37f7d Move over old Staff Grading tests to new app. 2013-01-07 09:17:09 -05:00
Calen Pennington
789ac3fc87 Use the XBlock library as the base for XModule, so that we can incrementally rely on more and more of the XBlock api 2013-01-04 16:19:58 -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
Chris Dodge
0743adb1cd update grade download csv content 2013-01-03 12:58:59 -05:00
Calen Pennington
8874d9d7f8 Add a draft implementation of the Poll module for Justice 2013-01-03 12:21:13 -05:00
Chris Dodge
e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge
Conflicts:
	requirements.txt
2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -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
Calen Pennington
6427dd6742 WIP: Get the cms running. Component previews work 2013-01-02 09:07:02 -05:00
Calen Pennington
2509308ce9 Remove reference to shared_state_key 2013-01-02 09:05:48 -05:00