diff --git a/seminar/templates/seminar/archiv/cisla.html b/seminar/templates/seminar/archiv/cisla.html
index be860f81..3c4a38b4 100644
--- a/seminar/templates/seminar/archiv/cisla.html
+++ b/seminar/templates/seminar/archiv/cisla.html
@@ -38,7 +38,7 @@
Jednotlivá čísla:
-
+
{% block nadpis1a %}{% block nadpis1b %}
- Ročník {{ rocnik.roman }}
+ Ročník {{ rocnik }}
{% endblock %}{% endblock %}
-
+
-
Ročník číslo {{ rocnik.rocnik }} ({{ rocnik.prvni_rok }}/{{ rocnik.druhy_rok }})
+ {% if temata_v_rocniku %}
+
Témata
+
+ {% endif %}
{% for c in rocnik.verejna_cisla %}
@@ -19,15 +26,6 @@
{% endfor %}
- {% if temata_v_rocniku %}
-
Témata
-
- {% endif %}
-
{% if vysledkovka %}
{% if user.is_staff %}
@@ -50,7 +48,3 @@
{% endblock content %}
-
-
-
-
diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py
index 9fe65ca0..81c8d55e 100644
--- a/seminar/views/views_all.py
+++ b/seminar/views/views_all.py
@@ -320,32 +320,61 @@ class ArchivView(generic.ListView):
# slovník {(ročník, url obrázku)}
urls ={}
+ # for j, rocnik in enumerate(Rocnik.objects.all()):
+ # urls_rocnik = {}
+ # for i,c in enumerate(rocnik.cisla.all()):
+ # if not c.pdf:
+ # urls_rocnik[c.poradi] = op.join(settings.MEDIA_URL, "cislo", "png", "default.png")
+ # else:
+ # filename = os.path.split(c.pdf.file.name)[1].split(".")[0]
+ # png_filename = "{}.png".format(filename)
+
+ # # Pokud obrázek neexistuje nebo není aktuální, vytvoř jej
+ # png_path = op.join(png_dir, png_filename)
+ # if not op.exists(png_path) or \
+ # op.getmtime(png_path) < op.getmtime(c.pdf.path):
+
+ # subprocess.call([
+ # "convert",
+ # "-density", "300x300",
+ # "-geometry", "{}x{}".format(vyska, sirka),
+ # "-background", "white",
+ # "-flatten",
+ # "{}[0]".format(c.pdf.path), # titulní strana
+ # png_path
+ # ])
+
+ # urls_rocnik[c.poradi] = op.join(settings.MEDIA_URL, "cislo", "png", png_filename)
+ # urls[rocnik] = urls_rocnik
+
for i,c in enumerate(cisla):
- if not c.pdf:
- urls[c.rocnik] = op.join(settings.MEDIA_URL, "cislo", "png", "default.png")
- else:
- filename = os.path.split(c.pdf.file.name)[1].split(".")[0]
- png_filename = "{}.png".format(filename)
-
- # Pokud obrázek neexistuje nebo není aktuální, vytvoř jej
- png_path = op.join(png_dir, png_filename)
- if not op.exists(png_path) or \
- op.getmtime(png_path) < op.getmtime(c.pdf.path):
-
- subprocess.call([
- "convert",
- "-density", "300x300",
- "-geometry", "{}x{}".format(vyska, sirka),
- "-background", "white",
- "-flatten",
- "{}[0]".format(c.pdf.path), # titulní strana
- png_path
- ])
-
- urls[c.rocnik] = op.join(settings.MEDIA_URL, "cislo", "png", png_filename)
+ if not c.pdf:
+ urls[c.rocnik] = op.join(settings.MEDIA_URL, "cislo", "png", "default.png")
+ else:
+ filename = os.path.split(c.pdf.file.name)[1].split(".")[0]
+ png_filename = "{}.png".format(filename)
+
+ # Pokud obrázek neexistuje nebo není aktuální, vytvoř jej
+ png_path = op.join(png_dir, png_filename)
+ if not op.exists(png_path) or \
+ op.getmtime(png_path) < op.getmtime(c.pdf.path):
+
+ subprocess.call([
+ "convert",
+ "-density", "300x300",
+ "-geometry", "{}x{}".format(vyska, sirka),
+ "-background", "white",
+ "-flatten",
+ "{}[0]".format(c.pdf.path), # titulní strana
+ png_path
+ ])
+
+ urls[c.rocnik] = op.join(settings.MEDIA_URL, "cislo", "png", png_filename)
context["object_list"] = urls
+ print(context)
+
# for i, c in enumerate(cisla):
# if not c.pdf:
# continue