diff --git a/isucon/portal/contest/forms.py b/isucon/portal/contest/forms.py
index ee06a40..5b16ac8 100644
--- a/isucon/portal/contest/forms.py
+++ b/isucon/portal/contest/forms.py
@@ -7,8 +7,6 @@
from isucon.portal.authentication.models import Team, User
from isucon.portal.contest.models import Server
-alibaba_account_validator = RegexValidator(r'^\d{16}$', "Invalid Account ID Format")
-
def global_ip_validator(value):
try:
address = ipaddress.ip_address(value)
@@ -31,7 +29,7 @@ def private_ip_validator(value):
class TeamForm(forms.ModelForm):
class Meta:
model = Team
- fields = ("name", "participate_at", "alibaba_account", )
+ fields = ("name", "participate_at", )
participate_at = forms.DateField(
label="参加日選択",
@@ -39,7 +37,6 @@ class Meta:
widget=forms.Select(choices=Team.PARTICIPATE_AT_CHOICES),
required=True,
)
- alibaba_account = forms.CharField(required=False, validators=[alibaba_account_validator], )
def __init__(self, *args, **kwargs):
self.is_registration_available = is_registration_available()
@@ -112,7 +109,7 @@ def __init__(self, *args, **kwargs):
def clean(self):
cleaned_data = super().clean()
-
+
if Server.objects.filter(team=self.team).count() >= 3:
raise forms.ValidationError("すでに3台登録されています")
diff --git a/isucon/portal/contest/result/templates/result/dashboard.html b/isucon/portal/contest/result/templates/result/dashboard.html
index 97982cf..0d2d583 100644
--- a/isucon/portal/contest/result/templates/result/dashboard.html
+++ b/isucon/portal/contest/result/templates/result/dashboard.html
@@ -32,8 +32,8 @@
Rank |
Id |
Name |
- Latest Total transaction [ISUCOIN] |
- Best Total transaction [ISUCOIN] |
+ Latest Score |
+ Best Score |
FinishTime |
@@ -43,8 +43,8 @@
{{ forloop.counter }} |
{{ score.team.id }} |
{{ score.team }} |
- {{ score.latest_score|intcomma }} イスコイン |
- {{ score.best_score|intcomma }} イスコイン |
+ {{ score.latest_score|intcomma }} |
+ {{ score.best_score|intcomma }} |
{{ score.latest_scored_at|date:"H:i:s" }} |
{% endfor %}
diff --git a/isucon/portal/contest/templates/dashboard.html b/isucon/portal/contest/templates/dashboard.html
index 10c0cfb..2a234ba 100644
--- a/isucon/portal/contest/templates/dashboard.html
+++ b/isucon/portal/contest/templates/dashboard.html
@@ -43,8 +43,8 @@
Rank |
Id |
Name |
- Latest Total transaction [ISUCOIN] |
- Best Total transaction [ISUCOIN] |
+ Latest Score |
+ Best Score |
FinishTime |
@@ -54,8 +54,8 @@
{{ forloop.counter }} |
{{ score.team.id }} |
{{ score.team }} |
- {{ score.latest_score|intcomma }} イスコイン |
- {{ score.best_score|intcomma }} イスコイン |
+ {{ score.latest_score|intcomma }} |
+ {{ score.best_score|intcomma }} |
{{ score.latest_scored_at|date:"H:i:s" }} |
{% endfor %}
diff --git a/isucon/portal/contest/templates/includes/job_detail_part.html b/isucon/portal/contest/templates/includes/job_detail_part.html
index 7b9d0e4..93c5b24 100644
--- a/isucon/portal/contest/templates/includes/job_detail_part.html
+++ b/isucon/portal/contest/templates/includes/job_detail_part.html
@@ -22,10 +22,10 @@
{{ job.target_ip }} |
- Total transaction [ISUCOIN] |
+ Total Score |
{% if job.is_finished %}
- {{ job.score|intcomma }} イスコイン
+ {{ job.score|intcomma }}
{% endif %}
|
diff --git a/isucon/portal/contest/templates/jobs.html b/isucon/portal/contest/templates/jobs.html
index 2ef5f49..5edc194 100644
--- a/isucon/portal/contest/templates/jobs.html
+++ b/isucon/portal/contest/templates/jobs.html
@@ -34,7 +34,7 @@
Lang |
{% endif %}
JobId |
- Total transaction [ISUCOIN] |
+ Total Score |
Status |
Result |
UpdatedAt |
@@ -53,7 +53,7 @@
{{ job.id }} |
{% if job.is_finished %}
- {{ job.score|intcomma }} イスコイン
+ {{ job.score|intcomma }}
{% endif %}
|
diff --git a/isucon/portal/contest/templates/scores.html b/isucon/portal/contest/templates/scores.html
index d7a08cb..c534690 100644
--- a/isucon/portal/contest/templates/scores.html
+++ b/isucon/portal/contest/templates/scores.html
@@ -37,9 +37,9 @@
| Rank |
Id |
Name |
- Latest Total transaction [ISUCOIN] |
+ Latest Total Score |
Time |
- Best Total transaction [ISUCOIN] |
+ Best Total Score |
Time |
@@ -49,9 +49,9 @@
{{ forloop.counter }} |
{{ score.team.id }} |
{{ score.team }} |
- {{ score.latest_score|intcomma }} イスコイン |
+ {{ score.latest_score|intcomma }} |
{{ score.latest_scored_at|date:"H:i:s" }} |
- {{ score.best_score|intcomma }} イスコイン |
+ {{ score.best_score|intcomma }} |
{{ score.best_scored_at|date:"H:i:s" }} |
{% endfor %}
@@ -60,9 +60,9 @@
- |
{{ score.team.id }} |
{{ score.team }} |
- {{ score.latest_score|intcomma }} イスコイン |
+ {{ score.latest_score|intcomma }} |
{{ score.latest_scored_at|date:"H:i:s" }} |
- {{ score.best_score|intcomma }} イスコイン |
+ {{ score.best_score|intcomma }} |
{{ score.best_scored_at|date:"H:i:s" }} |
{% endfor %}
@@ -87,4 +87,4 @@
}
{% endif %}
-{% endblock script %}
\ No newline at end of file
+{% endblock script %}
diff --git a/isucon/portal/contest/templates/team_settings.html b/isucon/portal/contest/templates/team_settings.html
index 58931a6..af5f7dd 100644
--- a/isucon/portal/contest/templates/team_settings.html
+++ b/isucon/portal/contest/templates/team_settings.html
@@ -113,26 +113,6 @@ Information
{% endif %}
- {% if is_registration_available and not is_now_on_contest %}
- {{ form.alibaba_account.as_hidden }}
- {% else %}
-
-
-
-
-
-
-
- {{ form.alibaba_account|add_class:"input" }}
-
- {% if form.alibaba_account.errors %}
-
{{ form.alibaba_account.errors.0 }}
- {% endif %}
-
-
-
-
- {% endif %}
diff --git a/isucon/portal/templates/include/layout.html b/isucon/portal/templates/include/layout.html
index d85d535..f0d7784 100644
--- a/isucon/portal/templates/include/layout.html
+++ b/isucon/portal/templates/include/layout.html
@@ -72,15 +72,6 @@
{% endfor %}
-
- {% if user.team and not user.team.alibaba_account and not is_registration_available %}
-
-
- Alibaba CloudのAccount IDが設定されていません。
Team Settingsから設定してください。
-
-
- {% endif %}
-
{% if user.team and is_now_on_contest and servers.count == 0 %}