From e66f8c43be3a4f211182dba355ec7be078b090d6 Mon Sep 17 00:00:00 2001
From: "Tomas \"Jethro\" Pokorny" <xtompok@gmail.com>
Date: Sat, 9 Jan 2016 14:08:54 +0100
Subject: [PATCH] Skryvani korektur.

---
 korektury/static/korektury/imgs/hide.png  | Bin 0 -> 270 bytes
 korektury/static/korektury/opraf.js       |  14 ++++++++++++++
 korektury/templates/korektury/opraf.html  |  11 ++++++++++-
 korektury/templates/korektury/seznam.html |   2 +-
 korektury/views.py                        |  20 ++++++++++----------
 5 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 korektury/static/korektury/imgs/hide.png

diff --git a/korektury/static/korektury/imgs/hide.png b/korektury/static/korektury/imgs/hide.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcaeec04c6440a7a42febd3825cfce7ae4e79ed8
GIT binary patch
literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQq_3T^vI!
zdY@j<<zfmHX?y5i$o)u+hppL>WwV~s;RkXt^KT}Ivk3OwO7ZzOWv9Uj*}2)m@fI(w
z-yeVY;j_txBNAsl?j2&@?ooD}%j$+mx8`Oy>n&e5cu&~=V&A+g>mxTEU+_v@S?2x;
zcAnKw4u~x8s5$mzvdoDI)1Ppsl|DVdbbXPA_tewV&+MQ2zg1m#vE7@e9LgF%XEAuX
L`njxgN@xNAVJBs@

literal 0
HcmV?d00001

diff --git a/korektury/static/korektury/opraf.js b/korektury/static/korektury/opraf.js
index d39c0797..d79e17ec 100644
--- a/korektury/static/korektury/opraf.js
+++ b/korektury/static/korektury/opraf.js
@@ -122,6 +122,20 @@ function img_click(element, ev) {
 	}
 	return show_form(img_id, dx, dy, '', '', '', '');
 }
+// hide or show text of correction
+function toggle_visibility(button){
+	var divbox = button.parentNode.parentNode.parentNode;
+	var id = divbox.id;
+	var text = document.getElementById(id+'-text');
+	if (text.style.display == 'none'){
+		text.style.display = 'block';
+	}else {
+		text.style.display = 'none';
+	}
+	for (var i=0;i<comments.length-1;i++){
+		 place_comments_one_div(comments[i][0], comments[i][1])
+	}
+} 
 
 // show comment form, when 'edit' or 'comment' button pressed
 function box_edit(button, action)
diff --git a/korektury/templates/korektury/opraf.html b/korektury/templates/korektury/opraf.html
index 761e7d4a..0be5d636 100644
--- a/korektury/templates/korektury/opraf.html
+++ b/korektury/templates/korektury/opraf.html
@@ -144,6 +144,10 @@
 				<button type='button' onclick='box_edit(this, "comment");' title='Komentovat'>
           <img src="{% static "korektury/imgs/comment.png" %}"/>
 				</button>
+				<button type='button' onclick='toggle_visibility(this);' title='Skrýt/Zobrazit'>
+          <img src="{% static "korektury/imgs/hide.png" %}"/>
+				</button>
+
 			</div>
 		</div>
 		<div id='op{{o.id}}-text'>{{o.text}}</div>
@@ -178,9 +182,14 @@
 	{% endfor %}
 
 	<script>
+	var comments = [
 	{% for s in opravy_strany %}
-		place_comments_one_div("img-{{s.strana}}", [{% for o in s.op_id %}["op{{o.id}}",{{o.x}},{{o.y}}],{% endfor %}[]]);
+		["img-{{s.strana}}", [{% for o in s.op_id %}["op{{o.id}}",{{o.x}},{{o.y}}],{% endfor %}[]]],
 	{% endfor %}
+	[]]
+	for (var i=0;i<comments.length-1;i++){
+		 place_comments_one_div(comments[i][0], comments[i][1])
+	}
 	{% if scroll %}
 		window.scrollTo(0,{{scroll}});
 	{% endif %}
