From aa90be581c1d8feff37d041dd9273bb25ce74053 Mon Sep 17 00:00:00 2001
From: Zdenek Kubala <zkubala@suse.com>
Date: Mon, 4 Jul 2022 16:54:30 +0200
Subject: [PATCH] feature: show users who done sifrovacka

---
 sifrovacka/templates/sifrovacka.html | 17 ++++++++++++-----
 sifrovacka/views.py                  |  3 +--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/sifrovacka/templates/sifrovacka.html b/sifrovacka/templates/sifrovacka.html
index 420d50a..42ce429 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 84862fe..60b80e0 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 = \
-- 
GitLab