Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,141 Commits 1 Branch 0 Tags
02cb0b487db954522ee052d25beb603f0c23721b
Commit Graph

924 Commits

Author SHA1 Message Date
Peter Baratta
e0f0ab090d Use calc's evaluator for staff answers in Numercial type 
Rather than just calling `complex(...)` on the staff answers, also call
`calc.evaluator`. This way, simple things like `1/3` can be entered, as well
as more complicated explicit equations (e.g. `sqrt((12^2 + 26^2)/2)` etc, etc)

Simplify and update the tests to work with this.
 2013-08-19 13:40:32 -04:00
ichuang
501c089f41 capa optioninput template was missing msg output (needed for hints) 2013-08-14 21:51:40 -04:00
Peter Baratta
735e3b01a2 Create a new response type for Numerical/Formula 
Named `FormulaEquationInput` (name up for debate)

- Based off ChemEqnIn
- Add FormulaEquationInput in inputtypes.py
- Add a call to a skeleton method for a preview

javascript:

- Queue up some MathJax
- Put some ordering on the AJAX requests: add a parameter when the request was started, when it returns check that it isn't outdated before displaying the preview
- Tests

Note: we moved the `jsinput` tests and DISABLED them, because they were causing the tests to fail.
 2013-08-12 11:48:45 -04:00
Peter Baratta
a1162cbb34 Change calc module 
- Create a method called `parse_algebra`. It takes a string of math and returns with a `pyparsing.ParseResults` object representing it.
- `evaluator` takes this tree and applies the old "parse actions" to it to get the same number as it used to.
- Change calc's API: `evaluator` to use `case_sensitive` rather than `cs`
- Add most of the capability for latex rendering
 2013-08-12 11:40:20 -04:00
Adam Palay
2b40462263 convert all datetime.now() to datetime.now(UTC) 2013-07-22 17:39:11 -04:00
Adam Palay
b2b3a50400 convert datetime.now() to datetime.now(UTC) for xqueue 2013-07-22 17:39:11 -04:00
Adam Palay
b744aaa360 make sure parsed times are set to UTC 2013-07-22 17:39:11 -04:00
Adam Palay
af522af2ca formatting 2013-07-22 17:39:11 -04:00
RobertMarks
4d880db1b5 Updated behavior for split_answer_dict, get_score, and check_student_inputs (responsetypes.py) 2013-07-18 10:18:53 -07:00
RobertMarks
46ae2f9c26 Added support for a new problem type: ChoicetextResponse 2013-07-18 10:12:56 -07:00
Julian Arni
fd6abc88e2 Incorporate review comments 2013-07-08 14:32:02 -04:00
Julian Arni
7fbd1a7221 Merge branch 'master' into HEAD 2013-07-02 14:27:05 -04:00
Julian Arni
386029bee3 Adding jasmine tests; code cleanup. 2013-07-01 10:18:38 -04:00
Ned Batchelder
6e5c861018 Merge pull request #272 from edx/fix/LMS-500 
Fix LMS-500: Random class in random module was None
 2013-06-26 07:49:54 -07:00
Ned Batchelder
ed62c5a6f9 Fix LMS-500: Random class in random module was None 
Deleting the module object isn't needed to replace it, and deleting
a module object causes all of its attributes to be set to None.
 2013-06-25 14:23:16 -04:00
Carlos Andrés Rocha
e4ee1c6c9b Rename arguments of modx_dispatch and handle_ajax related functions 
Refactor a bit modx_dispatch
 2013-06-25 13:38:57 -04:00
Julian Arni
bc25defd10 Merge branch 'master' into feature/jkarni/jsinput 
Conflicts:
	doc/public/index.rst
 2013-06-24 10:46:19 -04:00
Ned Batchelder
3eec09b87a Merge pull request #216 from edx/ned/remove-unused-imports 
Ned/remove unused imports
 2013-06-20 14:15:31 -07:00
