From 33ff9715c9448d1a6f6cc7c44ff176f34b1bcc4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kate=C5=99ina=20=C4=8C=C3=AD=C5=BEkov=C3=A1?=
 <katterrina98@gmail.com>
Date: Wed, 1 Apr 2020 23:28:26 +0200
Subject: [PATCH] =?UTF-8?q?archiv=20obr=C3=A1zky=20u=20ro=C4=8Dn=C3=ADk?=
 =?UTF-8?q?=C5=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seminar/templates/seminar/archiv/cisla.html |  6 +++---
 seminar/views/views_all.py                  | 12 ++----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/seminar/templates/seminar/archiv/cisla.html b/seminar/templates/seminar/archiv/cisla.html
index c58a3a33..d6981ff3 100644
--- a/seminar/templates/seminar/archiv/cisla.html
+++ b/seminar/templates/seminar/archiv/cisla.html
@@ -13,9 +13,9 @@
   </div>
 
   <ul>
-    {% for r in object_list %}
-    <li><a href='{{ r.verejne_url }}'>Ročník {{ r }}</a>
-      <img src="{{ object_list.r }}" alt="">
+    {% for rocnik, url_png in object_list.items %}
+    <li><a href='{{ r.verejne_url }}'>Ročník {{ rocnik }}</a>
+      <img src="{{ url_png }}" alt="">
     {% empty %}
       Nejsou žádné ročníky
     {% endfor %}
diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py
index 47444ed4..89830574 100644
--- a/seminar/views/views_all.py
+++ b/seminar/views/views_all.py
@@ -317,15 +317,12 @@ class ArchivView(generic.ListView):
 		# op == os.path, udělá z argumentů cestu
 		png_dir = op.join(settings.MEDIA_ROOT, "cislo", "png")
 
-		# seznam [(url obrázku, číslo)]
+		# slovník {(ročník, url obrázku)}
 		urls ={}
 
 		for i,c in enumerate(cisla):
 			if not c.pdf:
 				urls[c.rocnik] = op.join(settings.MEDIA_URL, "cislo", "png", "default.png")
-				# urls.append(
-				# 	(op.join(settings.MEDIA_URL, "cislo", "png", "default.png"), c.rocnik)
-				# )
 			else:
 				filename = os.path.split(c.pdf.file.name)[1].split(".")[0]
 				png_filename = "{}.png".format(filename)
@@ -346,9 +343,6 @@ class ArchivView(generic.ListView):
 					])
 
 				urls[c.rocnik] = op.join(settings.MEDIA_URL, "cislo", "png", png_filename)
-				#urls.append(
-					#(op.join(settings.MEDIA_URL, "cislo", "png", png_filename), c.rocnik)
-				#)
 
 		context["object_list"] = urls
 
@@ -415,9 +409,7 @@ class ArchivView(generic.ListView):
 		# spirala(urls, tags, 0)
 
 		# context["nahledy"] = "\n".join(tags)
-		print(context)
-		for i in context["object_list"]:
-			print(context["object_list"][i])
+		
 		return context
 
 ### Výsledky