Skip to content

Commit

Permalink
Make last name optional (#361)
Browse files Browse the repository at this point in the history
  • Loading branch information
Alberdi committed Dec 29, 2021
1 parent 8f6d029 commit 89ed408
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 3 deletions.
18 changes: 18 additions & 0 deletions core/migrations/0017_alter_child_last_name.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.10 on 2021-12-29 20:30

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('core', '0016_alter_sleep_napping'),
]

operations = [
migrations.AlterField(
model_name='child',
name='last_name',
field=models.CharField(blank=True, max_length=255, verbose_name='Last name'),
),
]
11 changes: 8 additions & 3 deletions core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,11 @@ def validate_time(time, field_name):
class Child(models.Model):
model_name = 'child'
first_name = models.CharField(max_length=255, verbose_name=_('First name'))
last_name = models.CharField(max_length=255, verbose_name=_('Last name'))
last_name = models.CharField(
blank=True,
max_length=255,
verbose_name=_('Last name')
)
birth_date = models.DateField(
blank=False,
null=False,
Expand Down Expand Up @@ -105,7 +109,7 @@ class Meta:
verbose_name_plural = _('Children')

def __str__(self):
return '{} {}'.format(self.first_name, self.last_name)
return self.name()

def save(self, *args, **kwargs):
self.slug = slugify(self, allow_unicode=True)
Expand All @@ -117,9 +121,10 @@ def delete(self, using=None, keep_parents=False):
cache.set(self.cache_key_count, Child.objects.count(), None)

def name(self, reverse=False):
if not self.last_name:
return self.first_name
if reverse:
return '{}, {}'.format(self.last_name, self.first_name)

return '{} {}'.format(self.first_name, self.last_name)

@classmethod
Expand Down

0 comments on commit 89ed408

Please sign in to comment.