issue39 stat tonpu hanchan for four

Author: enOnesohC

server/locale/ru/LC_MESSAGES/django.mo

@@ -1288,35 +1288,35 @@ msgstr "За всё время"
 
 #: templates/player/tenhou.html:422
 msgid "四般東 (Ippan Tonpuusen)"
-msgstr "Кю-лобби тонпусены"
+msgstr "四般東 (Кю-лобби тонпусены)"
 
 #: templates/player/tenhou.html:453
 msgid "四般南 (Ippan Hanchan)"
-msgstr "Кю-лобби ханчаны"
+msgstr "四般南 (Кю-лобби ханчаны)"
 
 #: templates/player/tenhou.html:484
 msgid "四上東 (Joukyuu Tonpuusen)"
-msgstr "Перводан тонпусены"
+msgstr "四上東 (Перводан тонпусены)"
 
 #: templates/player/tenhou.html:515
 msgid "四上南 (Joukyuu Hanchan)"
-msgstr "Перводан ханчаны"
+msgstr "四上南 (Перводан ханчаны)"
 
 #: templates/player/tenhou.html:546
 msgid "四特東 (Tokujou Tonpuusen)"
-msgstr "Втородан тонпусены"
+msgstr "四特東 (Втородан тонпусены)"
 
 #: templates/player/tenhou.html:577
 msgid "四特南 (Tokujou Hanchan)"
-msgstr "Втородан ханчаны"
+msgstr "四特南 (Втородан ханчаны)"
 
 #: templates/player/tenhou.html:608
 msgid "四鳳東 (Houou Ton)"
-msgstr "Феникс тонпусены"
+msgstr "四鳳東 (Феникс тонпусены)"
 
 #: templates/player/tenhou.html:639
 msgid "四鳳南 (Houou Hanchan)"
-msgstr "Феникс ханчаны"
+msgstr "四鳳南 (Феникс ханчаны)"
 
 #: templates/rating/_external_results_table.html:17
 msgid "at least 20 games"

server/locale/ru/LC_MESSAGES/django.po

@@ -55,92 +55,6 @@ def all_time_stat(self):
     def all_time_stat_four(self):
         return self.game_logs.filter(game_players=TenhouGameLog.FOUR_PLAYERS).order_by("game_date")
 
-    def all_time_stat_ton_Ippan(self):
-        return self.game_logs.filter(game_players=TenhouGameLog.FOUR_PLAYERS, game_rules__startswith="四般東").order_by("game_date")
-
-    def all_time_stat_nan_Ippan(self):
-        return self.game_logs.filter(game_players=TenhouGameLog.FOUR_PLAYERS, game_rules__startswith="四般南").order_by("game_date")
-
-    def all_time_stat_ton_Joukyuu(self):
-        return self.game_logs.filter(game_players=TenhouGameLog.FOUR_PLAYERS, game_rules__startswith="四上東").order_by("game_date")
-
-    def all_time_stat_nan_Joukyuu(self):
-        return self.game_logs.filter(game_players=TenhouGameLog.FOUR_PLAYERS, game_rules__startswith="四上南").order_by("game_date")
-
-    def all_time_stat_ton_Tokujou(self):
-        return self.game_logs.filter(game_players=TenhouGameLog.FOUR_PLAYERS, game_rules__startswith="四特東").order_by("game_date")
-
-    def all_time_stat_nan_Tokujou(self):
-        return self.game_logs.filter(game_players=TenhouGameLog.FOUR_PLAYERS, game_rules__startswith="四特南").order_by("game_date")
-
-    def all_time_stat_ton_Houou(self):
-        return self.game_logs.filter(game_players=TenhouGameLog.FOUR_PLAYERS, game_rules__startswith="四鳳東").order_by("game_date")
-
-    def all_time_stat_nan_Houou(self):
-        return self.game_logs.filter(game_players=TenhouGameLog.FOUR_PLAYERS, game_rules__startswith="四鳳南").order_by("game_date")
-
-    def calculate_statistics(self, queryset):
-        if not queryset.exists():
-            return None
-
-        stats = queryset.aggregate(
-            total_games=Count('id'),
-            average_place=Avg('place'),
-            first_place=100.0 * Avg(
-                Case(
-                    When(place=1, then=1),
-                    default=0,
-                    output_field=FloatField()
-                )
-            ),
-            second_place=100.0 * Avg(
-                Case(
-                    When(place=2, then=1),
-                    default=0,
-                    output_field=FloatField()
-                )
-            ),
-            third_place=100.0 * Avg(
-                Case(
-                    When(place=3, then=1),
-                    default=0,
-                    output_field=FloatField()
-                )
-            ),
-            fourth_place=100.0 * Avg(
-                Case(
-                    When(place=4, then=1),
-                    default=0,
-                    output_field=FloatField()
-                )
-            )
-        )
-        return stats
-
-    def get_Ippan_ton_stats(self):
-        return self.calculate_statistics(self.all_time_stat_ton_Ippan())
-
-    def get_Ippan_nan_stats(self):
-        return self.calculate_statistics(self.all_time_stat_nan_Ippan())
-
-    def get_Joukyuu_ton_stats(self):
-        return self.calculate_statistics(self.all_time_stat_ton_Joukyuu())
-
-    def get_Joukyuu_nan_stats(self):
-        return self.calculate_statistics(self.all_time_stat_nan_Joukyuu())
-
-    def get_Tokujou_ton_stats(self):
-        return self.calculate_statistics(self.all_time_stat_ton_Tokujou())
-
-    def get_Tokujou_nan_stats(self):
-        return self.calculate_statistics(self.all_time_stat_nan_Tokujou())
-
-    def get_Houou_ton_stats(self):
-        return self.calculate_statistics(self.all_time_stat_ton_Houou())
-
-    def get_Houou_nan_stats(self):
-        return self.calculate_statistics(self.all_time_stat_nan_Houou())
-
     def current_month_stat(self):
         return self.statistics.filter(stat_type=TenhouStatistics.CURRENT_MONTH)
 

