diff --git a/sifrovacka/templates/sifrovacka.html b/sifrovacka/templates/sifrovacka.html index 420d50a42033a1f4bc36b99673781038a9f852b7..42ce4293eda099e843aa392db99399578b0c5787 100644 --- a/sifrovacka/templates/sifrovacka.html +++ b/sifrovacka/templates/sifrovacka.html @@ -57,11 +57,7 @@ {% endif %} {% else %} <div class="alert alert--grey-125"> - <span> - x <br> - {{sifrovacka_all_users}} - </span> -<!-- <span> Šifrovačka skončila a nenà možné se k nà přihlásit.</span>--> + <span> Šifrovačka skončila a nenà možné se k nà přihlásit.</span> </div> {% endif %} {% else %} @@ -70,6 +66,17 @@ </div> {% endif %} {% endif %} + {% if sifrovacka_all_users %} + <h1 class="head-alt-sm">Seznam úspěšných: </h1> + <div class="alert alert--grey-125"> + <span> + - + {% for i in sifrovacka_all_users %} + {{i.user}} - + {% endfor %} + </span> + </div> + {% endif %} </div> {% comment %} </br> diff --git a/sifrovacka/views.py b/sifrovacka/views.py index 84862fed4866644358ce0699b0e94c0e6adb30a0..60b80e068d6a95f070dd6a7f34e22fbee0b64a5b 100644 --- a/sifrovacka/views.py +++ b/sifrovacka/views.py @@ -150,8 +150,7 @@ def detail(request, sifrovacka_id): sifrovacka_stage_count = sifrovacka_stages.count() is_archived_sifrovacka = Sifrovacka.objects.filter(id = sifrovacka_id, enddate_sifrovacka__lt = timezone.now()) - sifrovacka_all_users = Participants.objects.filter(sifrovacka_id = \ - sifrovacka_id).values('finished','user', 'id') + sifrovacka_all_users = Participants.objects.filter(sifrovacka_id = sifrovacka_id).exclude(finished=False) if request.user.is_authenticated: print(sifrovacka_all_users) sifrovacka_all_user_current_stages= Participants.objects.filter(user = \