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

Change Timer string format and allow null name field.

This commit is contained in:
Christopher Charbonneau Wells 2017-08-17 22:52:41 -04:00
parent 93b942e811
commit 0f73042bfa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/models.py
View File

@ -111,7 +111,7 @@ class Sleep(models.Model):
class Timer(models.Model): class Timer(models.Model):
name = models.CharField(max_length=255, blank=True) name = models.CharField(max_length=255, null=True, blank=True)
start = models.DateTimeField(auto_now=True) start = models.DateTimeField(auto_now=True)
end = models.DateTimeField(blank=True, null=True, editable=False) end = models.DateTimeField(blank=True, null=True, editable=False)
active = models.BooleanField(default=True, editable=False) active = models.BooleanField(default=True, editable=False)
@ -124,7 +124,7 @@ class Timer(models.Model):
ordering = ['active', '-start'] ordering = ['active', '-start']
def __str__(self): def __str__(self):
return 'Timer ({})'.format(self.name) return self.name or 'Timer #{}'.format(self.id)
def duration(self): def duration(self):
return duration_string(self.start, self.end or timezone.now(), return duration_string(self.start, self.end or timezone.now(),
@ -132,7 +132,7 @@ class Timer(models.Model):
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
self.active = self.end is None self.active = self.end is None
self.name = self.name or 'Unnamed Timer' self.name = self.name or None
super(Timer, self).save(*args, **kwargs) super(Timer, self).save(*args, **kwargs)