From 40adcbfc4a6eb40feb37a35db88ea2ed8a7845a7 Mon Sep 17 00:00:00 2001 From: nishanth Date: Thu, 25 Feb 2010 16:17:56 +0530 Subject: added capability to remove an assigned user. --- taskapp/events/task.py | 7 ++++++ taskapp/forms/task.py | 8 +++++++ taskapp/views/task.py | 47 +++++++++++++++++++++++++++++++++++++++-- templates/task/remove_user.html | 11 ++++++++++ templates/task/view.html | 4 +++- urls.py | 1 + 6 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 templates/task/remove_user.html diff --git a/taskapp/events/task.py b/taskapp/events/task.py index a999dc7..ddd40d4 100644 --- a/taskapp/events/task.py +++ b/taskapp/events/task.py @@ -175,3 +175,10 @@ def removeTask(main_task, sub_task): mapobj = Map.objects.get(main=main_task) mapobj.subs.remove(sub_task) mapobj.save() + +def removeUser(main_task, rem_user): + """ right now, just remove the user from the list of assigned_users. + """ + + main_task.assigned_users.remove(rem_user) + main_task.save() diff --git a/taskapp/forms/task.py b/taskapp/forms/task.py index 721110f..24749e0 100644 --- a/taskapp/forms/task.py +++ b/taskapp/forms/task.py @@ -48,3 +48,11 @@ def AssignCreditForm(choices, instance=None): user = forms.ChoiceField(choices=choices, required=True) points = forms.IntegerField(min_value=0,required=True) return myForm(instance) if instance else myForm() + +def RemoveUserForm(choices, instance=None): + + class myForm(forms.Form): + user = forms.ChoiceField(choices=choices, required=True) + reason = forms.CharField(min_length=1, required=True) + return myForm(instance) if instance else myForm() + diff --git a/taskapp/views/task.py b/taskapp/views/task.py index 8857d9e..b05a8f6 100644 --- a/taskapp/views/task.py +++ b/taskapp/views/task.py @@ -4,8 +4,8 @@ from django.http import HttpResponse from django.shortcuts import render_to_response, redirect from pytask.taskapp.models import User, Task, Comment, Claim, Credit -from pytask.taskapp.forms.task import TaskCreateForm, AddMentorForm, AddTaskForm, ChoiceForm, AssignCreditForm -from pytask.taskapp.events.task import createTask, addMentor, publishTask, addSubTask, addDep, addClaim, assignTask, getTask, updateTask, removeTask +from pytask.taskapp.forms.task import TaskCreateForm, AddMentorForm, AddTaskForm, ChoiceForm, AssignCreditForm, RemoveUserForm +from pytask.taskapp.events.task import createTask, addMentor, publishTask, addSubTask, addDep, addClaim, assignTask, getTask, updateTask, removeTask, removeUser 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 @@ -301,7 +301,50 @@ def claim_task(request, tid): else: return show_msg('You are not logged in to view claims for this task', task_url, 'view the task') +def rem_user(request, tid): + """ show a list of working users and ask for a message/reason for removing user. + """ + + 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 (not is_guest) and is_mentor: + + assigned_users = task.assigned_users.all() + choices = [ (_.id,_.username) for _ in assigned_users ] + context = { + 'user':user, + 'task':task, + } + + if assigned_users: + form = RemoveUserForm(choices) + context['form'] = form + if request.method == "POST": + data = request.POST + form = RemoveUserForm(choices, data) + if form.is_valid(): + data = form.cleaned_data + uid = data['user'] + rem_user = User.objects.get(id=uid) + removeUser(task, rem_user) + print data['reason'] + return redirect(task_url) + else: + context['form'] = form + return render_to_response('task/remove_user.html', context) + else: + return render_to_response('task/remove_user.html',context) + else: + return show_msg("There is no one working on this task to be kicked off", task_url, "view the task") + else: + return show_msg("You are not authorised to do this", task_url, "view the task") + def assign_task(request, tid): """ first get the status of the task and then assign it to one of claimed users generate list of claimed users by passing it as an argument to a function. diff --git a/templates/task/remove_user.html b/templates/task/remove_user.html new file mode 100644 index 0000000..5ea2b19 --- /dev/null +++ b/templates/task/remove_user.html @@ -0,0 +1,11 @@ +{% extends 'base.html' %} +{% block title %} + Remove users for {{task.title}} +{% endblock %} +{% block content %} + Click here to return to {{task.title}} +
+ {{form.as_p}} + +
+{% endblock %} diff --git a/templates/task/view.html b/templates/task/view.html index 64e73c0..bee2def 100644 --- a/templates/task/view.html +++ b/templates/task/view.html @@ -66,9 +66,11 @@ {{user.username}}| {% endfor %} {% if is_mentor %} - Remove an existing user + Remove an existing user
{% endif %} + {% else %} + There are no users currently working on this task.
{% endif %} {% if can_assign_credits %} Assign credits diff --git a/urls.py b/urls.py index 7dcc5df..24b944a 100644 --- a/urls.py +++ b/urls.py @@ -31,6 +31,7 @@ urlpatterns = patterns('', (r'^task/edit/tid=(\d+)$', taskViews.edit_task), (r'^task/claim/tid=(\d+)$', taskViews.claim_task), (r'^task/assign/tid=(\d+)$', taskViews.assign_task), + (r'^task/remuser/tid=(\d+)$', taskViews.rem_user), (r'^task/addtask/tid=(\d+)$', taskViews.add_tasks), (r'^task/remtask/tid=(\d+)$', taskViews.remove_task), (r'^task/assigncredits/tid=(\d+)$', taskViews.assign_credits), -- cgit