diff options
| -rwxr-xr-x | pytask/profile/models.py | 19 | ||||
| -rwxr-xr-x | pytask/taskapp/models.py | 12 |
2 files changed, 6 insertions, 25 deletions
diff --git a/pytask/profile/models.py b/pytask/profile/models.py index ab77249..d211f22 100755 --- a/pytask/profile/models.py +++ b/pytask/profile/models.py @@ -5,21 +5,18 @@ from django.contrib.auth.models import User GENDER_CHOICES = (( 'M', 'Male'), ('F', 'Female')) RIGHTS_CHOICES = ( - ("DC", "Director"), - ("MG", "Manager"), - ("CR", "Co-ordinator"), - ("CT", "Contributor"),) + ("DC", "Director"), + ("MG", "Manager"), + ("CR", "Co-ordinator"), + ("CT", "Contributor"),) ROLE_CHOICES = ( - ("DC", "Request sent by Director \ + ("DC", "Request sent by Director \ to a user at lower level, asking him to act as a director"), - ("MG", "Request sent by Manager \ + ("MG", "Request sent by Manager \ to a user at lower level, asking him to act as a manager"),) class Profile(models.Model): - - uniq_key = models.CharField(max_length=20) - full_name = models.CharField(max_length=50, verbose_name="Name as on bank\ account", help_text="Any DD/Cheque will be\ issued on this name") @@ -46,8 +43,6 @@ class Notification(models.Model): Hence there is no sent_from option. """ - uniq_key = models.CharField(max_length=20) - sent_to = models.ForeignKey(User, related_name = "%(class)s_sent_to", blank = False) subject = models.CharField(max_length=100, blank=True) @@ -62,7 +57,6 @@ class RoleRequest(models.Model): Typically requesting to raise one's status. """ - uniq_key = models.CharField(max_length=20) role = models.CharField(max_length=2, choices=ROLE_CHOICES) is_accepted = models.BooleanField(default=False) @@ -74,4 +68,3 @@ class RoleRequest(models.Model): sent_date = models.DateTimeField() is_read = models.BooleanField(default = False) is_deleted = models.BooleanField(default = False) - diff --git a/pytask/taskapp/models.py b/pytask/taskapp/models.py index ba945f7..7bf5b8f 100755 --- a/pytask/taskapp/models.py +++ b/pytask/taskapp/models.py @@ -22,8 +22,6 @@ TB_STATUS_CHOICES = ( UPLOADS_DIR = "./pytask/static/uploads" class Task(models.Model): - - uniq_key = models.CharField(max_length = 10, unique = True) title = models.CharField(max_length = 100, verbose_name = u"Title", help_text = u"Keep it simple and below 100 chars.") desc = models.TextField(verbose_name = u"Description") @@ -54,7 +52,6 @@ class Task(models.Model): class TaskComment(models.Model): - uniq_key = models.CharField(max_length = 10, unique = True) task = models.ForeignKey('Task', related_name = "comments") data = models.TextField(verbose_name="") @@ -69,8 +66,6 @@ class TaskComment(models.Model): return unicode(self.task.title) class TaskClaim(models.Model): - - uniq_key = models.CharField(max_length = 10, unique = True) task = models.ForeignKey('Task', related_name = "claims") claimed_by = models.ForeignKey(User, @@ -83,8 +78,6 @@ class TaskClaim(models.Model): return unicode(self.task.title) class WorkReport(models.Model): - - uniq_key = models.CharField(max_length = 10, unique = True) task = models.ForeignKey(Task, related_name = "reports") submitted_by = models.ForeignKey(User, null = True, blank = True, related_name = "submitted_reports") @@ -100,8 +93,6 @@ class WorkReport(models.Model): submitted_at = models.DateTimeField() class ReportComment(models.Model): - - uniq_key = models.CharField(max_length = 10, unique = True) report = models.ForeignKey('WorkReport', related_name = "%(class)s_report") data = models.TextField() @@ -113,8 +104,6 @@ class ReportComment(models.Model): is_deleted = models.BooleanField(default=False) class PyntRequest(models.Model): - - uniq_key = models.CharField(max_length = 10, unique = True) task = models.ForeignKey(Task, related_name = "pynt_requests") pynts = models.PositiveIntegerField(default=0, help_text="No.of pynts") @@ -135,7 +124,6 @@ class PyntRequest(models.Model): class TextBook(models.Model): - uniq_key = models.CharField(max_length = 10, unique = True) name = models.CharField(max_length = 100) chapters = models.ManyToManyField(Task, related_name="textbooks") tags_field = TagField(verbose_name="Tags") |