Commit Graph

41 Commits

Author SHA1 Message Date
daniel cebrian
7e2652b5a8 annotation tools
First set of fixes from the pull request

This does not include some of the testing files. The textannotation and
videoannotation test files are not ready. waiting for an answer on the
issue.

Deleted token line in api.py and added test for token generator

Added notes_spec.coffee

remove spec file

fixed minor error with the test

fixes some quality errors

fixed unit test

fixed unit test

added advanced module

Added notes_spec.coffee

remove spec file

Quality and  Testing Coverage

1. in test_textannotation.py I already check for line 75 as it states
in the diff in line 43, same with test_videoanntotation
2. Like you said, exceptions cannot be checked for
firebase_token_generator.py. The version of python that is active on
the edx server is 2.7 or higher, but the code is there for correctness.
Error checking works the same way.
3. I added a test for student/views/.py within tests and deleted the
unused secret assignment.
4. test_token_generator.py is now its own file

Added Secret Token data input

fixed token generator

Annotation Tools in Place

The purpose of this pull request is to install two major modules: (1) a
module to annotate text and (2) a module to annotate video. In either
case an instructor can declare them in advanced settings under
advanced_modules and input content (HTML in text, mp4 or YouTube videos
for video). Students will be able to highlight portions and add their
comments as well as reply to each other. There needs to be a storage
server set up per course as well as a secret token to talk with said
storage.

Changes:
1. Added test to check for the creation of a token in tests.py (along
with the rest of the tests for student/view.py)
2. Removed items in cms pertaining to annotation as this will only be
possible in the lms
3. Added more comments to firebase_token_generator.py, the test files,
students/views.py
4. Added some internationalization stuff to textannotation.html and
videoannotation.html. I need some help with doing it in javascript, but
the html is covered.

incorporated lib for traslate

fixed quality errors

fixed my notes with catch token

Text and Video Annotation Modules - First Iteration

The following code-change is the first iteration of the modules for
text and video annotation.

Installing Modules:
1. Under “Advanced Settings”, add “textannotation” and
“videoannotation” to the list of advanced_modules.
2. Add link to an external storage for annotations under
“annotation_storage_url”
3. Add the secret token for talking with said storage under
“annotation_token_secret”

Using Modules
1. When creating  new unit, you can find Text and Video annotation
modules under “Advanced” component
2. Make sure you have either Text or Video in one unit, but not both.
3. Annotations are only allowed on Live/Public version and not Studio.

Added missing templates and fixed more of the quality errors

Fixed annotator not existing issue in cmd and tried to find the get_html() from the annotation module class to the descriptor

Added a space after # in comments

Fixed issue with an empty Module and token links

Added licenses and fixed vis naming scheme and location.
2014-01-27 13:47:58 -05:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
Calen Pennington
76055aa211 Add a manage.py command that understands the extra edX options 2013-07-24 09:04:12 -04:00
Ned Batchelder
61b53713d2 Remove unused imports from lms, as detected by pylint. 2013-06-19 16:56:34 -04:00
e0d
a7b02e0029 actually needs to be 255 given unicode requirements 2013-05-20 14:40:05 -04:00
e0d
0e37564490 pep8 fixes 2013-05-20 12:01:25 -04:00
e0d
a54ecb98c6 resizing uri column 2013-05-20 11:59:56 -04:00
Arthur Barrett
e89cd7a397 fix test to check for 400 status code instead of 500. 2013-05-16 13:38:14 -04:00
Arthur Barrett
0dd8dabf13 validation errors should return 400 status code instead of 500. 2013-05-16 13:18:36 -04:00
Arthur
c8bdc1ab66 update readme 2013-05-14 12:42:26 -03:00
Arthur Barrett
149f2ff897 add readme 2013-05-14 11:26:15 -04:00
Arthur Barrett
026773b508 fix pep8 warnings and add empty message to notes tab 2013-05-13 16:54:32 -04:00
Arthur Barrett
66d3ccff17 sanitize note text and other input in the model as well as escape template output to close potential security hole 2013-05-13 13:40:19 -04:00
Arthur Barrett
f6b554b10d added initial schema migration for notes model 2013-05-13 12:26:33 -04:00
Arthur Barrett
6bb6f1c743 add comment to explain json dump logic 2013-05-13 12:05:33 -04:00
Arthur Barrett
e2e32e31d9 make user id check more idiomatic 2013-05-13 11:55:42 -04:00
Arthur Barrett
6f7f924510 replace bare except with except DoesNotExist 2013-05-13 11:51:21 -04:00
Arthur Barrett
11a48dc962 replacing lists with namedtuples to improve readability 2013-05-11 14:50:35 -04:00
Arthur Barrett
ee1ee26c49 log the course_id when notes are disabled 2013-05-11 13:57:07 -04:00
Arthur Barrett
a6ad65cb98 trying to fix pylint errors 2013-05-09 16:57:19 -04:00
Arthur Barrett
a407c84bdf add model unit tests 2013-05-09 16:34:02 -04:00
Arthur Barrett
9aed148dc1 add search test 2013-05-09 16:08:29 -04:00
Arthur Barrett
aad5096ca1 add more tests for update and delete actions 2013-05-09 15:43:34 -04:00
Arthur Barrett
2838dba199 fix pep8 violations 2013-05-09 15:12:22 -04:00
Arthur Barrett
244261f1cf added more unit tests 2013-05-09 14:31:38 -04:00
Arthur Barrett
f1f65c563e fix failing unit test in lms.envs.test env 2013-05-09 11:51:24 -04:00
Arthur Barrett
bf21211b25 adding some tests 2013-05-08 18:03:41 -04:00
Arthur Barrett
1eb05cfd4e remove unnecessary count 2013-05-08 15:07:36 -04:00
Arthur Barrett
0f70b0aa8a refactored api resource map and added total to search query 2013-05-08 14:09:29 -04:00
Arthur Barrett
894cfd1f48 update doc strings in api 2013-05-07 18:45:40 -04:00
Arthur Barrett
4070e019e4 modified the html static book to only enable annotator.js when notes are enabled for the course 2013-05-06 19:29:44 -04:00
Arthur Barrett
45cca10fb9 remove debugging from default notes view 2013-05-06 17:01:35 -04:00
Arthur Barrett
0e1b3999e8 add limit and offset params to search endpoint 2013-05-06 17:01:17 -04:00
Arthur Barrett
7784a29e61 add simple notes view 2013-03-26 14:47:12 -04:00
Arthur Barrett
63349dab9c fixed update/delete responses 2013-03-25 19:04:23 -04:00
Arthur Barrett
0f486b16e9 add creation time to output 2013-03-25 18:54:28 -04:00
Arthur Barrett
131c63b697 refactored model and api to search/filter by page uri 2013-03-25 18:47:28 -04:00
Arthur Barrett
7120998938 refactoring notes js 2013-03-21 17:18:45 -04:00
Arthur Barrett
76e338d82b added template for notes view 2013-03-21 12:33:27 -04:00
Arthur Barrett
20767d5cc7 create notes djangoapp for annotator.js 2013-03-15 12:41:52 -04:00