diff options
| -rw-r--r-- | taskapp/admin.py | 3 | ||||
| -rw-r--r-- | taskapp/models.py | 5 | ||||
| -rw-r--r-- | taskapp/utilities/request.py | 17 |
3 files changed, 22 insertions, 3 deletions
diff --git a/taskapp/admin.py b/taskapp/admin.py index 6881372..1d18b4e 100644 --- a/taskapp/admin.py +++ b/taskapp/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from pytask.taskapp.models import Profile, Task, Credit, Comment, Claim, Notification +from pytask.taskapp.models import Profile, Task, Credit, Comment, Claim, Notification, Request admin.site.register(Profile) admin.site.register(Task) @@ -8,3 +8,4 @@ admin.site.register(Comment) admin.site.register(Credit) admin.site.register(Claim) admin.site.register(Notification) +admin.site.register(Request) diff --git a/taskapp/models.py b/taskapp/models.py index 7c85606..93c1d0e 100644 --- a/taskapp/models.py +++ b/taskapp/models.py @@ -110,14 +110,15 @@ class Claim(models.Model): class Request(models.Model): - to = models.ForeignKey(User, related_name = "%(class)s_to", blank = False) + to = models.ManyToManyField(User, related_name = "%(class)s_to", blank = False) by = models.ForeignKey(User, related_name = "%(class)s_by", blank = False) role = models.CharField(max_length = 2, blank = False) is_active = models.BooleanField(default = True) reply = models.BooleanField(default = False) - read = models.BooleanField() + read = models.BooleanField(default = False) creation_date = models.DateTimeField() reply_date = models.DateTimeField() + replied = models.BooleanField(default = False) class Notification(models.Model): diff --git a/taskapp/utilities/request.py b/taskapp/utilities/request.py new file mode 100644 index 0000000..af66319 --- /dev/null +++ b/taskapp/utilities/request.py @@ -0,0 +1,17 @@ +from pytask.taskapp.models import Request +from datetime import datetime + +def create_request(to,by,role): + """ + creates an unreplied request, based on the passed arguments + to - a list of users to which the notification is to be sent + by - sender of request + role - a two character field which represents the role requested + """ + req = Request(creation_date=datetime.now()) + req.by = by + req.reply_date = datetime(1970,01,01) + req.save() + req.to = to + req.role = role + req.save() |