From cab9dceab71e5400a39bb99483be72099a636812 Mon Sep 17 00:00:00 2001
From: Yannik Schmidt <sheppy@atlantishq.de>
Date: Fri, 4 Jun 2021 19:08:11 +0200
Subject: [PATCH] some minor improvements

---
 server.py                               | 13 +++++++++++--
 static/balance.js                       |  4 ++--
 templates/balance_response_partial.html |  3 +++
 templates/json_builder.html             |  9 +++++----
 templates/role_submission.html          | 19 ++++++++++++++++++-
 5 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/server.py b/server.py
index 9a44c73..5b6e8fb 100755
--- a/server.py
+++ b/server.py
@@ -193,7 +193,15 @@ def balanceTool():
 
         players = []
         for k,v in flask.request.json.items():
+            for i in range(5):
+                if v[i] in positions:
+                    v[i] = 5
+                else:
+                    v[i] = int(v[i])
             players += [Player(k, v)]
+        
+        # theoretical minnimum #
+        theoMin = sum([ min(p.prio) for p in players ])
 
         permutations = itertools.permutations(players)
         
@@ -204,7 +212,7 @@ def balanceTool():
             cur = 0
             
             for i in range(len(option)):
-                cur += int(option[i].prio[i%5])
+                cur += option[i].prio[i%5]
         
             if cur < best:
                 best = cur
@@ -223,7 +231,8 @@ def balanceTool():
 
         renderContent = flask.render_template("balance_response_partial.html", d=retDict,
                                                 requests=flask.request.json,
-                                                positions=positions)
+                                                positions=positions,
+                                                quality=int(theoMin/best*100))
         return flask.Response(
                 json.dumps({ "content": renderContent }), 200, mimetype='application/json')
     else:
diff --git a/static/balance.js b/static/balance.js
index 02041f3..2b1a9a5 100644
--- a/static/balance.js
+++ b/static/balance.js
@@ -198,8 +198,8 @@ function parseMultiline(){
         }
     })
 
-    const focusEvent = new Event("focus")
-    fastPosFields.forEach(el => el.dispatchEvent(focusEvent))
+    const inputEvent = new Event("input")
+    fastPosFields.forEach(el => el.dispatchEvent(inputEvent))
     balance()
 }
 
diff --git a/templates/balance_response_partial.html b/templates/balance_response_partial.html
index c5289cf..b6713bb 100644
--- a/templates/balance_response_partial.html
+++ b/templates/balance_response_partial.html
@@ -1,3 +1,6 @@
+	<div class="my-3">
+		<h3> Suggestion: (Quality: {{ quality }}%)</h3>
+	</div>
 	{% for x in range(5) %}
 	<div class="row">
 		{% set leftP  = d["left"][positions[x]] %}
diff --git a/templates/json_builder.html b/templates/json_builder.html
index 638e159..565f593 100644
--- a/templates/json_builder.html
+++ b/templates/json_builder.html
@@ -17,13 +17,14 @@
                 </div>
             </div>
 
-	    <button type="button" class="mb-3 btn btn-secondary" onclick="balance()">Go</button>
-	    <button type="button" class="mb-3 btn btn-secondary" onclick="queryForPlayerData()">
-		    Check Submissions
-	    </button></br>
+	    <button type="button" class="mb-3 btn btn-secondary" onclick="balance()">Find Teams</button>
+	    </br>
 	    <button id="copyLink" type="button" class="mb-3 btn btn-secondary" onclick="copy()">
 		    Copy Submission Link
 	    </button>
+	    <button type="button" class="mb-3 btn btn-secondary" onclick="queryForPlayerData()">
+		    Check Submissions
+	    </button>
 	    
 	    <div class="spinner-border" id="loading" style="display: none;" role="status">
 	   	  <span class="sr-only">Loading...</span>
diff --git a/templates/role_submission.html b/templates/role_submission.html
index df90c91..65b5adf 100644
--- a/templates/role_submission.html
+++ b/templates/role_submission.html
@@ -23,7 +23,7 @@
 				
 			<!-- fast postition slection field -->
 			<input class="form-control fastpos m-3" type="text" 
-				placeholder="top > mid = bot"
+				placeholder="Fast Position Input"
 				id="fastpos-submission">
 			
 			<div class="col-sm m-3" style="min-width: 300px;">
@@ -44,6 +44,23 @@
 				{% endfor %}
                 	</div>
 			<input type="submit" value="Submit">
+
+			<div class="mt-5">
+				<h4>Priorität</h4>
+				<p>
+					1 = höchste	</br>
+					5 = niedrigste  </br>
+				</p>
+				<hr class="my-3">
+				<h4>Fast-Position</h4>
+				<p>
+				<b>Positionen können in den Kurzschreibweisen: top, mid, bot, jungle, support mit "=" und ">" angegeben werden. Zum Beispiel:</b></br></br>
+					top > mid > top = adc</br>
+					mid = top > bot</br>
+					support > jungle</br>
+					etc..</br>
+				</p>
+			</div>
 		</form>
 
         </div>