Alexander Kryklia
e7f1baad62 Fixes broken imports in checker.py 2013-06-20 12:58:33 +03:00
Julian Arni
e08215e62a JSinput input type 2013-06-19 17:42:55 -04:00
Ned Batchelder
df6d3f9b2f Fix strings that should be raw. 2013-06-19 16:56:34 -04:00
Ned Batchelder
181b1e979b Remove unused imports from common, as reported by pylint. 2013-06-19 16:56:34 -04:00
Calen Pennington
4cc30aab00 Cleanup pep8 violations in test_correctmap.py 2013-06-19 10:04:32 -04:00
Brian Wilson
a8c3e91051 Handle failure task_output that won't fit in the model column. 2013-06-18 11:17:17 -04:00
Brian Wilson
d2b3977f57 Add dogstat logging to background tasks. 2013-06-18 11:13:55 -04:00
Brian Wilson
c676cfd64a Rename fields in CourseTaskLog, including a task_key column for indexing. Use 'rescore' instead of 'regrade'. Clean up task submission. 2013-06-18 11:13:19 -04:00
Brian Wilson
73b25e1f32 Add check for problems that (do not) support regrading. 2013-06-18 11:09:32 -04:00
Brian Wilson
91ac6e68e8 Define initial celery task on instructor dash. 
Add CourseTaskLog, and make calls to regrading.

Add regrading implementation, and hack the marshalling of request.
 2013-06-18 11:04:05 -04:00
Peter Baratta
bd1f912125 Merge branch 'master' into pbaratta/calc-add-trig 2013-06-13 16:43:27 -04:00
Ned Batchelder
413202e7d6 Merged ned/whitelistable-sandbox 2013-06-11 16:49:45 -04:00
Don Mitchell
64b909c5f0 Merge pull request #12 from edx/feature/dhm/timeconv 
Feature/dhm/timeconv
 2013-06-11 11:11:05 -07:00
Brian Talbot
47f91e79c4 adds in status for overall problem status indicator and replicates needed correctness django logic to show individual choice status 2013-06-10 16:22:20 -07:00
Brian Talbot
a377f86095 adds in aria attributes and semantic status content for vsepr input problems 2013-06-10 16:22:19 -07:00
Brian Talbot
628b741742 adds in aria attributes and semantic status content for schematic input problems 2013-06-10 16:22:19 -07:00
Brian Talbot
9552be6f19 adds in aria attributes and semantic status content for option input problems 2013-06-10 16:22:19 -07:00
Brian Talbot
2b08db57f0 adds in aria attributes and semantic status content for designprotein2d problems 2013-06-10 16:22:18 -07:00
Brian Talbot
04acd8790f adds in aria attributes and semantic status content for matlab problems 2013-06-10 16:22:18 -07:00
Brian Talbot
dba0eb78d3 adds in aria attributes and semantic status content for js-text input problems 2013-06-10 16:22:18 -07:00
Brian Talbot
d1ca8dc2bb adds in aria attributes and semantic status content for image input problems 2013-06-10 16:22:17 -07:00
Brian Talbot
cb78863984 adds in aria attributes and semantic status content for editamolecule problems 2013-06-10 16:22:17 -07:00
Brian Talbot
7ac75eae85 adds in aria attributes and semantic status content for editagene problems 2013-06-10 16:22:17 -07:00
Brian Talbot
254436aad1 adds in aria attributes and semantic status content for drag and drop problems 2013-06-10 16:22:16 -07:00
Brian Talbot
2c91f933e9 adds in aria attributes and semantic status content for crystallography problems 2013-06-10 16:22:16 -07:00
Brian Talbot
31a08bf42f adds in aria attributes and semantic status content for code input problems 2013-06-10 16:22:16 -07:00
Brian Talbot
a84dab0feb adds in aria attributes and semantic status content for choicegroup problems 2013-06-10 16:22:16 -07:00
Brian Talbot
832e05341b adds in aria attributes and semantic status content for chem eq problems 2013-06-10 16:22:15 -07:00
Brian Talbot
f4ef603d73 adds in aria attributes and semantic status content for annotation problems 2013-06-10 16:22:15 -07:00
Brian Talbot
4706b83a2b adds in aria attributes and semantic status content for textline problems 2013-06-10 16:22:15 -07:00
Don Mitchell
168cb306d3 Move tz_aware into connection config rather than settings. 
Make django use_tz
 2013-06-10 17:16:35 -04:00
Don Mitchell
d7194e6bec struct_time to datetime conversion. 2013-06-10 17:16:34 -04:00