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

Timetable search results

Browse Source
This commit is contained in:
Kuroshini 2019-10-17 15:10:26 +03:00
parent 1998e3dc57
commit d2e34e5d49
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/search_indexes/documents/establishment.py
View File

@ -50,12 +50,7 @@ class EstablishmentDocument(Document):
'id': fields.IntegerField(attr='id'), 'id': fields.IntegerField(attr='id'),
'weekday': fields.IntegerField(attr='weekday'), 'weekday': fields.IntegerField(attr='weekday'),
'weekday_display': fields.KeywordField(attr='get_weekday_display'), 'weekday_display': fields.KeywordField(attr='get_weekday_display'),
'opening_at': fields.DateField(attr='opening_at'), 'closed_at': fields.KeywordField(attr='closed_at_str'),
'closed_at': fields.DateField(attr='closed_at'),
'lunch_start': fields.DateField(attr='lunch_start'),
'lunch_end': fields.DateField(attr='lunch_end'),
'dinner_end': fields.DateField(attr='dinner_end'),
'dinner_start': fields.DateField(attr='dinner_start'),
} }
)) ))
address = fields.ObjectField( address = fields.ObjectField(

8
apps/search_indexes/serializers.py
View File

@ -35,14 +35,8 @@ class ScheduleDocumentSerializer(serializers.Serializer):
id = serializers.IntegerField() id = serializers.IntegerField()
weekday = serializers.IntegerField() weekday = serializers.IntegerField()
# weekday_display = serializers.CharField() weekday_display = serializers.CharField()
opening_at = serializers.CharField()
closed_at = serializers.CharField() closed_at = serializers.CharField()
lunch_start = serializers.CharField()
lunch_end = serializers.CharField()
dinner_end = serializers.CharField()
dinner_start = serializers.CharField()
class NewsDocumentSerializer(DocumentSerializer): class NewsDocumentSerializer(DocumentSerializer):

4
apps/timetable/models.py
View File

@ -35,6 +35,10 @@ class Timetable(ProjectBaseMixin):
opening_at = models.TimeField(verbose_name=_('Opening time'), null=True) opening_at = models.TimeField(verbose_name=_('Opening time'), null=True)
closed_at = models.TimeField(verbose_name=_('Closed time'), null=True) closed_at = models.TimeField(verbose_name=_('Closed time'), null=True)
@property
def closed_at_str(self):
return str(self.closed_at) if self.closed_at else None
@property @property
def works_at_noon(self): def works_at_noon(self):
return bool(self.closed_at and self.closed_at <= self.NOON) return bool(self.closed_at and self.closed_at <= self.NOON)