diff --git a/flask/testapp/templates/testapp/showResultENG.html b/flask/testapp/templates/testapp/showResultENG.html index 4c40a62..4d2ec2f 100644 --- a/flask/testapp/templates/testapp/showResultENG.html +++ b/flask/testapp/templates/testapp/showResultENG.html @@ -50,7 +50,7 @@

BeautyVoteResult

-

Your Score is

+

Your Score

0pt

diff --git a/flask/testapp/views.py b/flask/testapp/views.py index 64d39d7..82c50ef 100644 --- a/flask/testapp/views.py +++ b/flask/testapp/views.py @@ -7,7 +7,7 @@ user_score = {} # playerの数 -MAX_PLAYER = 50 +MAX_PLAYER = 70 WAIT_TIME = 40 @@ -106,14 +106,13 @@ choices.clear() if int(request.form.get("round")) == current_round: choices.append(request.form.get("choice")) - print(f"Received choice:{choices} Round:{current_round+1}") + print(f"Received choice:{choices}") else: return "FAILED" # 他の人が終わるまで待機 if request.form.get("checkothers"): end = time.time() - print(f"TIME: {end-start}") if len(choices) >= current_player or end - start > WAIT_TIME: start = time.time() current_player = len(choices) @@ -153,7 +152,6 @@ # 最終結果を集計 if request.form.get("checkResult"): end = time.time() - print(f"TIME: {end-start}") if end - start > WAIT_TIME: scores_order, user_number_order = calculate_order(data) order_table_array = create_order_table( @@ -207,37 +205,6 @@ return get_scores, get_labels -# 順位表の作成 otaki(同率の場合も考慮 nemoto) -# def create_order_table(scores, labels, max): -# order_table = "" -# j = 0 # 同率順位の考慮 - -# # 最高"max位"までを表示する -# if max >= current_player: -# max = current_player - -# for i in range(max): -# if i + j >= max: # 参照する配列がこれ以上ない時 -# break -# order_table += str(i + 1 + j) + "位" + " " + user[int(labels[i + j])] + " " + str(scores[i + j]) + "pt" + "\n" -# now_order = i + 1 + j # 今の順位 -# if i + j + 1 == max: # 先ほどorder_tableに挿入した配列が,最後であった時 -# break -# # 同じスコアのplayersの処理 -# while str(scores[i + j]) == str(scores[i + 1 + j]): -# j += 1 -# order_table += ( -# str(now_order) + "位" + " " + user[int(labels[i + j])] + " " + str(scores[i + j]) + "pt" + "\n" -# ) -# if i + j + 1 >= max: # (i+j)と比較する配列(i+j+1)がない時 -# break - -# if order_table.endswith("\n"): -# order_table = order_table[:-1] # 最後の改行文字を削除 -# print("FINAL" + order_table) -# return order_table - - def create_order_table(scores, labels, max): get_order_table = [] j = 0 # 同率順位の考慮