From 1e6e6118a7ce159c914c60cb30fff3388325b0c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= <jonas.havelka@volny.cz>
Date: Tue, 3 Dec 2024 18:20:25 +0100
Subject: [PATCH] =?UTF-8?q?Nepou=C5=BE=C3=ADvat=20n=C3=A1hodn=C3=A9=20stri?=
 =?UTF-8?q?ngy,=20kdy=C5=BE=20u=C5=BE=20m=C3=A1me=20n=C4=9Bjak=C3=A9=20def?=
 =?UTF-8?q?inovan=C3=A9=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 korektury/templates/korektury/opraf.html |  6 +++---
 korektury/views.py                       | 15 +++++----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/korektury/templates/korektury/opraf.html b/korektury/templates/korektury/opraf.html
index d2ae11aa..24d58d1d 100644
--- a/korektury/templates/korektury/opraf.html
+++ b/korektury/templates/korektury/opraf.html
@@ -85,11 +85,11 @@
 		{% csrf_token %}
 		<input type='hidden' name='action' value='set-state'/>
 		<input type='hidden' name='pdf' value='{{pdf.id}}'/>
-		<input type="radio" name="state" value="adding" {% if pdf.status == 'pridavani' %} checked {% endif %}>Přidávání korektur
+		<input type="radio" name="state" value="{{ pdf.STATUS_PRIDAVANI }}" {% if pdf.status == pdf.STATUS_PRIDAVANI %} checked {% endif %}>Přidávání korektur
 		<br>
-		<input type="radio" name="state" value="comitting" {% if pdf.status == 'zanaseni' %} checked {% endif %}>Zanášení korektur
+		<input type="radio" name="state" value="{{ pdf.STATUS_ZANASENI }}" {% if pdf.status == pdf.STATUS_ZANASENI %} checked {% endif %}>Zanášení korektur
 		<br>
-		<input type="radio" name="state" value="deprecated" {%	if pdf.status == 'zastarale' %} checked {% endif %}>Zastaralé, nekorigovat
+		<input type="radio" name="state" value="{{ pdf.STATUS_ZASTARALE }}" {%	if pdf.status == pdf.STATUS_ZASTARALE %} checked {% endif %}>Zastaralé, nekorigovat
 		<br>
 		<input type='submit' value='Změnit stav PDF'/>
 	</form>
diff --git a/korektury/views.py b/korektury/views.py
index 5de96a85..664e9a82 100644
--- a/korektury/views.py
+++ b/korektury/views.py
@@ -11,10 +11,10 @@ from .forms import OpravaForm
 class KorekturyListView(generic.ListView):
 	model = KorekturovanePDF
 	queryset = KorekturovanePDF.objects.annotate(
-		k_oprave_cnt=Count('oprava',distinct=True,filter=Q(oprava__status='k_oprave')),
-		opraveno_cnt=Count('oprava',distinct=True,filter=Q(oprava__status='opraveno')),
-		neni_chyba_cnt=Count('oprava',distinct=True,filter=Q(oprava__status='neni_chyba')),
-		k_zaneseni_cnt=Count('oprava',distinct=True,filter=Q(oprava__status='k_zaneseni')),
+		k_oprave_cnt=Count('oprava',distinct=True,filter=Q(oprava__status=Oprava.STATUS_K_OPRAVE)),
+		opraveno_cnt=Count('oprava',distinct=True,filter=Q(oprava__status=Oprava.STATUS_OPRAVENO)),
+		neni_chyba_cnt=Count('oprava',distinct=True,filter=Q(oprava__status=Oprava.STATUS_NENI_CHYBA)),
+		k_zaneseni_cnt=Count('oprava',distinct=True,filter=Q(oprava__status=Oprava.STATUS_K_ZANESENI)),
 		)
 	template_name = 'korektury/seznam.html'
 
@@ -133,12 +133,7 @@ class KorekturyView(generic.TemplateView):
 			kom.delete()
 		elif (action == 'set-state'):
 			pdf = KorekturovanePDF.objects.get(id=q.get('pdf'))
-			if (q.get('state') == 'adding'):
-				pdf.status = pdf.STATUS_PRIDAVANI
-			elif (q.get('state') == 'comitting'):
-				pdf.status = pdf.STATUS_ZANASENI
-			elif (q.get('state') == 'deprecated'):
-				pdf.status = pdf.STATUS_ZASTARALE
+			pdf.status = q.get('state') # FIXME odchytávat blbosti?
 			pdf.save()
 		context = self.get_context_data()
 		context['scroll'] = scroll