server/player/tenhou/models.py

@@ -4,7 +4,7 @@
 
 from django.db.models import F
 from django.shortcuts import get_object_or_404, redirect, render
-
+from django.db.models import Avg, Count, Case, When, FloatField
 from club.club_games.models import ClubRating
 from player.mahjong_soul.models import MSAccount
 from player.models import Player
@@ -202,6 +202,44 @@ def _get_rating_changes(rating, player, today):
 
     return filtered_results
 
+def calculate_statistics(queryset):
+    if not queryset.exists():
+        return None
+
+    stats = queryset.aggregate(
+        total_games=Count('id'),
+        average_place=Avg('place'),
+        first_place=100.0 * Avg(
+            Case(
+                When(place=1, then=1),
+                default=0,
+                output_field=FloatField()
+            )
+        ),
+        second_place=100.0 * Avg(
+            Case(
+                When(place=2, then=1),
+                default=0,
+                output_field=FloatField()
+            )
+        ),
+        third_place=100.0 * Avg(
+            Case(
+                When(place=3, then=1),
+                default=0,
+                output_field=FloatField()
+            )
+        ),
+        fourth_place=100.0 * Avg(
+            Case(
+                When(place=4, then=1),
+                default=0,
+                output_field=FloatField()
+            )
+        )
+    )
+    return stats
+
 
 def player_tenhou_details(request, slug):
     player = get_object_or_404(Player, slug=slug)
@@ -212,6 +250,30 @@ def player_tenhou_details(request, slug):
     )
     tenhou_data_all_time_stat_four = tenhou_data[0].all_time_stat_four() if tenhou_data else []
 
+    ippan_ton = calculate_statistics(tenhou_data_all_time_stat_four
+                                     .filter(game_rules__startswith="四般東"))
+
+    ippan_nan = calculate_statistics(tenhou_data_all_time_stat_four
+                                     .filter(game_rules__startswith="四般南"))
+
+    joukyuu_ton = calculate_statistics(tenhou_data_all_time_stat_four
+                                       .filter(game_rules__startswith="四上東"))
+
+    joukyuu_nan = calculate_statistics(tenhou_data_all_time_stat_four
+                                       .filter(game_rules__startswith="四上南"))
+
+    tokujou_ton = calculate_statistics(tenhou_data_all_time_stat_four
+                                       .filter(game_rules__startswith="四特東"))
+
+    tokujou_nan = calculate_statistics(tenhou_data_all_time_stat_four
+                                       .filter(game_rules__startswith="四特南"))
+
+    houou_ton = calculate_statistics(tenhou_data_all_time_stat_four
+                                     .filter(game_rules__startswith="四鳳東"))
+
+    houou_nan = calculate_statistics(tenhou_data_all_time_stat_four
+                                     .filter(game_rules__startswith="四鳳南"))
+
     return render(
         request,
         "player/tenhou.html",
@@ -220,6 +282,14 @@ def player_tenhou_details(request, slug):
             "tenhou_data": tenhou_data,
             "tenhou_data_all_time_stat_four": tenhou_data_all_time_stat_four,
             "RANKS": TenhouAggregatedStatistics.RANKS,
+            "ippan_ton": ippan_ton,
+            "ippan_nan": ippan_nan,
+            "joukyuu_ton": joukyuu_ton,
+            "joukyuu_nan": joukyuu_nan,
+            "tokujou_ton": tokujou_ton,
+            "tokujou_nan": tokujou_nan,
+            "houou_ton": houou_ton,
+            "houou_nan": houou_nan,
         },
     )