diff --git a/korektury/static/korektury/opraf-list.css b/korektury/static/korektury/opraf-list.css
new file mode 100644
index 00000000..737b3c2c
--- /dev/null
+++ b/korektury/static/korektury/opraf-list.css
@@ -0,0 +1,13 @@
+.adding-text{
+ color: black;
+}
+.comitting-text
+{
+ color: yellow;
+}
+.deprecated-text {
+ color: red;
+ text-decoration: line-through;
+}
+
+
diff --git a/korektury/templates/korektury/seznam.html b/korektury/templates/korektury/seznam.html
index c1d62175..991ca2c5 100644
--- a/korektury/templates/korektury/seznam.html
+++ b/korektury/templates/korektury/seznam.html
@@ -1,4 +1,9 @@
{% extends "korektury/base.html" %}
+{% load staticfiles %}
+
+{% block script%}
+
+{% endblock %}
{% block content %}
@@ -12,7 +17,7 @@
{% for pdf in object_list %}
- - {{ pdf.nazev }} {{pdf.komentar}} {{pdf.pdf.name}}
+ - {{ pdf.nazev }} {{pdf.komentar}} {{pdf.pdf.name}}
{% empty %}
- Nejsou žádné dokumenty ke korekturování.
{% endfor %}
diff --git a/seminar/urls.py b/seminar/urls.py
index 686a7a5c..7a365748 100644
--- a/seminar/urls.py
+++ b/seminar/urls.py
@@ -73,4 +73,9 @@ urlpatterns = [
url(r'^tex-upload/login/$', views.LoginView, name='seminar_login'),
url(r'^tex-upload/$', staff_member_required(views.texUploadView), name='seminar_tex_upload'),
+
+ # Ceka na autocomplete v3
+ #url(r'^autocomplete/organizatori/$', staff_member_required(views.OrganizatorAutocomplete.as_view()), name='seminar_autocomplete_organizator')
+
+
]
diff --git a/seminar/views.py b/seminar/views.py
index 141e9492..b9243f0f 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -123,11 +123,16 @@ class StareNovinkyView(generic.ListView):
### Co je M&M
## Organizatori
+def aktivniOrganizatori(rok=date.today().year):
+ return Organizator.objects.exclude(
+ organizuje_do_roku__isnull=False,
+ organizuje_do_roku__lt=rok
+ ).order_by('user__first_name')
class CojemamOrganizatoriView(generic.ListView):
model = Organizator
template_name='seminar/cojemam/organizatori.html'
- queryset = Organizator.objects.exclude(organizuje_do_roku__isnull=False, organizuje_do_roku__lt=date.today().year).order_by('user__first_name')
+ queryset = aktivniOrganizatori()
def get_context_data(self, **kwargs):
context = super(CojemamOrganizatoriView, self).get_context_data(**kwargs)
context['aktivni'] = True
@@ -136,7 +141,7 @@ class CojemamOrganizatoriView(generic.ListView):
class CojemamOrganizatoriStariView(generic.ListView):
model = Organizator
template_name='seminar/cojemam/organizatori.html'
- queryset = Organizator.objects.filter(organizuje_do_roku__isnull=False, organizuje_do_roku__lt=date.today().year).order_by('-organizuje_do_roku')
+ queryset = aktivniOrganizatori().order_by('-organizuje_do_roku')
### Archiv
@@ -782,3 +787,26 @@ def texDownloadView(request, rocnik, cislo):
],
}
return JsonResponse(response)
+
+
+
+# Ceka na autocomplete v3
+#class OrganizatorAutocomplete(autocomplete.Select2QuerySetView):
+# def get_queryset(self):
+# if not self.request.user.is_authenticated():
+# return Organizator.objects.none()
+#
+# qs = aktivniOrganizatori()
+#
+# if self.q:
+# if self.q[0] == "!":
+# qs = Organizator.objects.all()
+# query = self.q[1:]
+# else:
+# query = self.q
+# qs = qs.filter(
+# Q(prezdivka__isstartswith=query)|
+# Q(user__first_name__isstartswith=query)|
+# Q(user__last_name__isstartswith=query))
+#
+# return qs