2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

new_serialize for leavedescription, crossdescription and columns

Browse source
This commit is contained in:
Laura Klünder 2024-12-04 11:41:31 +01:00
parent fca1ca5a32
commit b8cc720c04
1 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/c3nav/mapdata/models/geometry/space.py
View file

@ -114,6 +114,8 @@ class Column(SpaceGeometryMixin, AccessRestrictionMixin, models.Model):
""" """
An column in a space, also used to be able to create rooms within rooms. An column in a space, also used to be able to create rooms within rooms.
""" """
new_serialize = True
geometry = GeometryField('polygon') geometry = GeometryField('polygon')
class Meta: class Meta:
@ -387,10 +389,12 @@ class LeaveDescription(SerializableMixin):
""" """
A description for leaving a space to another space A description for leaving a space to another space
""" """
new_serialize = True
space = models.ForeignKey('mapdata.Space', on_delete=models.CASCADE, verbose_name=_('space')) space = models.ForeignKey('mapdata.Space', on_delete=models.CASCADE, verbose_name=_('space'))
target_space = models.ForeignKey('mapdata.Space', on_delete=models.CASCADE, verbose_name=_('target space'), target_space = models.ForeignKey('mapdata.Space', on_delete=models.CASCADE, verbose_name=_('target space'),
related_name='enter_descriptions') related_name='enter_descriptions')
description = I18nField(_('description')) description = I18nField(_('description'), plural_name='descriptions')
class Meta: class Meta:
verbose_name = _('Leave description') verbose_name = _('Leave description')
@ -400,14 +404,6 @@ class LeaveDescription(SerializableMixin):
('space', 'target_space') ('space', 'target_space')
) )
def _serialize(self, **kwargs):
result = super()._serialize(**kwargs)
result['space'] = self.space_id
result['target_space'] = self.target_space_id
result['descriptions'] = self.description_i18n
result['description'] = self.description
return result
@cached_property @cached_property
def title(self): def title(self):
return self.target_space.title return self.target_space.title
@ -424,12 +420,14 @@ class CrossDescription(SerializableMixin):
""" """
A description for crossing a space from one space to another space A description for crossing a space from one space to another space
""" """
new_serialize = True
space = models.ForeignKey('mapdata.Space', on_delete=models.CASCADE, verbose_name=_('space')) space = models.ForeignKey('mapdata.Space', on_delete=models.CASCADE, verbose_name=_('space'))
origin_space = models.ForeignKey('mapdata.Space', on_delete=models.CASCADE, verbose_name=_('origin space'), origin_space = models.ForeignKey('mapdata.Space', on_delete=models.CASCADE, verbose_name=_('origin space'),
related_name='leave_cross_descriptions') related_name='leave_cross_descriptions')
target_space = models.ForeignKey('mapdata.Space', on_delete=models.CASCADE, verbose_name=_('target space'), target_space = models.ForeignKey('mapdata.Space', on_delete=models.CASCADE, verbose_name=_('target space'),
related_name='cross_enter_descriptions') related_name='cross_enter_descriptions')
description = I18nField(_('description')) description = I18nField(_('description'), plural_name='descriptions')
class Meta: class Meta:
verbose_name = _('Cross description') verbose_name = _('Cross description')
@ -439,15 +437,6 @@ class CrossDescription(SerializableMixin):
('space', 'origin_space', 'target_space') ('space', 'origin_space', 'target_space')
) )
def _serialize(self, **kwargs):
result = super()._serialize(**kwargs)
result['space'] = self.space_id
result['origin_space'] = self.origin_space_id
result['target_space'] = self.target_space_id
result['descriptions'] = self.description_i18n
result['description'] = self.description
return result
@cached_property @cached_property
def title(self): def title(self):
return '%s → %s' % (self.origin_space.title, self.target_space.title) return '%s → %s' % (self.origin_space.title, self.target_space.title)