mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

рефакторинг

Browse Source
remotes/origin/tests
Slava Kyrachevsky 9 years ago
parent 9b7037c34d
commit bf88765564
10 changed files with 196 additions and 200 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      apps/company/admin.py
  2. 2
      apps/emencia/django/newsletter/admin_forms.py
  3. 1
      apps/functions/custom_views.py
  4. 1
      apps/functions/utils.py
  5. 9
      apps/place_exposition/models.py
  6. 1
      apps/settings/forms.py
  7. 8
      apps/theme/models.py
  8. 8
      templates/client/includes/exposition/tags.html
  9. 72
      templates/client/includes/index/main_events.html
  10. 79
      templates/client/index.html

1
apps/company/admin.py
Unescape View File

@ -43,7 +43,6 @@ def company_delete(request, url):
@login_required
def company_change(request, url):
print('URL\n' + url)
"""
Return form and fill it with existing Company object data.

2
apps/emencia/django/newsletter/admin_forms.py
Unescape View File

@ -276,14 +276,12 @@ class NewsletterRecommendForm(forms.ModelForm):
def clean_event(self):
event = self.cleaned_data.get('event')
print(event)
match = self.rx.match(event)
if not match:
raise forms.ValidationError(_(u'Введены неверные данные'))
model = self.event_models.get(match.group('type'))
self.event_model = model
event_id = match.group('pk')
print(model, event_id, event)
try:
event = model.objects.get(pk=event_id)
except model.DoesNotExist:

1
apps/functions/custom_views.py
Unescape View File

@ -486,7 +486,6 @@ class SimpleObjectChangeView(RedirectView, SingleObjectMixin):
def get(self, request, *args, **kwargs):
self.object = self.get_object()
self.change_object()
print(self.request.META.get('QUERY_STRING', ''))
return super(SimpleObjectChangeView, self).get(request, *args, **kwargs)

1
apps/functions/utils.py
Unescape View File

@ -21,7 +21,6 @@ def strfdelta(tdelta, fmt):
class CachedSting(object):
def __init__(self, path, timeout=None):
super(CachedSting, self).__init__()
print('initiated', path)
self.path = path
self.timeout = timeout or timedelta(days=1)
self.get_object()

9
apps/place_exposition/models.py
Unescape View File

@ -196,8 +196,13 @@ class PlaceExposition(TranslatableModel, ExpoMixin):
if not self.address:
return []
# get coordinates of all hotels in current city
qs_hotels_all = self.city.hotels.filter(city=self.city)
hotels_coord = [(hotel.latitude, hotel.longitude) for hotel in qs_hotels_all]
qs_hotels_all = self.city.hotels.language().filter(
city=self.city
).values(
'latitude', 'longitude', 'url', 'photo', 'name',
'min_price', 'currency'
)
hotels_coord = [(hotel['latitude'], hotel['longitude']) for hotel in qs_hotels_all]
# coordinate current place
place_coord = (float(self.address['lat']), float(self.address['lng']))
# 4 coordinates of 4 nearest hotels

1
apps/settings/forms.py
Unescape View File

@ -197,7 +197,6 @@ class EventDefaultDescriptionEditForm(forms.Form):
for field_name, path in templates.iteritems():
try:
with open(os.path.join(settings.SITE_ROOT, path), 'w+') as f:
print(self.cleaned_data.get(field_name))
f.write(self.cleaned_data.get(field_name).encode('utf-8'))
except Exception as e:
print(e)

8
apps/theme/models.py
Unescape View File

@ -63,19 +63,19 @@ class Theme(TranslatableModel):
def expositions_number(self):
return Exposition.enable.upcoming().filter(theme__id=self.id).count()
return Exposition.enable.upcoming().filter(theme=self).count()
def conferences_number(self):
return Conference.enable.upcoming().filter(theme__id=self.id).count()
return Conference.enable.upcoming().filter(theme=self).count()
def seminars_number(self):
return Seminar.objects.filter(theme__id=self.id).count()
return Seminar.objects.filter(theme=self).count()
def webinars_number(self):
return Webinar.objects.filter(theme__id=self.id).count()
return Webinar.objects.filter(theme=self).count()
def events_number(self):
return self.expositions_number() + self.conferences_number() + self.seminars_number() + self.webinars_number()

8
templates/client/includes/exposition/tags.html
Unescape View File

@ -1,5 +1,3 @@
{% with tags=obj.tags %}
{% for tag in tags %}
<a href="{{ obj.catalog }}tag/{{ tag.url }}">{{ tag.name }}</a>{% if forloop.counter != tags|length %},{% endif %}
{% endfor %}
{% endwith %}
{% for tag in obj.tags.all %}
<a href="{{ obj.catalog }}tag/{{ tag.url }}">{{ tag.name }}</a>{% if not forloop.last %},{% endif %}
{% endfor %}

72
templates/client/includes/index/main_events.html
Unescape View File

@ -1,72 +0,0 @@
{% load thumbnail %}
{% load i18n %}
{% load template_filters %}
<div class="mcl">
<div id="mp-recent-expo" class="recent-expo">
<ul class="cycle-slideshow"
data-cycle-fx="scrollHorz"
data-cycle-timeout="4000"
data-cycle-prev=".swiper-button-prev"
data-cycle-next=".swiper-button-next"
data-cycle-pause-on-hover="true"
data-cycle-slides="> li"
data-cycle-log="false">
{% for event in events %}
<li>
<div class="re-pict pict-over" >
{% if event.logo %}
<a href="{{ event.get_main_link }}">
{# <img src="{{ event.logo.url }}"> #}
{% thumbnail event.get_preview "220x220" as im %}
<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}">
{% endthumbnail %}
</a>
{% endif %}
</div>
<div class="re-body">
<div class="re-info">
<a href="{{ event.get_main_link }}">
<div class="re-title">{{ event.name|safe }}</div>
<div class="re-date">
{% include 'client/includes/index/main_date_block.html' with obj=event %}
</div>
<div class="re-descr" title="{{ event.main_title|safe }}">{{ event.main_title|safe }}</div>
</a>
</div>
<footer>
<div class="re-buttons">
<a class="button blue icon-calendar {% if event|in_calendar:request.user %}removecalendar {% else %}addcalendar {% endif %}" href="{{ event.get_calendar_url }}">{% if event|in_calendar:request.user %}{% trans 'Убрать из календаря' %}{% else %}{% trans 'добавить в календарь' %}{% endif %}</a>
<div class="main-page {% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
<a class="button green icon-note {% if note %}active{% endif %} note-button" href="{{ event.get_note_url }}">{% trans 'заметка' %}</a>
<div class="note-overlay">
<form action="">
<textarea name="note_text" class="note-text"> {{ note }}</textarea>
</form>
</div>
</div>
</div>
<div class="re-tags">
{% with tags=event.tags %}
{% for tag in tags %}
<a href="{{ event.get_catalog_url }}tag/{{ tag.url }}">{{ tag }}</a>{% if forloop.counter < tags|length %},{% endif %}
{% endfor %}
{% endwith %}
</div>
</footer>
</div>
</li>
{% endfor %}
</ul>
<div class="re-controls">
<a class="prev swiper-button-prev" href="javascript:void(0)">&lt;</a>
<a class="next swiper-button-next" href="javascript:void(0)">&gt;</a>
</div>
</div>
</div>

79
templates/client/index.html
Unescape View File

@ -1,13 +1,14 @@
{% extends "blank.html" %}
{% load static %}
{% load i18n %}
{% extends "client/blank.html" %}
{% load static i18n %}
{% load thumbnail %}
{% load template_filters %}
{% block styles %}
<style>
.pict-over{width:220px;height:220px;line-height:212px;text-align:center;background:#fff;border-radius:4px;-moz-box-sizing:border-box;box-sizing:border-box;display:block}.pict-over img{max-width:100%;max-height:100%;border-radius:4px;vertical-align:middle}
</style>
{% endblock %}
{% block body_class %} class="main-page" {% endblock %}
{% block top %}
@ -18,7 +19,76 @@
{% include 'client/includes/menu.html' %}
</aside>
{% include 'client/includes/index/main_events.html' with events=events %}
<div class="mcl">
<div id="mp-recent-expo" class="recent-expo">
<ul class="cycle-slideshow"
data-cycle-fx="scrollHorz"
data-cycle-timeout="4000"
data-cycle-prev=".swiper-button-prev"
data-cycle-next=".swiper-button-next"
data-cycle-pause-on-hover="true"
data-cycle-slides="> li"
data-cycle-log="false">
{% for event in events %}
<li>
<div class="re-pict pict-over" >
{% if event.logo %}
<a href="{{ event.get_main_link }}">
{# <img src="{{ event.logo.url }}"> #}
{% thumbnail event.get_preview "220x220" as im %}
<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}">
{% endthumbnail %}
</a>
{% endif %}
</div>
<div class="re-body">
<div class="re-info">
<a href="{{ event.get_main_link }}">
<div class="re-title">{{ event.name|safe }}</div>
<div class="re-date">
{% include 'client/includes/index/main_date_block.html' with obj=event %}
</div>
<div class="re-descr" title="{{ event.main_title|safe }}">{{ event.main_title|safe }}</div>
</a>
</div>
<footer>
<div class="re-buttons">
<a class="button blue icon-calendar {% if event|in_calendar:request.user %}removecalendar {% else %}addcalendar {% endif %}" href="{{ event.get_calendar_url }}">{% if event|in_calendar:request.user %}{% trans 'Убрать из календаря' %}{% else %}{% trans 'добавить в календарь' %}{% endif %}</a>
<div class="main-page {% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
<a class="button green icon-note {% if note %}active{% endif %} note-button" href="{{ event.get_note_url }}">{% trans 'заметка' %}</a>
<div class="note-overlay">
<form action="">
<textarea name="note_text" class="note-text"> {{ note }}</textarea>
</form>
</div>
</div>
</div>
<div class="re-tags">
{% with tags=event.tags %}
{% for tag in tags %}
<a href="{{ event.get_catalog_url }}tag/{{ tag.url }}">{{ tag }}</a>{% if forloop.counter < tags|length %},{% endif %}
{% endfor %}
{% endwith %}
</div>
</footer>
</div>
</li>
{% endfor %}
</ul>
<div class="re-controls">
<a class="prev swiper-button-prev" href="javascript:void(0)">&lt;</a>
<a class="next swiper-button-next" href="javascript:void(0)">&gt;</a>
</div>
</div>
</div>
</div>
</section>
@ -64,6 +134,7 @@
</div>
</section>
{% endblock %}
{% block announces %}
<section class="layout mp-announces">
<div class="layout-wrap">

Write Preview
Loading…
Cancel
Save