From b1f60133704bfad26f22898b32cb2fbffca51f4b Mon Sep 17 00:00:00 2001
From: ZaneYork <zaneyork@qq.com>
Date: Wed, 11 Sep 2024 15:51:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=B1=95=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=98=BE=E7=A4=BA=E5=BD=93=E5=89=8D=E6=AF=94?=
 =?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/dinner.py         |  2 ++
 templates/dinner.html | 31 +++++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/dinner.py b/src/dinner.py
index 6f072e9..bb66bba 100644
--- a/src/dinner.py
+++ b/src/dinner.py
@@ -156,10 +156,12 @@ def dinner():
     result = fetch_roll_result()
     can_roll = (check_roll() == 1)
     all_choice = list(map(lambda x: {'name': x[0], 'label': x[1]}, fetch_all_menu()))
+    summary_keys = list(filter(lambda x: x in summary.keys(), map(lambda y: y['name'], all_choice)))
     return render_template('dinner.html',
                            all_choice=all_choice,
                            menu=menu,
                            summary=summary,
+                           summary_keys=summary_keys,
                            total_vote=total_vote,
                            result=result,
                            can_roll=can_roll,
diff --git a/templates/dinner.html b/templates/dinner.html
index 840b216..c2e4222 100644
--- a/templates/dinner.html
+++ b/templates/dinner.html
@@ -18,11 +18,14 @@
             </div>
             {% for choice in all_choice %}
                 <div class="input-group">
-                    <label for="range{{ loop.index }}" class="form-label">{{ choice['label'] }}
-                        - {{ '{:.2f}'.format((menu.get(choice['name']) or 0) * 100) }}%</label>
-                    <input type="range" class="form-range" id="range{{ loop.index }}" name="{{ choice['name'] }}"
-                           min="0"
-                           max="10" step="1" value="{{ (menu.get(choice['name']) or 0) * 10 }}">
+                    <label for="range{{ loop.index }}" class="form-label">
+                        <span>{{ choice['label'] }}</span> - <span
+                            class="percentage">{{ '{:.2f}'.format((menu.get(choice['name']) or 0) * 100) }}</span>%
+                    </label>
+                    <input type="range" class="form-range"
+                           id="range{{ loop.index }}" name="{{ choice['name'] }}"
+                           min="0" max="10" step="1"
+                           value="{{ (menu.get(choice['name']) or 0) * 10 }}">
                 </div>
             {% endfor %}
         </div>
@@ -36,7 +39,7 @@
     <div style="padding-top: 40px">
         <label>大家的选择 - 总票数:{{ '{:.2f}'.format(total_vote | round(2)) }}</label>
         <ul style="padding-top: 20px; margin-bottom: 80px" class="list-group">
-            {% for key in summary|dictsort(true) %}
+            {% for key in summary_keys %}
                 <li class="list-group-item {{ "active" if result == key else "" }}">
                     <div class="row justify-content-between">
                         <span class="col-5">{{ key }}</span>
@@ -57,9 +60,21 @@
 <script src="/static/jquery.serializejson.js"></script>
 <script src="/static/bootstrap.bundle.min.js"></script>
 
+<!--suppress JSUnresolvedReference -->
 <script>
+    $("input[type=range]").change(function () {
+        const values = $("input[type=range]").map(function () {
+            return $(this).val();
+        }).get();
+        const summary = values.reduce((a, b) => parseInt(a) + parseInt(b));
+        const spans = $(".percentage")
+        for (let i = 0; i < values.length; i++) {
+            spans[i].innerHTML = (parseFloat(values[i]) * 100 / summary).toFixed(2);
+        }
+    });
+
     function update() {
-        var data = $('#inputForm').serializeJSON();
+        const data = $('#inputForm').serializeJSON();
         $.ajax({
             url: 'dinner/update?value=' + JSON.stringify(data),
             dataType: 'json',
@@ -111,7 +126,7 @@
                 17, 30, 0, 0
             );
             const diff = targetTime - now;
-            btn = $("#btnRoll");
+            const btn = $("#btnRoll");
             if (diff <= 0) {
                 window.clearInterval(counterId);
                 btn.text('开始抽签');