From 9ba075559cfc5359f86431da95621b55e40fe6e7 Mon Sep 17 00:00:00 2001
From: ZaneYork <zaneyork@qq.com>
Date: Tue, 10 Sep 2024 11:31:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A1=E7=A5=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dinner.py             |  9 ++++++++-
 templates/dinner.html | 11 +++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/dinner.py b/dinner.py
index 597d978..53d006e 100644
--- a/dinner.py
+++ b/dinner.py
@@ -101,14 +101,21 @@ def dinner():
     else:
         menu = {}
     summary = fetch_menu_summary()
-    result = fetch_roll_result()
     last_result = fetch_roll_result(-1)
+    for x in summary:
+        if x == last_result:
+            summary[x] = summary[x] * 7 / 10
+    total_vote = sum(value for value in summary.values())
+    if total_vote == 0:
+        total_vote = 1
+    result = fetch_roll_result()
     can_roll = (check_roll() == 1)
     all_choice = list(map(lambda x: {'name': x[0], 'label': x[1]}, fetch_all_menu()))
     return render_template('dinner.html',
                            all_choice=all_choice,
                            menu=menu,
                            summary=summary,
+                           total_vote=total_vote,
                            result=result,
                            can_roll=can_roll,
                            last_result=last_result)
diff --git a/templates/dinner.html b/templates/dinner.html
index 27abfea..2ed0781 100644
--- a/templates/dinner.html
+++ b/templates/dinner.html
@@ -9,7 +9,7 @@
     <p>每天8:00-17:30间开放匿名投票更新，17:30以后允许发起抽签，抽签结果确定后不可更改</p>
     <p>随机抽签，按得票数决定中签概率</p>
     {% if last_result %}
-        <p>今日{{ last_result }}中签概率降低30%</p>
+        <p>今日{{ last_result }}最终得票数降低30%</p>
     {% endif %}
     <form id="inputForm" class="form-inline">
         <div class="form-group">
@@ -33,19 +33,22 @@
             onclick="roll()">开始抽签
     </button>
     <div style="padding-top: 40px">
-        <label>大家的选择</label>
+        <label>大家的选择 - 总票数:{{ '{:.2f}'.format(total_vote | round(2)) }}</label>
         <ul style="padding-top: 20px; margin-bottom: 80px" class="list-group">
             {% for key in summary %}
                 <li class="list-group-item {{ "active" if result == key else "" }}">
                     <div class="row justify-content-between">
-                        <span class="col-8">{{ key }}</span>
+                        <span class="col-5">{{ key }}</span>
                         <span class="col-3">{{ '{:.2f}'.format(summary[key] | round(2)) }}票</span>
+                        <span class="col-3">{{ '{:.2f}'.format(summary[key] / total_vote * 100 | round(2)) }}%</span>
                     </div>
                 </li>
             {% endfor %}
         </ul>
     </div>
-    <div class="fixed-bottom"><a class="link-secondary" style="text-decoration: none; font-size: 0.8rem" href="https://git.zaneyork.cn:8443/ZaneYork/dinner_vote">本项目抽签完全公开透明，源码开放欢迎随时审查</a></div>
+    <div class="fixed-bottom"><a class="link-secondary" style="text-decoration: none; font-size: 0.8rem"
+                                 href="https://git.zaneyork.cn:8443/ZaneYork/dinner_vote">本项目抽签完全公开透明，源码开放欢迎随时审查</a>
+    </div>
 </div>
 
 <script src="./static/jquery-3.2.1.min.js"></script>