Reformatting only (PEP8)
This commit is contained in:
parent
0194290140
commit
e894b14a96
6 changed files with 210 additions and 255 deletions
|
@ -1,92 +1,85 @@
|
|||
from django.db import models
|
||||
from django.forms.models import ModelForm
|
||||
from django import forms
|
||||
from django.contrib import admin
|
||||
from django.contrib.auth.models import User,Group
|
||||
import string, datetime
|
||||
from django.contrib.auth.models import User, Group
|
||||
from django.template.defaultfilters import slugify
|
||||
|
||||
import datetime
|
||||
|
||||
|
||||
class List(models.Model):
|
||||
name = models.CharField(max_length=60)
|
||||
slug = models.SlugField(max_length=60,editable=False)
|
||||
slug = models.SlugField(max_length=60, editable=False)
|
||||
# slug = models.SlugField(max_length=60)
|
||||
group = models.ForeignKey(Group)
|
||||
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
if not self.id:
|
||||
self.slug = slugify(self.name)
|
||||
|
||||
super(List, self).save(*args, **kwargs)
|
||||
|
||||
|
||||
|
||||
def __unicode__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
# Custom manager lets us do things like Item.completed_tasks.all()
|
||||
objects = models.Manager()
|
||||
|
||||
|
||||
def incomplete_tasks(self):
|
||||
# Count all incomplete tasks on the current list instance
|
||||
return Item.objects.filter(list=self,completed=0)
|
||||
|
||||
return Item.objects.filter(list=self, completed=0)
|
||||
|
||||
class Meta:
|
||||
ordering = ["name"]
|
||||
ordering = ["name"]
|
||||
verbose_name_plural = "Lists"
|
||||
|
||||
|
||||
# Prevents (at the database level) creation of two lists with the same name in the same group
|
||||
unique_together = ("group", "slug")
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
class Item(models.Model):
|
||||
title = models.CharField(max_length=140)
|
||||
list = models.ForeignKey(List)
|
||||
created_date = models.DateField(auto_now=True, auto_now_add=True)
|
||||
due_date = models.DateField(blank=True,null=True,)
|
||||
due_date = models.DateField(blank=True, null=True, )
|
||||
completed = models.BooleanField()
|
||||
completed_date = models.DateField(blank=True,null=True)
|
||||
completed_date = models.DateField(blank=True, null=True)
|
||||
created_by = models.ForeignKey(User, related_name='created_by')
|
||||
assigned_to = models.ForeignKey(User, related_name='todo_assigned_to')
|
||||
note = models.TextField(blank=True,null=True)
|
||||
note = models.TextField(blank=True, null=True)
|
||||
priority = models.PositiveIntegerField(max_length=3)
|
||||
|
||||
|
||||
# Model method: 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."
|
||||
if datetime.date.today() > self.due_date :
|
||||
if datetime.date.today() > self.due_date:
|
||||
return 1
|
||||
|
||||
def __unicode__(self):
|
||||
return self.title
|
||||
|
||||
|
||||
# Auto-set the item creation / completed date
|
||||
def save(self):
|
||||
# If Item is being marked complete, set the completed_date
|
||||
if self.completed :
|
||||
if self.completed:
|
||||
self.completed_date = datetime.datetime.now()
|
||||
super(Item, self).save()
|
||||
|
||||
|
||||
class Meta:
|
||||
ordering = ["priority"]
|
||||
|
||||
ordering = ["priority"]
|
||||
|
||||
class Comment(models.Model):
|
||||
|
||||
class Comment(models.Model):
|
||||
"""
|
||||
Not using Django's built-in comments becase we want to be able to save
|
||||
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(User)
|
||||
task = models.ForeignKey(Item)
|
||||
date = models.DateTimeField(default=datetime.datetime.now)
|
||||
body = models.TextField(blank=True)
|
||||
|
||||
def __unicode__(self):
|
||||
|
||||
def __unicode__(self):
|
||||
return '%s - %s' % (
|
||||
self.author,
|
||||
self.date,
|
||||
)
|
||||
self.author,
|
||||
self.date,
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue