diff options
| -rw-r--r-- | taskapp/events/task.py | 16 | ||||
| -rw-r--r-- | taskapp/views/task.py | 39 | ||||
| -rw-r--r-- | templates/task/close.html | 22 | ||||
| -rw-r--r-- | templates/task/publish.html | 6 | ||||
| -rw-r--r-- | templates/task/view.html | 18 | ||||
| -rw-r--r-- | urls.py | 2 |
6 files changed, 91 insertions, 12 deletions
diff --git a/taskapp/events/task.py b/taskapp/events/task.py index 20bb1c6..d62216b 100644 --- a/taskapp/events/task.py +++ b/taskapp/events/task.py @@ -222,9 +222,23 @@ def completeTask(task, marked_by): task.status = "CM" task.save() - task.request_task.filter(is_replied=False).update(is_valid=False) + pending_requests = task.request_task.filter(is_replied=False) + pending_requests.update(is_valid=False) ## generate notification appropriately using marked_by ## we also have to mark unread requests as invalid +def closeTask(task, closed_by): + """ set the status of task as CD. + generate notifications accordingly. + """ + + task.status = "CD" + task.save() + + pending_requests = task.request_task.filter(is_replied=False) + pending_requests.update(is_valid=False) + + ## generate notifications here + diff --git a/taskapp/views/task.py b/taskapp/views/task.py index fe7349c..44f94df 100644 --- a/taskapp/views/task.py +++ b/taskapp/views/task.py @@ -6,7 +6,7 @@ from django.shortcuts import render_to_response, redirect from pytask.taskapp.models import User, Task, Comment, Claim, Credit from pytask.taskapp.utilities.task import getTask from pytask.taskapp.forms.task import TaskCreateForm, AddMentorForm, AddTaskForm, ChoiceForm, AssignCreditForm, RemoveUserForm -from pytask.taskapp.events.task import createTask, reqMentor, publishTask, addSubTask, addDep, addClaim, assignTask, updateTask, removeTask, removeUser, assignCredits, completeTask +from pytask.taskapp.events.task import createTask, reqMentor, publishTask, addSubTask, addDep, addClaim, assignTask, updateTask, removeTask, removeUser, assignCredits, completeTask, closeTask from pytask.taskapp.views.user import show_msg ## everywhere if there is no task, django should display 500 message.. but take care of that in sensitive views like add mentor and all @@ -83,7 +83,7 @@ def view_task(request, tid): } context['can_publish'] = True if task.status == "UP" and user == task.created_by else False - context['task_viewable'] = True if ( task.status not in ["UP", "DL"] ) or is_mentor else False + context['task_viewable'] = True if ( task.status != "DL" ) or is_mentor else False context['task_claimable'] = True if task.status in ["OP", "WR"] else False context['can_mod_mentors'] = True if task.status in ["UP", "OP", "LO", "WR"] and is_mentor else False @@ -513,3 +513,38 @@ def complete_task(request, tid): else: return show_msg(user, "You are not authorised to do this", task_url, "view the task") +def close_task(request, tid): + """ task can be closed only if task is published. + call the event close task if everything is fine. + """ + + task_url = "/task/view/tid=%s"%tid + + user = request.user + task = getTask(tid) + + is_guest = True if not user.is_authenticated() else False + is_mentor = True if user in task.mentors.all() else False + + if is_mentor: + + context = { + 'user':user, + 'task':task, + } + + if not task.status in ["UP", "CD", "DL", "CM"]: + if request.method == "POST": + data = request.POST + if not data.get("reason", None): + context["error"] = "Please enter a reason for closing the task" + return render_to_response('task/close.html', context) + else: + closeTask(task, user) + return show_msg(user, "The task has been closed.", task_url, "view the task.") + else: + return render_to_response('task/close.html', context) + else: + return show_msg(user, "The task is already closed or the task cannot be closed at this stage", task_url, "view the task") + else: + return show_msg(user, "You are not authorised to do this", task_url, "view the task") diff --git a/templates/task/close.html b/templates/task/close.html new file mode 100644 index 0000000..f848edc --- /dev/null +++ b/templates/task/close.html @@ -0,0 +1,22 @@ +{% extends 'base.html' %} +{% block title %} + {{task.title}} +{% endblock %} +{% block content %} + <b>Disclaimer:</b><br /> + If a task is closed, it implies the task is no more a valid task. The task cannot be edited or added subtasks/dependencies. + Please <a href="/task/assigncredits/tid={{task.id}}">click here</a> to return to assign credits page if you want to request assign of credits. + You cannot request assign of credits and all the pending requests on this task will be made invalid when a task is closed.<br /><br /> + + The only difference between marking a task as closed and completed is that the tasks depending on completed tasks will be free to be claimed + and worked on. This action cannot be undone. If you have double checked every thing, please provide a reason and close the task.<br /> + + <br /> + {% if error %} + Please provide a reason for closing the task. + {% endif %} + <form action="" method="post"> + Reason: <input type="text" name="reason"> + <input value="Close the task" type="submit"> + </form> +{% endblock %} diff --git a/templates/task/publish.html b/templates/task/publish.html index e8114bc..e4b79e2 100644 --- a/templates/task/publish.html +++ b/templates/task/publish.html @@ -4,10 +4,10 @@ {% endblock %} {% block content %} <b>Disclaimer:</b><br /> - Publishing a task will make the task visible to every one. - Only you will have mentoring rights on this task. But you can request another user also to mentor the task.<br /> + Publishing a task will make the task visible to every one and cannot be edited there after.<br /><br /> + Only you will have mentoring rights on this task. But you can request other users also to mentor the task. <br /><br /> This action cannot be undone. - <br /><br /> + <br /> Please confirm if you want to publish. <form action="" method="post"> <input value="Publish" type="submit"> diff --git a/templates/task/view.html b/templates/task/view.html index a1b0bc9..7f05220 100644 --- a/templates/task/view.html +++ b/templates/task/view.html @@ -7,10 +7,18 @@ <h3>{{ task.title }}</h3><br /> <!-- we have to write our own datetime.strftime filter and use in the next line --> created by <a href="/user/view/uid={{ task.created_by.id }}">{{ task.created_by.username }}</a> on {{ task.creation_datetime.ctime }}<br /> - if task_editable ..<br /> + {% if is_mentor %} - <a href="/task/edit/tid={{task.id}}">Edit task</a> - {% if can_publish %}|<a href="/task/publish/tid={{task.id}}">Publish task</a>{% endif %} + + {% ifequal task.status "UP" %} + <a href="/task/edit/tid={{task.id}}">Edit task</a> + {% else %} + <a href="/task/close/tid={{task.id}}">Close this task</a> + {% endifequal %} + + {% if can_publish %} + <a href="/task/publish/tid={{task.id}}">Publish task</a> + {% endif %} <br /> {% endif %} @@ -86,10 +94,10 @@ There are no users currently working on this task.<br /> {% endif %} {% if can_assign_credits %} - <a href="/task/assigncredits/tid={{task.id}}">Assign credits</a> + <a href="/task/assigncredits/tid={{task.id}}">View/Assign credits</a> {% endif %} {% if not is_guest and task_claimable %} - <a href="/task/claim/tid={{task.id}}">View claims for this task</a>.<br /> + <a href="/task/claim/tid={{task.id}}">View claims</a><br /> {% endif %} {% else %} {% ifequal task.status "CD" %} @@ -28,7 +28,6 @@ urlpatterns = patterns('', (r'^task/create/$', taskViews.create_task), (r'task/publish/tid=(\w+)/$', taskViews.publish_task), (r'^task/addmentor/tid=(\w+)$', taskViews.add_mentor), - #(r'^task/addtasks/tid=(\w+)', taskViews.add_tasks), (r'^task/edit/tid=(\w+)$', taskViews.edit_task), (r'^task/claim/tid=(\w+)$', taskViews.claim_task), (r'^task/assign/tid=(\w+)$', taskViews.assign_task), @@ -37,6 +36,7 @@ urlpatterns = patterns('', (r'^task/remtask/tid=(\w+)$', taskViews.remove_task), (r'^task/assigncredits/tid=(\w+)$', taskViews.assign_credits), (r'^task/complete/tid=(\w+)$', taskViews.complete_task), + (r'^task/close/tid=(\w+)$', taskViews.close_task), (r'^admin/', include(admin.site.urls)), |