Merge branch 'fix_login_archived_sifra' into 'main'

join sifrovacka only when it is active

See merge request !1

sifrovacka/templates/sifrovacka.html

@@ -39,6 +39,7 @@
   <hr>
   {% if request.user.is_authenticated %}
    {% if not sifrovacka_stage_count == 0 %}
+    {% if not is_archived_sifrovacka %}
      {% if not sifrovacka_current_stage_urlhash %}
        <form action="{% url 'home' %}" method="post">
        {% csrf_token %}
@@ -54,6 +55,11 @@
            {% endif %}
        {% endfor %}
      {% endif %}
+    {% else %}
+     <div class="alert alert--grey-125">
+      <span> Šifrovačka skončila a není možné se k ní přihlásit.</span>
+     </div>
+    {% endif %}
    {% else %}
     <div class="alert alert--grey-125">
      <span> Šifrovačka zatím nemá žádné úrovně, proto není možné se k ní přihlásit.</span>

sifrovacka/views.py

@@ -148,6 +148,8 @@ def detail(request, sifrovacka_id):
     #sifrovacka_detail = Sifrovacka.objects.get(id = sifrovacka_id)
     sifrovacka_stages = Stages.objects.filter(sifrovacka__sifrovacka_name = sifrovacka_detail)
     sifrovacka_stage_count = sifrovacka_stages.count()
+    is_archived_sifrovacka = Sifrovacka.objects.filter(id = sifrovacka_id,
+                               enddate_sifrovacka__lt = timezone.now())
     if request.user.is_authenticated:
         sifrovacka_all_user_current_stages= Participants.objects.filter(user = \
                                              request.user).filter(sifrovacka_id = \
@@ -167,7 +169,8 @@ def detail(request, sifrovacka_id):
                "sifrovacka_stage_count": sifrovacka_stage_count,
                "sifrovacka_current_id": sifrovacka_current_id,
                "sifrovacka_current_stage_urlhash":
-               sifrovacka_current_stage_urlhash
+               sifrovacka_current_stage_urlhash,
+               "is_archived_sifrovacka": is_archived_sifrovacka
               }
     return render(request, 'sifrovacka.html', context)