Skip to content

E
edx-platform
Commit 76e338d8 by Arthur Barrett
Options

added template for notes view

parent 0710bbd7
Showing with 48 additions and 14 deletions
lms/djangoapps/notes/api.py
...@@ -88,9 +88,7 @@ def create(request, course_id): ...@@ -88,9 +88,7 @@ def create(request, course_id):
def read(request, course_id, note_id): def read(request, course_id, note_id):
try: try:
note = Note.objects.get(id=note_id) note = Note.objects.get(id=note_id)
except Note.DoesNotExist: except:
return [HttpResponse('', status=404), None]
except Note.MultipleObjectsReturned:
return [HttpResponse('', status=404), None] return [HttpResponse('', status=404), None]
if not note.user.id == request.user.id: if not note.user.id == request.user.id:
...@@ -101,9 +99,7 @@ def read(request, course_id, note_id): ...@@ -101,9 +99,7 @@ def read(request, course_id, note_id):
def update(request, course_id, note_id): def update(request, course_id, note_id):
try: try:
note = Note.objects.get(note_id) note = Note.objects.get(note_id)
except Note.DoesNotExist: except:
return [HttpResponse('', status=404), None]
except Note.MultipleObjectsReturned:
return [HttpResponse('', status=404), None] return [HttpResponse('', status=404), None]
if not note.user.id == request.user.id: if not note.user.id == request.user.id:
...@@ -117,14 +113,14 @@ def update(request, course_id, note_id): ...@@ -117,14 +113,14 @@ def update(request, course_id, note_id):
def delete(request, course_id, note_id): def delete(request, course_id, note_id):
try: try:
note = Note.objects.get(note_id) note = Note.objects.get(note_id)
except Note.DoesNotExist: except:
return [HttpResponse('', status=404), None]
except Note.MultipleObjectsReturned:
return [HttpResponse('', status=404), None] return [HttpResponse('', status=404), None]
if not note.user.id == request.user.id: if not note.user.id == request.user.id:
return [HttpResponse('', status=403)] return [HttpResponse('', status=403)]
note.delete()
return [HttpResponse('', status=204), None] return [HttpResponse('', status=204), None]
def search(request, course_id): def search(request, course_id):
......
lms/djangoapps/notes/models.py
...@@ -21,4 +21,5 @@ class Note(models.Model): ...@@ -21,4 +21,5 @@ class Note(models.Model):
if type(json_body) is dict: if type(json_body) is dict:
d.update(json_body) d.update(json_body)
d['id'] = self.id d['id'] = self.id
d['user_id'] = self.user.id
return d return d
\ No newline at end of file
lms/djangoapps/notes/views.py
from django.http import HttpResponse from mitxmako.shortcuts import render_to_response
from courseware.courses import get_course_with_access
from notes.models import Note from notes.models import Note
import datetime import json
import logging import logging
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
...@@ -19,6 +20,16 @@ log = logging.getLogger(__name__) ...@@ -19,6 +20,16 @@ log = logging.getLogger(__name__)
# https://github.com/okfn/annotator/wiki # https://github.com/okfn/annotator/wiki
def notes(request, course_id): def notes(request, course_id):
now = datetime.datetime.now() course = get_course_with_access(request.user, course_id, 'load')
html = "<html><body>It is now %s. Course_id: %s</body></html>" % (now, course_id)
return HttpResponse(html) notes = Note.objects.filter(user_id=request.user.id)
prettyprint = {'sort_keys':True, 'indent':2, 'separators':(',', ': ')}
json_notes = json.dumps([n.as_dict() for n in notes], **prettyprint)
context = {
'course': course,
'notes': notes,
'json_notes': json_notes
}
return render_to_response('notes.html', context)
lms/templates/notes.html 0 → 100644
<%namespace name='static' file='static_content.html'/>
<%inherit file="main.html" />
<%block name="headextra">
<%static:css group='course'/>
<%static:js group='courseware'/>
</%block>
<%block name="js_extra">
<script type="text/javascript">
</script>
</%block>
<%include file="/courseware/course_navigation.html" args="active_page='notes'" />
<section class="container">
<div class="notes-wrapper">
<h2>My Notes</h2>
<pre>${json_notes}</pre>
</div>
</section>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment