From d80094cf413d18bb7fb16fa3b45ffd19726761cf Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Tue, 1 Nov 2022 11:26:48 +0100
Subject: [PATCH] Display rank next to path

---
 src/character/models/capabilities.py          |  5 +++-
 src/character/templates/character/path.html   | 28 ++++++++++---------
 .../templatetags/character_extras.py          |  5 ++++
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/character/models/capabilities.py b/src/character/models/capabilities.py
index 6743997..3de2b79 100644
--- a/src/character/models/capabilities.py
+++ b/src/character/models/capabilities.py
@@ -65,7 +65,7 @@ class Path(DocumentedModel, UniquelyNamedModel, TimeStampedModel, models.Model):
             return None
 
     def get_next_capability(self, character) -> Capability:
-        next_rank = character.capabilities.filter(path=self).count() + 1
+        next_rank = self.max_rank(character) + 1
         return self.capabilities.get(rank=next_rank)
 
     def has_next_capability(self, character) -> bool:
@@ -75,6 +75,9 @@ class Path(DocumentedModel, UniquelyNamedModel, TimeStampedModel, models.Model):
         except Capability.DoesNotExist:
             return False
 
+    def max_rank(self, character) -> int:
+        return character.capabilities.filter(path=self).count()
+
 
 class CapabilityManager(models.Manager):
     def get_by_natural_key(self, path, rank):
diff --git a/src/character/templates/character/path.html b/src/character/templates/character/path.html
index 1d6bc30..99cf0d2 100644
--- a/src/character/templates/character/path.html
+++ b/src/character/templates/character/path.html
@@ -1,22 +1,24 @@
 {% load character_extras %}
-<div class="col-xl-3 col-md-6">
+<div class="col col-md-6 col-xl-4">
     <div class="card">
         <h5 class="card-header">
-            {{ path.display_name }}
-            <button hx-get="{% url "character:remove_last_in_path" character_pk=character.pk path_pk=path.pk %}"
-                hx-target="#paths-and-capabilities"
-                hx-swap="outerHTML"
-                class="btn btn-sm btn-primary">
-                <i class="fa-solid fa-minus"></i>
-            </button>
-            {% if path|has_next_capability:character %}
-                <button hx-get="{% url "character:add_next_in_path" character_pk=character.pk path_pk=path.pk %}"
+            {{ path.display_name }} ({{ path|max_rank:character }})
+            <div class="btn-group btn-group-sm">
+                <button hx-get="{% url "character:remove_last_in_path" character_pk=character.pk path_pk=path.pk %}"
                     hx-target="#paths-and-capabilities"
                     hx-swap="outerHTML"
-                    class="btn btn-sm btn-primary">
-                    <i class="fa-solid fa-plus"></i>
+                    class="btn btn-primary">
+                    <i class="fa-solid fa-minus"></i>
                 </button>
-            {% endif %}
+                {% if path|has_next_capability:character %}
+                    <button hx-get="{% url "character:add_next_in_path" character_pk=character.pk path_pk=path.pk %}"
+                        hx-target="#paths-and-capabilities"
+                        hx-swap="outerHTML"
+                        class="btn btn-primary">
+                        <i class="fa-solid fa-plus"></i>
+                    </button>
+                {% endif %}
+            </div>
         </h5>
         {% if path.notes %}
             <div class="card-body text-bg-light">{{ path.notes }}</div>
diff --git a/src/character/templatetags/character_extras.py b/src/character/templatetags/character_extras.py
index 44b5dfb..d3915d6 100644
--- a/src/character/templatetags/character_extras.py
+++ b/src/character/templatetags/character_extras.py
@@ -32,3 +32,8 @@ def weapon_modifier(character: Character, weapon: Weapon):
 @register.filter
 def has_next_capability(path: Path, character: Character) -> bool:
     return path.has_next_capability(character)
+
+
+@register.filter
+def max_rank(path: Path, character: Character) -> int:
+    return path.max_rank(character)