From cd8e7f902952557719a458c4dddeb19043164fb9 Mon Sep 17 00:00:00 2001 From: Nazar Kotyuk Date: Tue, 27 May 2014 20:12:00 +0300 Subject: [PATCH] 123 --- core/views.py | 1 + exposition/views.py | 1 + functions/custom_views.py | 7 +++++-- media/imgs/cl-logo-3.png | Bin 10635 -> 0 bytes media/import/.~lock.expositions_ru.xlsx# | 1 + media/import/.~lock.places_en.xlsx# | 1 - media/import/.~lock.places_en123.xlsx# | 1 - media/import/.~lock.places_ru.xlsx# | 1 + settings/templatetags/template_filters.py | 19 +++++++++++++++++- .../client/includes/show_date_block.html | 11 +++++++--- 10 files changed, 35 insertions(+), 8 deletions(-) delete mode 100644 media/imgs/cl-logo-3.png create mode 100644 media/import/.~lock.expositions_ru.xlsx# delete mode 100644 media/import/.~lock.places_en.xlsx# delete mode 100644 media/import/.~lock.places_en123.xlsx# create mode 100644 media/import/.~lock.places_ru.xlsx# diff --git a/core/views.py b/core/views.py index cd5ec104..5558fda8 100644 --- a/core/views.py +++ b/core/views.py @@ -79,6 +79,7 @@ class PlaceListView(ListView): template_name = 'place_catalog_test.html' model = 'places' search_form = PlaceSearchForm + order = 'data_begin' def get_params(self): model_names = {'places': _(u'Места')} diff --git a/exposition/views.py b/exposition/views.py index a007bdf8..420f25b9 100644 --- a/exposition/views.py +++ b/exposition/views.py @@ -50,6 +50,7 @@ class ExpositionView(ExpoListView): model = Exposition template_name = 'event_catalog.html' search_form = ExpositionSearchForm + order = 'data_begin' def get_context_data(self, **kwargs): context = super(ExpositionView, self).get_context_data(**kwargs) diff --git a/functions/custom_views.py b/functions/custom_views.py index 06898b90..b11dd4ce 100644 --- a/functions/custom_views.py +++ b/functions/custom_views.py @@ -226,6 +226,7 @@ class ExpoListView(ExpoMixin, ListView): params = None single_page = False search_form = None + order = None def get_queryset(self): query = self.model.objects.all() @@ -284,8 +285,10 @@ class ExpoListView(ExpoMixin, ListView): self.params = params - - return query.order_by('data_begin') + if self.order: + return query.order_by(self.order) + else: + return query def get_context_data(self, **kwargs): context = super(ExpoListView, self).get_context_data(**kwargs) diff --git a/media/imgs/cl-logo-3.png b/media/imgs/cl-logo-3.png deleted file mode 100644 index 3783a0d7cdafc37ebba01a0a2226b0f9557042e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10635 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 diff --git a/media/import/.~lock.expositions_ru.xlsx# b/media/import/.~lock.expositions_ru.xlsx# new file mode 100644 index 00000000..1254c366 --- /dev/null +++ b/media/import/.~lock.expositions_ru.xlsx# @@ -0,0 +1 @@ +kotzilla ,kotzilla,kotzilla-Satellite-L300,27.05.2014 19:59,file:///home/kotzilla/.config/libreoffice/3; \ No newline at end of file diff --git a/media/import/.~lock.places_en.xlsx# b/media/import/.~lock.places_en.xlsx# deleted file mode 100644 index 59fbea56..00000000 --- a/media/import/.~lock.places_en.xlsx# +++ /dev/null @@ -1 +0,0 @@ -kotzilla ,kotzilla,kotzilla-Satellite-L300,27.05.2014 17:23,file:///home/kotzilla/.config/libreoffice/3; \ No newline at end of file diff --git a/media/import/.~lock.places_en123.xlsx# b/media/import/.~lock.places_en123.xlsx# deleted file mode 100644 index 59fbea56..00000000 --- a/media/import/.~lock.places_en123.xlsx# +++ /dev/null @@ -1 +0,0 @@ -kotzilla ,kotzilla,kotzilla-Satellite-L300,27.05.2014 17:23,file:///home/kotzilla/.config/libreoffice/3; \ No newline at end of file diff --git a/media/import/.~lock.places_ru.xlsx# b/media/import/.~lock.places_ru.xlsx# new file mode 100644 index 00000000..e09b85da --- /dev/null +++ b/media/import/.~lock.places_ru.xlsx# @@ -0,0 +1 @@ +kotzilla ,kotzilla,kotzilla-Satellite-L300,27.05.2014 19:16,file:///home/kotzilla/.config/libreoffice/3; \ No newline at end of file diff --git a/settings/templatetags/template_filters.py b/settings/templatetags/template_filters.py index 814bb67b..00da2f24 100644 --- a/settings/templatetags/template_filters.py +++ b/settings/templatetags/template_filters.py @@ -99,4 +99,21 @@ def in_calendar(event, user): if event in calendar.get_events(): return True - return False \ No newline at end of file + return False + +from datetime import datetime, timedelta +from django import template +from django.utils.timesince import timesince + + + +@register.filter +def timesince_exp(value, date=None): + """ + return timesince() if value is more than old. Return value otherwise + """ + delta = timedelta(days=28) + d = date -value + if d>delta: + return True + return False diff --git a/templates/client/includes/show_date_block.html b/templates/client/includes/show_date_block.html index 2664bb57..608d948d 100644 --- a/templates/client/includes/show_date_block.html +++ b/templates/client/includes/show_date_block.html @@ -1,17 +1,22 @@ {% load i18n %} +{% load template_filters %} + + +{% if obj.data_begin|timesince_exp:obj.data_end %} -{% if obj.data_begin|timesince:obj.data_end > "4 week" %} {{ obj.data_begin|date:"F" }} + {% else %} {% if obj.data_begin|timesince:obj.data_end < "1 day" %} {{ obj.data_begin }} {% else %} {% if obj.data_end %} - {% trans 'с' %} {{ obj.data_begin|date:"j" }} {% trans 'по' %} {{ obj.data_end }} + {% trans 'с' %}{% ifnotequal obj.data_begin|date:"F" obj.data_end|date:"F" %} {{ obj.data_begin|date:"j F" }}{% else %} {{ obj.data_begin|date:"j" }}{% endifnotequal %} {% trans 'по' %} {{ obj.data_end }} {% else %} {{ obj.data_begin }} {% endif %} {% endif %} -{% endif %} \ No newline at end of file +{% endif %} +