diff --git a/korektury/templates/korektury/seznam.html b/korektury/templates/korektury/seznam.html
index 3e1f01e8..c1d62175 100644
--- a/korektury/templates/korektury/seznam.html
+++ b/korektury/templates/korektury/seznam.html
@@ -12,7 +12,7 @@
 
 <ul>
   {% for pdf in object_list  %}
-	  <li> <b>{{ pdf.nazev }}</b> <i>{{pdf.komentar}}</i> <a href="/korektury/{{pdf.id}}">{{pdf.pdf.url}}</a> </li>
+	  <li> <b>{{ pdf.nazev }}</b> <i>{{pdf.komentar}}</i> <a href="/korektury/{{pdf.id}}">{{pdf.pdf.name}}</a> </li>
   {% empty %}
     <li> Nejsou žádné dokumenty ke korekturování.
   {% endfor %}
diff --git a/korektury/views.py b/korektury/views.py
index d2f0ff3a..c560cb74 100644
--- a/korektury/views.py
+++ b/korektury/views.py
@@ -43,52 +43,52 @@ class KorekturyView(generic.TemplateView):
             y = int(q.get('y'))
             text = q.get('txt')
             strana = int(q.get('img-id')[4:])
-            pdf = KorekturovanePDF.objects.filter(id=q.get('pdf')).first()
+            pdf = KorekturovanePDF.objects.get(id=q.get('pdf'))
 
             op = Oprava(x=x,y=y, autor=autor, text=text, strana=strana,pdf = pdf)
             op.save()
         elif (action == u'del'):
             id = int(q.get('id'))
-            op = Oprava.objects.filter(id=id).first()
+            op = Oprava.objects.get(id=id)
             op.delete()
         elif (action == u'update'):
             id = int(q.get('id'))
-            op = Oprava.objects.filter(id=id).first()
+            op = Oprava.objects.get(id=id)
             text = q.get('txt')
             op.autor = autor
             op.text = text
             op.save()
         elif (action == u'undone'):
             id = int(q.get('id'))
-            op = Oprava.objects.filter(id=id).first()
+            op = Oprava.objects.get(id=id)
             op.status = op.STATUS_K_OPRAVE
             op.save()
         elif (action == u'done'):
             id = int(q.get('id'))
-            op = Oprava.objects.filter(id=id).first()
+            op = Oprava.objects.get(id=id)
             op.status = op.STATUS_OPRAVENO
             op.save()
         elif (action == u'wontfix'):
             id = int(q.get('id'))
-            op = Oprava.objects.filter(id=id).first()
+            op = Oprava.objects.get(id=id)
             op.status = op.STATUS_NENI_CHYBA
             op.save()
         elif (action == u'comment'):
             id = int(q.get('id'))
-            op = Oprava.objects.filter(id=id).first()
+            op = Oprava.objects.get(id=id)
             text = q.get('txt')
             kom = Komentar(oprava=op,autor=autor,text=text)
             kom.save()
         elif (action == u'update-comment'):
             id = int(q.get('id'))
-            kom = Komentar.objects.filter(id=id).first()
+            kom = Komentar.objects.get(id=id)
             text = q.get('txt')
             kom.text = text
             kom.autor = autor
             kom.save()
         elif (action == u'del-comment'):
             id = int(q.get('id'))
-            kom = Komentar.objects.filter(id=id).first()
+            kom = Komentar.objects.get(id=id)
             kom.delete()
         elif (action == u'delall'):
             pdf = KorekturovanePDF.objects.filter(id=q.get('pdf'))
@@ -114,7 +114,7 @@ class KorekturyView(generic.TemplateView):
 
     def get_context_data(self, **kwargs):
         context = super(KorekturyView,self).get_context_data(**kwargs)
-        pdf = KorekturovanePDF.objects.filter(id=self.kwargs['pdf']).first()
+        pdf = KorekturovanePDF.objects.get(id=self.kwargs['pdf'])
         context['pdf'] = pdf
         context['img_name'] = os.path.split(pdf.pdf.path)[1].split('.')[0]
         context['img_path'] = settings.KOREKTURY_IMG_DIR