From a09ed0c3a1b8cede8fe8b802597b926e060d136d Mon Sep 17 00:00:00 2001 From: nishanth Date: Thu, 4 Feb 2010 19:42:35 +0530 Subject: removed views.py and made it a package. added auth_profile to settings.py --- taskapp/admin.py | 8 ++++++-- taskapp/models.py | 48 ++++++++++++++++++++++++----------------------- taskapp/views.py | 1 - taskapp/views/__init__.py | 1 + taskapp/views/tasks.py | 0 taskapp/views/users.py | 1 + 6 files changed, 33 insertions(+), 26 deletions(-) delete mode 100644 taskapp/views.py create mode 100644 taskapp/views/__init__.py create mode 100644 taskapp/views/tasks.py create mode 100644 taskapp/views/users.py (limited to 'taskapp') diff --git a/taskapp/admin.py b/taskapp/admin.py index bb157f4..54dc14c 100644 --- a/taskapp/admin.py +++ b/taskapp/admin.py @@ -1,7 +1,11 @@ -from pytask.taskapp.models import Person,Task,Comment,Credit from django.contrib import admin -admin.site.register(Person) +from pytask.taskapp.models.user import Profile +from pytask.taskapp.models.task import Task +from pytask.taskapp.models.credit import Credit +from pytask.taskapp.models.comment import Comment + +admin.site.register(Profile) admin.site.register(Task) admin.site.register(Comment) admin.site.register(Credit) diff --git a/taskapp/models.py b/taskapp/models.py index 991b9d9..845a686 100644 --- a/taskapp/models.py +++ b/taskapp/models.py @@ -6,37 +6,38 @@ RIGHTS_CHOICES = ( ("AD", "Admin"), ("MN", "Manager"), ("DV", "Developer"), - ("MT", "Mentor"), - ("CT", "Contributor"), - ("GP", "Public"),) + ("CT", "Contributor"),) STATUS_CHOICES = ( ("OP", "Open"), + ("LO", "Locked"), ("CL", "Claimed"), - ("LO", "Locked"), - ("AS", "Assigned"),) + ("AS", "Assigned"), + ("RO", "Reopened"), + ("CD", "Closed"), + ("DL", "Deleted"), + ("CM", "Completed")) IMAGES_DIR = "./images" UPLOADS_DIR = "./uploads" -class Person(models.Model): -#class Person(User): +class Profile(models.Model): user = models.ForeignKey(User, unique = True) aboutme = models.TextField() - DOB = models.DateField() + dob = models.DateField() gender = models.CharField(max_length = 1, choices = GENDER_CHOICES) rights = models.CharField(max_length = 2, choices = RIGHTS_CHOICES) credits = models.PositiveSmallIntegerField() foss_comm = models.CharField(max_length = 80, blank = True) - phoneNum = models.CharField(max_length = 15, blank = True) + phonenum = models.CharField(max_length = 15, blank = True) homepage = models.URLField(blank = True) street = models.CharField(max_length = 80, blank = True) city = models.CharField(max_length = 25, blank = True) country = models.CharField(max_length = 25, blank = True) nick = models.CharField(max_length = 20, blank = True) - photo = models.ImageField(upload_to = IMAGES_DIR, blank = True) +# photo = models.ImageField(upload_to = IMAGES_DIR, blank = True) def __unicode__(self): return unicode(self.user.username) @@ -49,18 +50,18 @@ class Task(models.Model): status = models.CharField(max_length = 2, choices = STATUS_CHOICES) tags = models.CharField(max_length = 200, blank = True) - parents = models.ManyToManyField('self', blank = True, related_name = "%(class)s_parents") + subs = models.ManyToManyField('self', blank = True, related_name = "%(class)s_parents") deps = models.ManyToManyField('self', blank = True, related_name = "%(class)s_deps") credits = models.PositiveSmallIntegerField() progress = models.PositiveSmallIntegerField() - mentors = models.ManyToManyField('Person', related_name = "%(class)s_mentors") - created_by = models.ForeignKey('Person', related_name = "%(class)s_created_by") - claimed_users = models.ManyToManyField('Person', blank = True, related_name = "%(class)s_claimed_users") - assigned_users = models.ManyToManyField('Person', blank = True, related_name = "%(class)s_assigned_users") + mentors = models.ManyToManyField(User, related_name = "%(class)s_mentors") + created_by = models.ForeignKey(User, related_name = "%(class)s_created_by") + claimed_users = models.ManyToManyField(User, blank = True, related_name = "%(class)s_claimed_users") + assigned_users = models.ManyToManyField(User, blank = True, related_name = "%(class)s_assigned_users") - creation_date = models.DateField() + creation_datetime = models.DateTimeField() ## not yet decided if attribs after this are to be included ## tasktype = "" ## "bugfix"/"enhancement" @@ -73,11 +74,11 @@ class Comment(models.Model): task = models.ForeignKey('Task') data = models.TextField() - created_by = models.ForeignKey('Person', related_name = "%(class)s_created_by") - deleted_by = models.ForeignKey('Person', null = True, blank = True, related_name = "%(class)s_deleted_by") - creation_date = models.DateField() - deleted = models.BooleanField() - attachment = models.FileField(upload_to = UPLOADS_DIR, blank = True) + created_by = models.ForeignKey(User, related_name = "%(class)s_created_by") + creation_datetime = models.DateTimeField() +# deleted_by = models.ForeignKey(User, null = True, blank = True, related_name = "%(class)s_deleted_by") +# deleted = models.BooleanField() +# attachment = models.FileField(upload_to = UPLOADS_DIR, blank = True) def __unicode__(self): return unicode(self.task.title) @@ -85,9 +86,10 @@ class Comment(models.Model): class Credit(models.Model): task = models.ForeignKey('Task') - given_by = models.ForeignKey('Person', related_name = "%(class)s_given_by") - given_to = models.ForeignKey('Person', related_name = "%(class)s_given_to") + given_by = models.ForeignKey(User, related_name = "%(class)s_given_by") + given_to = models.ForeignKey(User, related_name = "%(class)s_given_to") points = models.PositiveSmallIntegerField() + given_time = models.DateTimeField() def __unicode__(self): return unicode(self.task.title) diff --git a/taskapp/views.py b/taskapp/views.py deleted file mode 100644 index 60f00ef..0000000 --- a/taskapp/views.py +++ /dev/null @@ -1 +0,0 @@ -# Create your views here. diff --git a/taskapp/views/__init__.py b/taskapp/views/__init__.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/taskapp/views/__init__.py @@ -0,0 +1 @@ + diff --git a/taskapp/views/tasks.py b/taskapp/views/tasks.py new file mode 100644 index 0000000..e69de29 diff --git a/taskapp/views/users.py b/taskapp/views/users.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/taskapp/views/users.py @@ -0,0 +1 @@ + -- cgit