Merge pull request #354 from cincodenada/progress_update

Keep track of progress through books over time

bookwyrm/views/__init__.py

@@ -15,7 +15,7 @@ from .landing import About, Home, Feed, Discover
 from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough, delete_readthrough
-from .reading import start_reading, finish_reading
+from .reading import start_reading, finish_reading, delete_progressupdate
 from .password import PasswordResetRequest, PasswordReset, ChangePassword
 from .tag import Tag, AddTag, RemoveTag
 from .search import Search

bookwyrm/views/books.py

@@ -72,6 +72,10 @@ class Book(View):
                 book=book,
             ).order_by('start_date')
 
+            for readthrough in readthroughs:
+                readthrough.progress_updates = \
+                    readthrough.progressupdate_set.all().order_by('-updated_date')
+
             user_shelves = models.ShelfBook.objects.filter(
                 added_by=request.user, book=book
             )
@@ -94,6 +98,7 @@ class Book(View):
             'user_shelves': user_shelves,
             'other_edition_shelves': other_edition_shelves,
             'readthroughs': readthroughs,
+            'show_progress': ('showprogress' in request.GET),
             'path': '/book/%s' % book_id,
         }
         return TemplateResponse(request, 'book.html', data)

bookwyrm/views/reading.py

@@ -30,6 +30,9 @@ def start_reading(request, book_id):
     if readthrough:
         readthrough.save()
 
+    # create a progress update if we have a page
+    readthrough.create_update()
+
     # shelve the book
     if request.POST.get('reshelve', True):
         try:
@@ -104,6 +107,10 @@ def edit_readthrough(request):
         return HttpResponseBadRequest()
     readthrough.save()
 
+    # record the progress update individually
+    # use default now for date field
+    readthrough.create_update()
+
     return redirect(request.headers.get('Referer', '/'))
 
 
@@ -166,7 +173,36 @@ def update_readthrough(request, book=None, create=True):
         except ParserError:
             pass
 
+    progress = request.POST.get('progress')
+    if progress:
+        try:
+            progress = int(progress)
+            readthrough.progress = progress
+        except ValueError:
+            pass
+
+    progress_mode = request.POST.get('progress_mode')
+    if progress_mode:
+        try:
+            progress_mode = models.ProgressMode(progress_mode)
+            readthrough.progress_mode = progress_mode
+        except ValueError:
+            pass
+
     if not readthrough.start_date and not readthrough.finish_date:
         return None
 
     return readthrough
+
+@login_required
+@require_POST
+def delete_progressupdate(request):
+    ''' remove a progress update '''
+    update = get_object_or_404(models.ProgressUpdate, id=request.POST.get('id'))
+
+    # don't let people edit other people's data
+    if request.user != update.user:
+        return HttpResponseBadRequest()
+
+    update.delete()
+    return redirect(request.headers.get('Referer', '/'))