From 39be8cebf17a762da72624017e741d2e23ea3214 Mon Sep 17 00:00:00 2001
From: Evgeniy Alekseev <i@arcanis.me>
Date: Tue, 10 Sep 2019 01:43:24 +0300
Subject: [PATCH] even better tempaltes

---
 templates/bis.jinja2          |  7 ++++---
 templates/loot.jinja2         |  4 ++--
 templates/loot_suggest.jinja2 |  5 +++--
 templates/party.jinja2        |  4 ++--
 test/test_player.py           | 12 ++++++------
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/templates/bis.jinja2 b/templates/bis.jinja2
index cb700a0..99ed6a5 100644
--- a/templates/bis.jinja2
+++ b/templates/bis.jinja2
@@ -25,7 +25,7 @@
             <input name="is_tome" id="is_tome" title="is tome" type="checkbox"/>
             <input name="action" id="action" type="hidden" value="add"/>
             <input name="method" id="method" type="hidden" value="post"/>
-            <input name="add" id="add" type="button" value="add"/>
+            <input name="add" id="add" type="submit" value="add"/>
         </form>
         <form action="/bis" method="post">
             <select name="player" id="player" title="player">
@@ -35,7 +35,7 @@
             </select>
             <input name="bis" id="bis" placeholder="player bis link" title="bis" type="text"/>
             <input name="method" id="method" type="hidden" value="put"/>
-            <input name="add" id="add" type="button" value="add"/>
+            <input name="add" id="add" type="submit" value="add"/>
         </form>
 
         <table id="result">
@@ -57,7 +57,8 @@
                             <input name="piece" id="piece" type="hidden" value="{{ item.piece|e }}"/>
                             <input name="is_tome" id="is_tome" type="hidden" value="{{ item.is_tome|e }}"/>
                             <input name="action" id="action" type="hidden" value="remove"/>
-                            <input name="remove" id="remove" type="button" value="x"/>
+                            <input name="method" id="method" type="hidden" value="post"/>
+                            <input name="remove" id="remove" type="submit" value="x"/>
                         </form>
                     </td>
                 </tr>
diff --git a/templates/loot.jinja2 b/templates/loot.jinja2
index d5a6374..433fea8 100644
--- a/templates/loot.jinja2
+++ b/templates/loot.jinja2
@@ -24,7 +24,7 @@
             </select>
             <input name="is_tome" id="is_tome" title="is tome" type="checkbox"/>
             <input name="action" id="action" type="hidden" value="add"/>
-            <input name="add" id="add" type="button" value="add"/>
+            <input name="add" id="add" type="submit" value="add"/>
         </form>
 
         <table id="result">
@@ -46,7 +46,7 @@
                             <input name="piece" id="piece" type="hidden" value="{{ item.piece|e }}"/>
                             <input name="is_tome" id="is_tome" type="hidden" value="{{ item.is_tome|e }}"/>
                             <input name="action" id="action" type="hidden" value="remove"/>
-                            <input name="remove" id="remove" type="button" value="x"/>
+                            <input name="remove" id="remove" type="submit" value="x"/>
                         </form>
                     </td>
                 </tr>
diff --git a/templates/loot_suggest.jinja2 b/templates/loot_suggest.jinja2
index 08b846f..1a87abd 100644
--- a/templates/loot_suggest.jinja2
+++ b/templates/loot_suggest.jinja2
@@ -18,7 +18,7 @@
                 {% endfor %}
             </select>
             <input name="is_tome" id="is_tome" title="is tome" type="checkbox"/>
-            <input name="suggest" id="suggest" type="button" value="suggest"/>
+            <input name="suggest" id="suggest" type="submit" value="suggest"/>
         </form>
 
         <table id="result">
@@ -39,7 +39,8 @@
                             <input name="player" id="player" type="hidden" value="{{ player.player|e }}"/>
                             <input name="piece" id="piece" type="hidden" value="{{ item.piece|e }}"/>
                             <input name="is_tome" id="is_tome" type="hidden" value="{{ item.is_tome|e }}"/>
-                            <input name="action" id="action" type="hidden" value="remove"/>
+                            <input name="action" id="action" type="hidden" value="add"/>
+                            <input name="add" id="add" type="submit" value="add"/>
                         </form>
                     </td>
                 </tr>
diff --git a/templates/party.jinja2 b/templates/party.jinja2
index 747470d..8d52ae6 100644
--- a/templates/party.jinja2
+++ b/templates/party.jinja2
@@ -21,7 +21,7 @@
             <input name="bis" id="bis" placeholder="player bis link" title="bis" type="text"/>
             <input name="priority" id="priority" placeholder="player priority" title="priority" type="number" value="0"/>
             <input name="action" id="action" type="hidden" value="add"/>
-            <input name="add" id="add" type="button" value="add"/>
+            <input name="add" id="add" type="submit" value="add"/>
         </form>
 
         <table id="result">
@@ -46,7 +46,7 @@
                             <input name="nick" id="nick" type="hidden" value="{{ player.nick|e }}"/>
                             <input name="job" id="job" type="hidden" value="{{ player.job|e }}"/>
                             <input name="action" id="action" type="hidden" value="remove"/>
-                            <input name="remove" id="remove" type="button" value="x"/>
+                            <input name="remove" id="remove" type="submit" value="x"/>
                         </form>
                     </td>
                 </tr>
diff --git a/test/test_player.py b/test/test_player.py
index 91041c3..6348ba4 100644
--- a/test/test_player.py
+++ b/test/test_player.py
@@ -16,17 +16,17 @@ def test_loot_count(player: Player, head_with_upgrade: Piece, weapon: Piece) ->
 
 
 def test_loot_count_bis(player: Player, head_with_upgrade: Piece, weapon: Piece) -> None:
-    assert abs(player.loot_count_bis(head_with_upgrade)) == 0
-    assert abs(player.loot_count_bis(weapon)) == 0
+    assert abs(player.loot_count_total_bis(head_with_upgrade)) == 0
+    assert abs(player.loot_count_total_bis(weapon)) == 0
 
     player.bis.set_item(head_with_upgrade)
     player.loot.append(head_with_upgrade)
-    assert abs(player.loot_count_bis(head_with_upgrade)) == 1
-    assert abs(player.loot_count_bis(weapon)) == 1
+    assert abs(player.loot_count_total_bis(head_with_upgrade)) == 1
+    assert abs(player.loot_count_total_bis(weapon)) == 1
 
     player.bis.set_item(weapon)
-    assert abs(player.loot_count_bis(head_with_upgrade)) == 1
-    assert abs(player.loot_count_bis(weapon)) == 1
+    assert abs(player.loot_count_total_bis(head_with_upgrade)) == 1
+    assert abs(player.loot_count_total_bis(weapon)) == 1
 
 
 def test_loot_count_total(player: Player, head_with_upgrade: Piece, weapon: Piece) -> None: