medic hits count for something and banners

assets/css/app.css

@@ -651,4 +651,12 @@ dropdown menu
 
 a {
   color: #2fa4e7;
+}
+
+.banner {
+    background-color: #4da6ff;
+    color: #fff;
+    padding: 0.01rem;
+    text-align: center;
+    font-size: 0.5rem;
 }

assets/html/admin/index.html

@@ -3,6 +3,30 @@
 
 
 {% block html_head %}
+<style>
+    #banner_text {
+        width: 400px;
+        background: #262626;
+        border: 1px solid #999;
+        border-radius: 4px;
+        color: #fff;
+        height: 4em;
+        font-size: 1em;
+        padding: 0.5em;
+    }
+
+    #banner_type {
+        width: 200px;
+        background: #262626;
+        border: 1px solid #999;
+        border-radius: 4px;
+        color: #fff;
+        height: 4em;
+        font-size: 1em;
+        padding: 0.5em;
+    }
+</style>
+
 <script>
     function getCookie() {
         let cookieValue = null;
@@ -65,16 +89,46 @@
         });
     }
 
+    function set_banner() {
+        let text = document.getElementById("banner_text").value;
+        let type = document.getElementById("banner_type").value;
+
+        fetch("/admin/set_banner", {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                "X-CSRFToken": getCookie("csrftoken")
+            },
+            body: JSON.stringify({
+                "text": text,
+                "type": type
+            })
+        });
+    }
+
 </script>
 {% endblock %}
 
 {% block content %}
 
 <h1 style="text-align: center;">Dashboard</h1>
 
-<button onclick="recalculate_ratings()" class="button">Recalculate Ratings</button>
-<button onclick="recalculate_sm5_ratings()" class="button">Recalculate SM5 Ratings</button>
-<button onclick="recalculate_laserball_ratings()" class="button">Recalculate Laserball Ratings</button>
-<button onclick="flush_cache()" class="button">Flush Cache</button>
+<div style="display: flex; flex-direction: row; gap: 10px;">
+    <button onclick="recalculate_ratings()" class="button">Recalculate Ratings</button>
+    <button onclick="recalculate_sm5_ratings()" class="button">Recalculate SM5 Ratings</button>
+    <button onclick="recalculate_laserball_ratings()" class="button">Recalculate Laserball Ratings</button>
+    <button onclick="flush_cache()" class="button">Flush Cache</button>
+</div>
+
+<!-- Banner -->
+
+<div style="display: flex; flex-direction: row; gap: 10px; margin-top: 5rem;">
+    <input type="text" id="banner_text" placeholder="Banner Text" id="banner_text">
+    <select id="banner_type" id="banner_type">
+        <option value="info">Info</option>
+        <option value="warning">Warning</option>
+        <option value="danger">Danger</option>
+    </select>
+    <button onclick="set_banner()" class="button">Set Banner</button>
 
 {% endblock %}

assets/html/base.html

@@ -283,6 +283,14 @@
         href="/logout">Logout</a></li>
     {% endif %}
 </ul>
+
+<!--banner that can be chnaged in ctx.banner-->
+{% if app.ctx.banner.text %}
+<div class="banner" style="background-color: {{ app.ctx.banner_type_to_color(app.ctx.banner.type)}};">
+    <h1>{{ app.ctx.banner.text }}</h1>
+</div>
+{% endif %}
+
 <div id="content">
     {% block content %}{% endblock %}
 </div>

handlers/admin/index.py

@@ -20,23 +20,29 @@ async def admin_index(request: Request) -> str:
 @app.post("/admin/recalculate_ratings")
 @admin_only
 async def admin_recalculate_ratings(request: Request) -> str:
+    request.app.ctx.banner["text"] = "Rating recalculation in progress, stats may be inaccurate"
     asyncio.create_task(recalculate_ratings(), name="Recalculate Ratings")
+    request.app.ctx.banner["text"] = None
 
     return response.json({"status": "ok"})
 
 
 @app.post("/admin/recalculate_sm5_ratings")
 @admin_only
 async def admin_recalculate_sm5_ratings(request: Request) -> str:
+    request.app.ctx.banner["text"] = "Rating recalculation in progress, stats may be inaccurate"
     asyncio.create_task(recalculate_sm5_ratings(), name="Recalculate SM5 Ratings")
+    request.app.ctx.banner["text"] = None
 
     return response.json({"status": "ok"})
 
 
 @app.post("/admin/recalculate_laserball_ratings")
 @admin_only
 async def admin_recalculate_lb_ratings(request: Request) -> str:
+    request.app.ctx.banner["text"] = "Rating recalculation in progress, stats may be inaccurate"
     asyncio.create_task(recalculate_laserball_ratings(), name="Recalculate Laserball Ratings")
+    request.app.ctx.banner["text"] = None
 
     return response.json({"status": "ok"})
 
@@ -49,3 +55,11 @@ async def admin_flush_cache(request: Request) -> str:
     logger.info("Cache flushed")
 
     return response.json({"status": "ok"})
+
+@app.post("/admin/set_banner")
+@admin_only
+async def admin_set_banner(request: Request) -> str:
+    request.app.ctx.banner["text"] = request.json.get("text") or None
+    request.app.ctx.banner["type"] = request.json.get("type") or None
+
+    return response.json({"status": "ok"})

helpers/ratinghelper.py

@@ -11,7 +11,7 @@
 from db.laserball import LaserballGame
 from db.player import Player
 from db.sm5 import SM5Game
-from db.types import EventType, GameType, Team
+from db.types import EventType, GameType, Team, IntRole
 from helpers import userhelper
 
 # CONSTANTS
@@ -118,10 +118,15 @@ async def update_sm5_ratings(game: SM5Game) -> bool:
                 target_elo = Rating(target_player.sm5_mu, target_player.sm5_sigma)
                 out = model.rate([[shooter_elo], [target_elo]], ranks=[0, 1])
 
-                shooter_player.sm5_mu += (out[0][0].mu - shooter_player.sm5_mu) * 0.1
+                weight_mu = 0.1 # default for damage and downed events
+                if target.role == IntRole.MEDIC:
+                    weight_mu = 0.2 # medic events are weighted more heavily
+
+
+                shooter_player.sm5_mu += (out[0][0].mu - shooter_player.sm5_mu) * weight_mu
                 shooter_player.sm5_sigma += (out[0][0].sigma - shooter_player.sm5_sigma) * 0.1
 
-                target_player.sm5_mu += (out[1][0].mu - target_player.sm5_mu) * 0.1
+                target_player.sm5_mu += (out[1][0].mu - target_player.sm5_mu) * weight_mu
                 target_player.sm5_sigma += (out[1][0].sigma - target_player.sm5_sigma) * 0.1
 
                 await shooter_player.save()
@@ -137,10 +142,10 @@ async def update_sm5_ratings(game: SM5Game) -> bool:
 
                 out = model.rate([[shooter_elo], [target_elo]], ranks=[0, 1])
 
-                shooter_player.sm5_mu += (out[0][0].mu - shooter_player.sm5_mu) * 0.15
+                shooter_player.sm5_mu += (out[0][0].mu - shooter_player.sm5_mu) * 0.25
                 shooter_player.sm5_sigma += (out[0][0].sigma - shooter_player.sm5_sigma) * 0.1
 
-                target_player.sm5_mu += (out[1][0].mu - target_player.sm5_mu) * 0.15
+                target_player.sm5_mu += (out[1][0].mu - target_player.sm5_mu) * 0.25
                 target_player.sm5_sigma += (out[1][0].sigma - target_player.sm5_sigma) * 0.1
 
                 await shooter_player.save()

utils.py

@@ -60,3 +60,10 @@ async def wrapper(request: Request, *args, **kwargs) -> Union[response.HTTPRespo
 
 def is_admin(request: Request) -> bool:
     return request.ctx.session.get("permissions", 0) == Permission.ADMIN
+
+def banner_type_to_color(type: str) -> str:
+    return {
+        "info": "#4da6ff",
+        "warning": "#cfa602",
+        "danger": "#ff4d4d",
+    }.get(type, "#4da6ff")

web.py

@@ -44,6 +44,7 @@
 from tortoise import Tortoise
 from config import config
 from helpers import cachehelper
+import utils
 
 TORTOISE_ORM = {
     "connections": {
@@ -79,6 +80,8 @@ async def setup_app(app, loop) -> None:
     Start the server in a production environment.
     """
     app.ctx.sql = await MySQLPool.connect_with_config()
+    app.ctx.banner = {"text": None, "type": None}
+    app.ctx.banner_type_to_color = utils.banner_type_to_color
 
     await Tortoise.init(
         config=TORTOISE_ORM
@@ -93,6 +96,8 @@ async def main() -> None:
     Start the server in a development/nonprod environment.
     """
     app.ctx.sql = await MySQLPool.connect_with_config()
+    app.ctx.banner = {"text": "Rating recalculation in progress, stats may be inaccurate", "type": None}
+    app.ctx.banner_type_to_color = utils.banner_type_to_color
 
     await Tortoise.init(
         config=TORTOISE_ORM