From 6a88ff0ea7777302ffa0a2f407976d823ad2c683 Mon Sep 17 00:00:00 2001 From: Christopher Charbonneau Wells Date: Wed, 16 Aug 2017 10:29:53 -0400 Subject: [PATCH] Rename foreign key relationships on models from baby to child. --- core/admin.py | 30 +++++++++++++++--------------- core/models.py | 20 ++++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/core/admin.py b/core/admin.py index 39a95d5c..cc60dbb4 100644 --- a/core/admin.py +++ b/core/admin.py @@ -15,34 +15,34 @@ class ChildAdmin(admin.ModelAdmin): @admin.register(DiaperChange) class DiaperChangeAdmin(admin.ModelAdmin): - list_display = ('baby', 'time', 'wet', 'solid', 'color') - list_filter = ('baby', 'wet', 'solid', 'color') - search_fields = ('baby__first_name', 'baby__last_name',) + list_display = ('child', 'time', 'wet', 'solid', 'color') + list_filter = ('child', 'wet', 'solid', 'color') + search_fields = ('child__first_name', 'child__last_name',) @admin.register(Feeding) class FeedingAdmin(admin.ModelAdmin): - list_display = ('start', 'end', 'duration', 'baby', 'type', 'method',) - list_filter = ('baby', 'type', 'method',) - search_fields = ('baby__first_name', 'baby__last_name', 'type', 'method',) + list_display = ('start', 'end', 'duration', 'child', 'type', 'method',) + list_filter = ('child', 'type', 'method',) + search_fields = ('child__first_name', 'child__last_name', 'type', 'method',) @admin.register(Note) class NoteAdmin(admin.ModelAdmin): - list_display = ('time', 'baby', 'note',) - list_filter = ('baby',) - search_fields = ('baby__last_name',) + list_display = ('time', 'child', 'note',) + list_filter = ('child',) + search_fields = ('child__last_name',) @admin.register(Sleep) class SleepAdmin(admin.ModelAdmin): - list_display = ('start', 'end', 'duration', 'baby',) - list_filter = ('baby',) - search_fields = ('baby__first_name', 'baby__last_name',) + list_display = ('start', 'end', 'duration', 'child',) + list_filter = ('child',) + search_fields = ('child__first_name', 'child__last_name',) @admin.register(TummyTime) class TummyTimeAdmin(admin.ModelAdmin): - list_display = ('start', 'end', 'duration', 'baby', 'milestone',) - list_filter = ('baby',) - search_fields = ('baby__first_name', 'baby__last_name', 'milestone',) + list_display = ('start', 'end', 'duration', 'child', 'milestone',) + list_filter = ('child',) + search_fields = ('child__first_name', 'child__last_name', 'milestone',) diff --git a/core/models.py b/core/models.py index 7af0864d..dc751289 100644 --- a/core/models.py +++ b/core/models.py @@ -23,7 +23,7 @@ class Child(models.Model): class DiaperChange(models.Model): - baby = models.ForeignKey('Child', related_name='diaper_change') + child = models.ForeignKey('Child', related_name='diaper_change') time = models.DateTimeField(blank=False, null=False) wet = models.BooleanField() solid = models.BooleanField() @@ -41,11 +41,11 @@ class DiaperChange(models.Model): ordering = ['-time'] def __str__(self): - return 'Diaper change for {} on {}'.format(self.baby, self.time.date()) + return 'Diaper change for {} on {}'.format(self.child, self.time.date()) class Feeding(models.Model): - baby = models.ForeignKey('Child', related_name='feeding') + child = models.ForeignKey('Child', related_name='feeding') start = models.DateTimeField(blank=False, null=False) end = models.DateTimeField(blank=False, null=False) type = models.CharField(max_length=255, choices=[ @@ -66,14 +66,14 @@ class Feeding(models.Model): def __str__(self): return 'Feeding for {} on {} ({})'.format( - self.baby, self.end.date(), self.duration()) + self.child, self.end.date(), self.duration()) def duration(self): return duration_string(self.start, self.end) class Note(models.Model): - baby = models.ForeignKey('Child', related_name='note') + child = models.ForeignKey('Child', related_name='note') note = models.TextField() time = models.DateTimeField(auto_now=True) @@ -84,11 +84,11 @@ class Note(models.Model): ordering = ['-time'] def __str__(self): - return 'Note about {} on {}'.format(self.baby, self.time.date()) + return 'Note about {} on {}'.format(self.child, self.time.date()) class Sleep(models.Model): - baby = models.ForeignKey('Child', related_name='sleep') + child = models.ForeignKey('Child', related_name='sleep') start = models.DateTimeField(blank=False, null=False) end = models.DateTimeField(blank=False, null=False) @@ -101,14 +101,14 @@ class Sleep(models.Model): def __str__(self): return 'Sleep for {} on {} ({})'.format( - self.baby, self.end.date(), self.duration()) + self.child, self.end.date(), self.duration()) def duration(self): return duration_string(self.start, self.end) class TummyTime(models.Model): - baby = models.ForeignKey('Child', related_name='tummy_time') + child = models.ForeignKey('Child', related_name='tummy_time') start = models.DateTimeField(blank=False, null=False) end = models.DateTimeField(blank=False, null=False) milestone = models.CharField(max_length=255, blank=True) @@ -121,7 +121,7 @@ class TummyTime(models.Model): def __str__(self): return 'Tummy time for {} on {} ({})'.format( - self.baby, self.end.date(), self.duration()) + self.child, self.end.date(), self.duration()) def duration(self): return duration_string(self.start, self.end)