From 3db0de3dd46c1d8291efb2d480b1edf414bdd731 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 22 Jan 2021 09:19:02 -0800
Subject: [PATCH] Makes pages/percents toggle-able in sidebar

---
 .../migrations/0040_auto_20210122_0057.py     | 36 +++++++++++++++++++
 .../templates/snippets/progress_update.html   | 26 +++++++-------
 2 files changed, 49 insertions(+), 13 deletions(-)
 create mode 100644 bookwyrm/migrations/0040_auto_20210122_0057.py

diff --git a/bookwyrm/migrations/0040_auto_20210122_0057.py b/bookwyrm/migrations/0040_auto_20210122_0057.py
new file mode 100644
index 00000000..8e528a89
--- /dev/null
+++ b/bookwyrm/migrations/0040_auto_20210122_0057.py
@@ -0,0 +1,36 @@
+# Generated by Django 3.0.7 on 2021-01-22 00:57
+
+import bookwyrm.models.fields
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0039_merge_20210120_0753'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='progressupdate',
+            name='progress',
+            field=models.IntegerField(validators=[django.core.validators.MinValueValidator(0)]),
+        ),
+        migrations.AlterField(
+            model_name='progressupdate',
+            name='readthrough',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bookwyrm.ReadThrough'),
+        ),
+        migrations.AlterField(
+            model_name='progressupdate',
+            name='remote_id',
+            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+        ),
+        migrations.AlterField(
+            model_name='readthrough',
+            name='progress',
+            field=models.IntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0)]),
+        ),
+    ]
diff --git a/bookwyrm/templates/snippets/progress_update.html b/bookwyrm/templates/snippets/progress_update.html
index a2b23404..dbe5cb75 100644
--- a/bookwyrm/templates/snippets/progress_update.html
+++ b/bookwyrm/templates/snippets/progress_update.html
@@ -1,27 +1,27 @@
 <form class="field is-grouped is-small" action="/edit-readthrough" method="POST">
     {% csrf_token %}
     <input type="hidden" name="id" value="{{ readthrough.id }}"/>
-    <label class="label is-align-self-center mb-0 pr-2" for="progress">Currently at</label>
-    <div class="control">
-        <div class="field has-addons">
+    <div class="field">
+        <label class="label is-align-self-center mb-0 pr-2" for="progress">Progress:</label>
+        <div class="field has-addons mb-0">
             <div class="control">
                 <input
                  aria-label="{% if readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}"
                  class="input is-small" type="number"
                  name="progress" size="3" value="{{ readthrough.progress|default:'' }}">
             </div>
+            <div class="control select is-small">
+                <select name="progress_mode" aria-label="Progress mode">
+                    <option value="PG" {% if readthrough.progress_mode == 'PG' %}selected{% endif %}>pages</option>
+                    <option value="PCT" {% if readthrough.progress_mode == 'PCT' %}selected{% endif %}>percent</option>
+                </select>
+            </div>
             <div class="control">
-                <a class="button is-small is-static">
-                    {% if readthrough.progress_mode == 'PG' %}
-                    pages
-                    {% else %}
-                    %
-                    {% endif %}
-                </a>
+                <button class="button is-small px-2 is-primary" type="submit">Save</button>
             </div>
         </div>
-    </div>
-    <div class="control">
-        <button class="button is-small px-2" type="submit">Save</button>
+        {% if readthrough.progress_mode == 'PG' and book.pages %}
+        <p class="help">of {{ book.pages }} pages</p>
+        {% endif %}
     </div>
 </form>