Rename Item model to Task

- With matching model, view, template changes
This commit is contained in:
Scot Hacker 2018-03-28 22:51:10 -07:00
parent a2d02b0a8c
commit d3d8d5e46c
15 changed files with 133 additions and 119 deletions

View file

@ -1,14 +1,12 @@
from __future__ import unicode_literals
import datetime
from django.db import models
from django.contrib.auth.models import Group
from django.urls import reverse
from django.utils.encoding import python_2_unicode_compatible
from django.conf import settings
from django.contrib.auth.models import Group
from django.db import models
from django.urls import reverse
@python_2_unicode_compatible
class TaskList(models.Model):
name = models.CharField(max_length=60)
slug = models.SlugField(default='',)
@ -25,8 +23,7 @@ class TaskList(models.Model):
unique_together = ("group", "slug")
@python_2_unicode_compatible
class Item(models.Model):
class Task(models.Model):
title = models.CharField(max_length=140)
task_list = models.ForeignKey(TaskList, on_delete=models.CASCADE, null=True)
created_date = models.DateField(auto_now=True)
@ -41,7 +38,7 @@ class Item(models.Model):
# Has due date for an instance of this object passed?
def overdue_status(self):
"Returns whether the item's due date has passed or not."
"Returns whether the Tasks's due date has passed or not."
if self.due_date and datetime.date.today() > self.due_date:
return True
@ -51,25 +48,24 @@ class Item(models.Model):
def get_absolute_url(self):
return reverse('todo:task_detail', kwargs={'task_id': self.id, })
# Auto-set the item creation / completed date
# Auto-set the Task creation / completed date
def save(self, **kwargs):
# If Item is being marked complete, set the completed_date
# If Task is being marked complete, set the completed_date
if self.completed:
self.completed_date = datetime.datetime.now()
super(Item, self).save()
super(Task, self).save()
class Meta:
ordering = ["priority"]
@python_2_unicode_compatible
class Comment(models.Model):
"""
Not using Django's built-in comments because we want to be able to save
a comment and change task details at the same time. Rolling our own since it's easy.
"""
author = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
task = models.ForeignKey(Item, on_delete=models.CASCADE)
task = models.ForeignKey(Task, on_delete=models.CASCADE)
date = models.DateTimeField(default=datetime.datetime.now)
body = models.TextField(blank=True)