steve
/
mybuddy
mirror of https://github.com/snachodog/mybuddy.git
1
0
Fork 0
Code Issues 3 Packages Projects 1 Releases Wiki Activity

Simplify model string names.

This commit is contained in:
Christopher Charbonneau Wells 2017-10-25 08:58:15 -04:00
parent e09580e978
commit b393de90dc
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/models.py
View File

@ -54,15 +54,7 @@ class DiaperChange(models.Model):
ordering = ['-time']
def __str__(self):
if self.wet and self.solid:
name = 'Wet, solid ({}) diaper change'.format(self.color)
elif self.wet:
name = 'Wet diaper change'
elif self.solid:
name = self.solid = 'Solid ({}) diaper change'.format(self.color)
else:
name = 'Diaper change'
return name
return 'Diaper Change'
def since(self, time=timezone.now()):
return timesince.timesince(self.time, time)
@ -102,10 +94,7 @@ class Feeding(models.Model):
ordering = ['-start']
def __str__(self):
name = '{} ({}) feeding'.format(self.method, self.type)
if self.amount:
name += ' ({} oz.)'.format(self.amount)
return name.capitalize()
return 'Feeding'
def since(self, time=timezone.now()):
return timesince.timesince(self.end, time)
@ -129,7 +118,7 @@ class Note(models.Model):
ordering = ['-time']
def __str__(self):
return 'Note about {}'.format(self.child)
return 'Note'
def since(self, time=timezone.now()):
return timesince.timesince(self.time, time)
@ -150,7 +139,7 @@ class Sleep(models.Model):
verbose_name_plural = 'Sleep'
def __str__(self):
return 'Sleep ({})'.format(self.duration)
return 'Sleep'
def since(self, time=timezone.now()):
return timesince.timesince(self.end, time)
@ -223,7 +212,7 @@ class TummyTime(models.Model):
ordering = ['-start']
def __str__(self):
return 'Tummy time ({})'.format(self.duration)
return 'Tummy Time'
def duration_td(self):
return self.end - self.start