Show semester name and school year when displaying semsester and year.

trojsten/contests/migrations/0011_competition_founded.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-06-13 21:44
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contests', '0010_round_results_final'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='competition',
+            name='founded',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Year of foundation'),
+        ),
+    ]

trojsten/contests/models.py

@@ -91,6 +91,7 @@ class Competition(models.Model):
     required_user_props = models.ManyToManyField(
         UserPropertyKey, limit_choices_to={'hidden': False}, verbose_name='Povinné vlastnosti človeka', blank=True
     )
+    founded = models.IntegerField(verbose_name=_('Year of foundation'), blank=True, null=True)
 
     @property
     def rules(self):
@@ -121,8 +122,11 @@ class Meta:
         verbose_name_plural = 'Časti'
 
     def __str__(self):
-        return '%i. (%s) časť, %i. ročník %s'\
-            % (self.number, self.name, self.year, self.competition)
+        semester_name = '(%s) ' % self.name if len(self.name) > 0 else ''
+        school_year = '(%d/%d) ' % (self.competition.founded + self.year, self.competition.founded + self.year + 1) \
+            if self.competition.founded else ''
+        return '%i. %sčasť, %i. ročník %s%s'\
+            % (self.number, semester_name, self.year, school_year, self.competition)
 
     def short_str(self):
         return '%i. (%s) časť'\
@@ -239,11 +243,9 @@ class Meta:
         verbose_name_plural = 'Kolá'
 
     def __str__(self):
-        return '%i. kolo, %i. časť, %i. ročník %s' % (
+        return '%i. kolo, %s' % (
             self.number,
-            self.semester.number,
-            self.semester.year,
-            self.semester.competition,
+            self.semester,
         )
 
     def short_str(self):

trojsten/contests/templates/trojsten/contests/list_tasks.html

@@ -6,10 +6,9 @@
 
 {% block page_header %}
 <h1>
-    Zadania
+    Zadania<br>
     <small>
-        {{ round.number }}. kola {{ round.semester.number }}. časti
-        {{ round.semester.year }}. ročníka {{ round.semester.competition.name }}
+        {{ round }}
         {% if not round.visible %}
             <span class="label label-danger">skryté</span>
         {% endif %}

trojsten/contests/templates/trojsten/contests/parts/round_list.html

@@ -5,6 +5,9 @@
         <tr>
           <th colspan="3" class="active">
             {{ year }}. ročník
+            {% if competition.founded %}
+                ({{ competition.founded|add:year }}/{{ competition.founded|add:year|add:"1" }})
+            {% endif %}
           </th>
         </tr>
       </thead>
@@ -20,7 +23,7 @@
               {% endif %}
             </td>
             <td>
-              {{ round.semester.number }}. časť
+              {{ round.semester.number }}.{% if round.semester.name %} ({{ round.semester.name }}){% endif %} časť
             </td>
             <td style="text-align:right;">
               <a href="{% url 'task_list' round_id=round.id %}"  class="btn btn-primary btn-sm">

trojsten/contests/templatetags/archive_parts.py

@@ -12,6 +12,7 @@ def show_round_list(user, competition):
     all_rounds = get_rounds_by_year(user, competition)
     data = {
         'all_rounds': all_rounds,
+        'competition': competition,
     }
     return data
 

trojsten/contests/tests.py

@@ -49,7 +49,7 @@ def test_one_year(self):
         competition = Competition.objects.create(name='TestCompetition')
         competition.sites.add(self.site)
         semester = Semester.objects.create(
-            number=1, name='Test semester', competition=competition, year=1
+            number=1, competition=competition, year=1
         )
         Round.objects.create(number=1, semester=semester, solutions_visible=True, visible=True)
 
@@ -65,6 +65,20 @@ def test_one_year(self):
         # @ToDo: translations
         self.assertContains(response, "Výsledky")
 
+    def test_one_semester_with_name(self):
+        competition = Competition.objects.create(name='TestCompetition')
+        competition.sites.add(self.site)
+        semester = Semester.objects.create(
+            number=1, name='test semseter', competition=competition, year=1
+        )
+        Round.objects.create(number=1, semester=semester, solutions_visible=True, visible=True)
+
+        response = self.client.get(self.url)
+        # @ToDo: translations
+        self.assertContains(response, "1. (test semseter) časť")
+        # @ToDo: translations
+        self.assertNotContains(response, "1. časť")
+
     def test_two_competitions(self):
         competition1 = Competition.objects.create(name='TestCompetition 42')
         competition1.sites.add(self.site)
@@ -80,10 +94,10 @@ def test_two_competitions(self):
         self.assertContains(response, "TestCompetition 47")
 
         semester1 = Semester.objects.create(
-            number=42, name='Test semester 42', competition=competition1, year=42
+            number=42, competition=competition1, year=42
         )
         semester2 = Semester.objects.create(
-            number=47, name='Test semester 47', competition=competition2, year=47
+            number=47, competition=competition2, year=47
         )
         Round.objects.create(number=42, semester=semester1, solutions_visible=True, visible=True)
         Round.objects.create(number=47, semester=semester2, solutions_visible=True, visible=True)
@@ -129,10 +143,10 @@ def test_two_semester(self):
         competition = Competition.objects.create(name='TestCompetition')
         competition.sites.add(self.site)
         semester1 = Semester.objects.create(
-            number=1, name='Test semester 1', competition=competition, year=1
+            number=1, competition=competition, year=1
         )
         semester2 = Semester.objects.create(
-            number=2, name='Test semester 2', competition=competition, year=1
+            number=2, competition=competition, year=1
         )
         Round.objects.create(number=1, semester=semester1, solutions_visible=True, visible=True)