diff options
| -rw-r--r-- | taskapp/models.py | 1 | ||||
| -rw-r--r-- | taskapp/utilities/request.py | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/taskapp/models.py b/taskapp/models.py index 62458ac..77a5a76 100644 --- a/taskapp/models.py +++ b/taskapp/models.py @@ -140,6 +140,7 @@ class Request(models.Model): reply_date = models.DateTimeField() replied = models.BooleanField(default = False) task = models.ForeignKey(Task,related_name = "%(class)s_task", blank = True, null = True) + assigned_user = models.ForeignKey(User, related_name = "%(class)s_assigned_user", blank = True, null = True) class Notification(models.Model): diff --git a/taskapp/utilities/request.py b/taskapp/utilities/request.py index af66319..41370f8 100644 --- a/taskapp/utilities/request.py +++ b/taskapp/utilities/request.py @@ -1,12 +1,14 @@ from pytask.taskapp.models import Request from datetime import datetime -def create_request(to,by,role): +def create_request(to,by,role,task=None,assigned_user=None): """ 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 + task - a requesting task (useful for sending admins a request to give Pynts to the user, assigning a user to a task) + assigned_user - user to whom the Pynts/Task is assigned to(useful for sending admins a request to give Pynts to the user, assigning a user to a task) """ req = Request(creation_date=datetime.now()) req.by = by @@ -14,4 +16,8 @@ def create_request(to,by,role): req.save() req.to = to req.role = role + if task not None: + req.task = task + if assigned_user not None: + req.assigned_user = assigned_user req.save() |