phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

small changes

Browse Source
This commit is contained in:
Anatoly 2020-01-09 14:59:29 +03:00
parent d3c723eb43
commit b457ffe975
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/collection/tasks.py
View File

@ -148,10 +148,11 @@ def export_guide(guide_id, user_id, file_type='csv'):
guide = Guide.objects.get(id=guide_id) guide = Guide.objects.get(id=guide_id)
root = GuideElement.objects.get_root_node(guide) root = GuideElement.objects.get_root_node(guide)
if root: if root:
nodes = root.get_descendants().select_related('review', 'establishment', 'wine_region', nodes = root.get_descendants().select_related(
'product', 'city', 'wine_color_section', 'review', 'establishment', 'wine_region',
'section', 'label_photo', 'guide', 'product', 'city', 'wine_color_section',
'city__country', 'establishment__establishment_type')[:100] 'section', 'label_photo', 'guide',
'city__country', 'establishment__establishment_type')
serializer = GuideElementExportSerializer(nodes, many=True) serializer = GuideElementExportSerializer(nodes, many=True)
data = serializer.data data = serializer.data
SendGuideExport( SendGuideExport(

31
apps/utils/export.py
View File

@ -81,13 +81,12 @@ class DocTemplate:
def template(self, data: list): def template(self, data: list):
for instance in data: for obj in data:
instance = dict(instance) obj = dict(obj)
element_id = instance.get('id') index_name = section_name_into_index_name(obj.get('section_name'))
index_name = section_name_into_index_name(instance.get('section_name'))
# ESTABLISHMENT HEADING (LEVEL 1) # ESTABLISHMENT HEADING (LEVEL 1)
self.add_heading(name=instance['name'], self.add_heading(name=obj['name'],
font_style={'size': Pt(18), 'name': 'Palatino', 'bold': False}, font_style={'size': Pt(18), 'name': 'Palatino', 'bold': False},
level=1) level=1)
# ESTABLISHMENT TYPE PARAGRAPH # ESTABLISHMENT TYPE PARAGRAPH
@ -100,13 +99,13 @@ class DocTemplate:
font_style={'size': Pt(13), 'name': 'Arial', 'bold': True}, font_style={'size': Pt(13), 'name': 'Arial', 'bold': True},
level=2) level=2)
# CITY NAME HEADING (LEVEL 3) # CITY NAME HEADING (LEVEL 3)
self.add_heading(name=instance['city_name'], self.add_heading(name=obj['city_name'],
font_style={'size': Pt(12), 'name': 'Arial', 'bold': True, 'italic': True}, font_style={'size': Pt(12), 'name': 'Arial', 'bold': True, 'italic': True},
color_rgb=(102, 102, 102)) color_rgb=(102, 102, 102))
self.add_empty_line() self.add_empty_line()
# REVIEW HEADING (LEVEL 2) # REVIEW HEADING (LEVEL 2)
review = instance.get('review') review = obj.get('review')
if review: if review:
self.add_heading(name='Review', self.add_heading(name='Review',
font_style={'size': Pt(13), 'name': 'Arial', 'bold': True}, font_style={'size': Pt(13), 'name': 'Arial', 'bold': True},
@ -123,7 +122,7 @@ class DocTemplate:
self.add_empty_line() self.add_empty_line()
# PHONE HEADING (LEVEL 2) # PHONE HEADING (LEVEL 2)
phones = instance.get('phones') phones = obj.get('phones')
if phones: if phones:
self.add_heading(name='Phones', self.add_heading(name='Phones',
font_style={'size': Pt(13), 'name': 'Arial', 'bold': True}, font_style={'size': Pt(13), 'name': 'Arial', 'bold': True},
@ -133,18 +132,18 @@ class DocTemplate:
self.add_empty_line() self.add_empty_line()
# ADDRESS HEADING (LEVEL 2) # ADDRESS HEADING (LEVEL 2)
address = instance.get('address') address = obj.get('address')
if address: if address:
self.add_heading(name='Address', self.add_heading(name='Address',
font_style={'size': Pt(13), 'name': 'Arial', 'bold': True}, font_style={'size': Pt(13), 'name': 'Arial', 'bold': True},
level=2) level=2)
# ADDRESS DATA PARAGRAPH # ADDRESS DATA PARAGRAPH
self.add_paragraph(name=instance.get('address'), self.add_paragraph(name=obj.get('address'),
font_style={'size': Pt(10), 'name': 'Arial'}) font_style={'size': Pt(10), 'name': 'Arial'})
self.add_empty_line() self.add_empty_line()
# TIMETABLE HEADING (LEVEL 2) # TIMETABLE HEADING (LEVEL 2)
schedule = instance.get('schedule') schedule = obj.get('schedule')
if schedule: if schedule:
self.add_heading(name='Schedule', self.add_heading(name='Schedule',
font_style={'size': Pt(13), 'name': 'Arial', 'bold': True}, font_style={'size': Pt(13), 'name': 'Arial', 'bold': True},
@ -158,7 +157,7 @@ class DocTemplate:
self.add_empty_line() self.add_empty_line()
# PUBLIC MARK HEADING (LEVEL 2) # PUBLIC MARK HEADING (LEVEL 2)
public_mark = instance.get('public_mark') public_mark = obj.get('public_mark')
if public_mark: if public_mark:
self.add_heading(name='Mark', self.add_heading(name='Mark',
font_style={'size': Pt(13), 'name': 'Arial', 'bold': True}, font_style={'size': Pt(13), 'name': 'Arial', 'bold': True},
@ -169,7 +168,7 @@ class DocTemplate:
self.add_empty_line() self.add_empty_line()
# TOQUE HEADING (LEVEL 2) # TOQUE HEADING (LEVEL 2)
toque = instance.get('toque_number') toque = obj.get('toque_number')
if toque: if toque:
self.add_heading(name='Toque', self.add_heading(name='Toque',
font_style={'size': Pt(13), 'name': 'Arial', 'bold': True}, font_style={'size': Pt(13), 'name': 'Arial', 'bold': True},
@ -180,7 +179,7 @@ class DocTemplate:
self.add_empty_line() self.add_empty_line()
# TOQUE HEADING (LEVEL 2) # TOQUE HEADING (LEVEL 2)
price_level = instance.get('price_level') price_level = obj.get('price_level')
if price_level: if price_level:
self.add_heading(name='Price level', self.add_heading(name='Price level',
font_style={'size': Pt(13), 'name': 'Arial', 'bold': True}, font_style={'size': Pt(13), 'name': 'Arial', 'bold': True},
@ -191,7 +190,7 @@ class DocTemplate:
self.add_empty_line() self.add_empty_line()
# SERVICES HEADING (LEVEL 2) # SERVICES HEADING (LEVEL 2)
services = instance.get('services') services = obj.get('services')
if services: if services:
self.add_heading(name='Services', self.add_heading(name='Services',
font_style={'size': Pt(13), 'name': 'Arial', 'bold': True}, font_style={'size': Pt(13), 'name': 'Arial', 'bold': True},
@ -201,7 +200,7 @@ class DocTemplate:
self.add_empty_line() self.add_empty_line()
# METADATA HEADING (LEVEL 2) # METADATA HEADING (LEVEL 2)
metadata = instance.get('metadata') metadata = obj.get('metadata')
if metadata: if metadata:
for obj in metadata: for obj in metadata:
for section, tags in obj.items(): for section, tags in obj.items():

4
project/settings/local.py
View File

@ -30,7 +30,6 @@ MEDIA_ROOT = os.path.join(PUBLIC_ROOT, MEDIA_LOCATION)
THUMBNAIL_DEBUG = True THUMBNAIL_DEBUG = True
# DATABASES # DATABASES
DATABASES = { DATABASES = {
'default': { 'default': {
@ -119,3 +118,6 @@ EMAIL_HOST = 'smtp.gmail.com'
EMAIL_HOST_USER = 'anatolyfeteleu@gmail.com' EMAIL_HOST_USER = 'anatolyfeteleu@gmail.com'
EMAIL_HOST_PASSWORD = 'nggrlnbehzksgmbt' EMAIL_HOST_PASSWORD = 'nggrlnbehzksgmbt'
EMAIL_PORT = 587 EMAIL_PORT = 587
# ADD TRANSFER TO INSTALLED APPS
INSTALLED_APPS.append('transfer.apps.TransferConfig')