From 4c5d2570abc9bbf0b503174e792bc04e7a96cb81 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 26 May 2022 11:53:33 -0700
Subject: [PATCH] Save and display stopped date in readthrough

---
 bookwyrm/models/readthrough.py                       | 2 +-
 bookwyrm/templates/readthrough/readthrough_form.html | 1 +
 bookwyrm/templates/readthrough/readthrough_list.html | 2 +-
 bookwyrm/views/reading.py                            | 7 +++++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/models/readthrough.py b/bookwyrm/models/readthrough.py
index 5a13fa47..314b40a5 100644
--- a/bookwyrm/models/readthrough.py
+++ b/bookwyrm/models/readthrough.py
@@ -35,7 +35,7 @@ class ReadThrough(BookWyrmModel):
         cache.delete(f"latest_read_through-{self.user.id}-{self.book.id}")
         self.user.update_active_date()
         # an active readthrough must have an unset finish date
-        if self.finish_date:
+        if self.finish_date or self.stopped_date:
             self.is_active = False
         super().save(*args, **kwargs)
 
diff --git a/bookwyrm/templates/readthrough/readthrough_form.html b/bookwyrm/templates/readthrough/readthrough_form.html
index 1558dada..45c92043 100644
--- a/bookwyrm/templates/readthrough/readthrough_form.html
+++ b/bookwyrm/templates/readthrough/readthrough_form.html
@@ -19,6 +19,7 @@
 </label>
 {% include "snippets/progress_field.html" with id=field_id %}
 {% endif %}
+
 <div class="field">
     <label class="label" for="id_finish_date_{{ readthrough.id }}">
         {% trans "Finished reading" %}
diff --git a/bookwyrm/templates/readthrough/readthrough_list.html b/bookwyrm/templates/readthrough/readthrough_list.html
index 7a89947d..05d0df76 100644
--- a/bookwyrm/templates/readthrough/readthrough_list.html
+++ b/bookwyrm/templates/readthrough/readthrough_list.html
@@ -8,7 +8,7 @@
             <div class="column">
                 {% trans "Progress Updates:" %}
                 <ul>
-                    {% if readthrough.finish_date or readthrough.progress %}
+                    {% if readthrough.finish_date or readthrough.stopped_date or readthrough.progress %}
                     <li>
                         {% if readthrough.finish_date %}
                             {{ readthrough.finish_date | localtime | naturalday }}: {% trans "finished" %}
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index 2aa9136d..c1e6e595 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -92,6 +92,7 @@ class ReadingStatus(View):
             desired_shelf.identifier,
             start_date=request.POST.get("start_date"),
             finish_date=request.POST.get("finish_date"),
+            stopped_date=request.POST.get("stopped_date"),
         )
 
         # post about it (if you want)
@@ -160,8 +161,9 @@ class ReadThrough(View):
 
 
 @transaction.atomic
+# pylint: disable=too-many-arguments
 def update_readthrough_on_shelve(
-    user, annotated_book, status, start_date=None, finish_date=None
+    user, annotated_book, status, start_date=None, finish_date=None, stopped_date=None
 ):
     """update the current readthrough for a book when it is re-shelved"""
     # there *should* only be one of current active readthrough, but it's a list
@@ -183,8 +185,9 @@ def update_readthrough_on_shelve(
         )
     # santiize and set dates
     active_readthrough.start_date = load_date_in_user_tz_as_utc(start_date, user)
-    # if the finish date is set, the readthrough will be automatically set as inactive
+    # if the stop or finish date is set, the readthrough will be set as inactive
     active_readthrough.finish_date = load_date_in_user_tz_as_utc(finish_date, user)
+    active_readthrough.stopped_date = load_date_in_user_tz_as_utc(stopped_date, user)
 
     active_readthrough.save()