add external rating into player profile

MahjongRepository · Dec 29, 2024 · 10b13bd · 10b13bd
1 parent 9933f0f
commit 10b13bd
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/server/player/views.py b/server/player/views.py
@@ -9,7 +9,7 @@
 from player.mahjong_soul.models import MSAccount
 from player.models import Player
 from player.tenhou.models import TenhouAggregatedStatistics, TenhouNickname
-from rating.models import Rating, RatingDelta, RatingResult, TournamentCoefficients
+from rating.models import ExternalRating, ExternalRatingDelta, Rating, RatingDelta, RatingResult, TournamentCoefficients
 from rating.utils import get_latest_rating_date, parse_rating_date
 from tournament.models import TournamentResult
 
@@ -41,6 +41,21 @@ def player_details(request, slug, year=None, month=None, day=None):
         if result:
             rating_results.append(result)
 
+    external_ratings = ExternalRating.objects.filter(is_hidden=False).all().order_by("order")
+    external_rating_results = []
+    _, external_entered_date, _ = parse_rating_date(year, month, day)
+    for external_rating in external_ratings:
+        if not external_entered_date:
+            _, external_rating_date = get_latest_rating_date(external_rating, is_external=True)
+        else:
+            external_rating_date = external_entered_date
+
+        external_result = ExternalRatingDelta.objects.filter(
+            date=external_rating_date, rating=external_rating, player=player
+        ).first()
+        if external_result:
+            external_rating_results.append(external_result)
+
     tournament_results = (
         TournamentResult.objects.filter(player=player).prefetch_related("tournament").order_by("-tournament__end_date")
     )[:10]
@@ -57,9 +72,11 @@ def player_details(request, slug, year=None, month=None, day=None):
         {
             "player": player,
             "rating_results": rating_results,
+            "external_rating_results": external_rating_results,
             "tournament_results": tournament_results,
             "tenhou_data": tenhou_data,
             "rating_date": entered_date,
+            "external_rating_date": external_entered_date,
             "ms_data": ms_data,
             "club_ratings": club_ratings,
         },

diff --git a/server/templates/player/details.html b/server/templates/player/details.html
@@ -15,7 +15,7 @@
 
         {% include 'player/_player_header.html' %}
 
-        {% if rating_results %}
+        {% if rating_results or external_rating_results %}
             <h4>{% trans 'Ratings' %}</h4>
             <p>{% trans 'Table with all ratings where a player was counted' %}</p>
 
@@ -50,6 +50,19 @@ <h4>{% trans 'Ratings' %}</h4>
                             </td>
                         </tr>
                     {% endfor %}
+                    {% for external_rating_result in external_rating_results %}
+                        <tr>
+                            <td width="250px">
+                                {{ external_rating_result.rating.name|slice:":-14" }}
+                            </td>
+                            <td>
+                                {{ external_rating_result.place }}
+                            </td>
+                            <td>
+                                {{ external_rating_result.base_rank }}
+                            </td>
+                        </tr>
+                    {% endfor %}
                     </tbody>
                 </table>
             </div>