add yagi keiji cup final results view

Author: unStatiK

server/templates/tournament/_tournament_registration_status.html

@@ -1,11 +1,9 @@
 {% load i18n %}
 {% with tournament.rating_link as link  %}
 
-        {% if not tournament.main_registration_status_is_hide  %}
-            <span class="badge bg-{{ tournament.registration_status_badge_class }}" title="{{ tournament.registration_status_help_text }}" data-toggle="tooltip" data-placement="bottom">
-                {{ tournament.registration_status_help_text|upper }}
-            </span>
-        {% endif %}
+        <span class="badge bg-{{ tournament.registration_status_badge_class }}" title="{{ tournament.registration_status_help_text }}" data-toggle="tooltip" data-placement="bottom">
+            {{ tournament.registration_status_help_text|upper }}
+        </span>
 
         {% if tournament.is_command  %}
             <span class="badge bg-championship" title="{% trans 'teams' %}" data-toggle="tooltip" data-placement="bottom">

server/tournament/models.py

@@ -139,14 +139,6 @@ def get_url(self):
         else:
             return reverse("tournament_details", kwargs={"slug": self.slug})
 
-    # todo: remove after Yagi Kaiji Cup tournament!
-    @property
-    def main_registration_status_is_hide(self):
-        # Yagi Kaiji Cup case
-        if self.id == 604:
-            return True
-        return False
-
     @property
     def type_badge_class(self):
         if self.is_ema():

server/yagi_keiji_cup/views.py

@@ -32,19 +32,20 @@ def cup_final_information(request):
     team_place = 1
     last_team_scores_tuple = ()
     for result in results:
+        best_team_avg_place = min(result.tenhou_player_avg_place, result.majsoul_player_avg_place)
         current_team_place = team_place
         if len(last_team_scores_tuple) > 0:
-            if last_team_scores_tuple[0] == result.team_scores:
-                current_team_place = last_team_scores_tuple[1]
+            if last_team_scores_tuple[0] == result.team_scores and last_team_scores_tuple[1] == best_team_avg_place:
+                current_team_place = last_team_scores_tuple[2]
 
         calculated_results.append(
             {
                 "result": result,
-                "team_avg_place": min(result.tenhou_player_avg_place, result.majsoul_player_avg_place),
+                "team_avg_place": best_team_avg_place,
                 "team_place": current_team_place,
             }
         )
-        last_team_scores_tuple = (result.team_scores, current_team_place)
+        last_team_scores_tuple = (result.team_scores, best_team_avg_place, current_team_place)
         team_place = team_place + 1
 
     return render(