pytask: comparison pytask/taskapp/views.py

equal deleted inserted replaced

-:89a61c582f39
+:4bb891fc7a54
 from datetime import datetime
+from django import shortcuts
 from django.http import Http404
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 from django.core.context_processors import csrf
 from django.core.urlresolvers import reverse
-from django.shortcuts import redirect
-from django.shortcuts import render_to_response
-from pytask.taskapp.forms import ChoiceForm
-from pytask.taskapp.forms import ClaimTaskForm
-from pytask.taskapp.forms import CreateTaskForm
-from pytask.taskapp.forms import CreateTextbookForm
-from pytask.taskapp.forms import EditTaskForm
-from pytask.taskapp.forms import EditTextbookForm
-from pytask.taskapp.forms import TaskCommentForm
-from pytask.taskapp.forms import WorkReportForm
-from pytask.taskapp.models import Task
-from pytask.taskapp.models import TaskComment
-from pytask.taskapp.models import TaskClaim
-from pytask.taskapp.models import TextBook
-from pytask.taskapp.models import WorkReport
-from pytask.taskapp.utils import getTask
-from pytask.taskapp.utils import getTextBook
 from pytask.views import show_msg
+from pytask.taskapp import forms as taskapp_forms
+from pytask.taskapp import models as taskapp_models
 @login_required
 def create_task(request):
 context.update(csrf(request))
 can_create_task = False if profile.rights == "CT" else True
 if can_create_task:
 if request.method == "POST":
-form = CreateTaskForm(request.POST)
+form = taskapp_forms.CreateTaskForm(request.POST)
 if form.is_valid():
 data = form.cleaned_data.copy()
 data.update({"created_by": user,
 "creation_datetime": datetime.now(),
-"uniq_key": make_key(Task),
 })
-task = Task(**data)
+task = taskapp_models.Task(**data)
 task.save()
 task_url = reverse('view_task', kwargs={'task_id': task.id})
-return redirect(task_url)
+return shortcuts.redirect(task_url)
 else:
 context.update({'form':form})
-return render_to_response('task/create.html', context)
+return shortcuts.render_to_response(
-else:
+'task/create.html', context)
-form = CreateTaskForm()
+else:
+form = taskapp_forms.CreateTaskForm()
 context.update({'form':form})
-return render_to_response('task/create.html', context)
+return shortcuts.render_to_response('task/create.html', context)
 else:
 return show_msg(user, 'You are not authorised to create a task.')
 def browse_tasks(request):
-open_tasks = Task.objects.filter(status="OP")
+open_tasks = taskapp_models.Task.objects.filter(status="OP")
-working_tasks = Task.objects.filter(status="WR")
+working_tasks = taskapp_models.Task.objects.filter(status="WR")
-comp_tasks = Task.objects.filter(status="CM")
+comp_tasks = taskapp_models.Task.objects.filter(status="CM")
 context = {"open_tasks": open_tasks,
 "working_tasks": working_tasks,
 "comp_tasks": comp_tasks,
 }
 user = request.user
 if not user.is_authenticated():
-return render_to_response("task/browse.html")
+return shortcuts.render_to_response("task/browse.html")
 profile = user.get_profile()
 can_approve = True if profile.rights in ["MG", "DC"] else False
-unpub_tasks = Task.objects.filter(status="UP").exclude(status="DL")
+unpub_tasks = taskapp_models.Task.objects.filter(status="UP").exclude(status="DL")
 if can_approve:
 context.update({"unpub_tasks": unpub_tasks})
 context.update({"user": user,
 "profile": profile,
 })
-return render_to_response("task/browse.html", context)
+return shortcuts.render_to_response("task/browse.html", context)
 def view_task(request, task_id):
 """ get the task depending on its task_id and display accordingly if it is a get.
 check for authentication and add a comment if it is a post request.
 """
 task_url = reverse('view_task', kwargs={'task_id': task_id})
-task = getTask(task_id)
+task = shortcuts.get_object_or_404(taskapp_models.Task, pk=task_id)
 user = request.user
 if not user.is_authenticated():
-return render_to_response("task/view.html", {"task": task})
+return shortcuts.render_to_response("task/view.html", {"task": task})
 profile = user.get_profile()
 context = {"user": user,
 "profile": profile,
 context.update({'is_reviewer':is_reviewer,
 'comments':comments,
 'reviewers':reviewers,
 })
-claimed_users = task.claimed_users.all()
 selected_users = task.selected_users.all()
 is_creator = True if user == task.created_by else False
-has_claimed = True if user in claimed_users else False
 context['selected_users'] = selected_users
 context['is_selected'] = True if user in selected_users else False
 context['can_approve'] = True if task.status == "UP" and\
 profile.rights in ["MG", "DC"]\
 context['can_mod_reviewers'] = True if profile.rights in ["MG", "DC"] else\
 False
 if request.method == 'POST':
-form = TaskCommentForm(request.POST)
+form = taskapp_forms.TaskCommentForm(request.POST)
 if form.is_valid():
 data = form.cleaned_data['data']
-new_comment = TaskComment(task=task, data=data,
+new_comment = taskapp_forms.TaskComment(
-uniq_key=make_key(TaskComment),
+task=task, data=data, commented_by=user,
-commented_by=user, comment_datetime=datetime.now())
+comment_datetime=datetime.now())
 new_comment.save()
-return redirect(task_url)
+return shortcuts.redirect(task_url)
 else:
 context['form'] = form
-return render_to_response('task/view.html', context)
+return shortcuts.render_to_response('task/view.html', context)
 else:
-form = TaskCommentForm()
+form = taskapp_forms.TaskCommentForm()
 context['form'] = form
-return render_to_response('task/view.html', context)
+return shortcuts.render_to_response('task/view.html', context)
 @login_required
 def edit_task(request, task_id):
 """ only creator gets to edit the task and that too only before it gets
 approved.
 user = request.user
 profile = user.get_profile()
 task_url = reverse('view_task', kwargs={'task_id': task_id})
-task = getTask(task_id)
+task = shortcuts.get_object_or_404(taskapp_models.Task, pk=task_id)
 is_creator = True if user == task.created_by else False
 can_edit = True if task.status == "UP" and is_creator else False
 if not can_edit:
 raise Http404
 }
 context.update(csrf(request))
 if request.method == "POST":
-form = EditTaskForm(request.POST, instance=task)
+form = taskapp_forms.EditTaskForm(request.POST, instance=task)
 if form.is_valid():
 form.save()
-return redirect(task_url)
+return shortcuts.redirect(task_url)
 else:
 context.update({"form": form})
-return render_to_response("task/edit.html", context)
+return shortcuts.render_to_response("task/edit.html", context)
 else:
-form = EditTaskForm(instance=task)
+form = taskapp_forms.EditTaskForm(instance=task)
 context.update({"form": form})
-return render_to_response("task/edit.html", context)
+return shortcuts.render_to_response("task/edit.html", context)
 @login_required
 def approve_task(request, task_id):
 user = request.user
 profile = user.get_profile()
-task = getTask(task_id)
+task = shortcuts.get_object_or_404(taskapp_models.Task, pk=task_id)
 if profile.rights not in ["MG", "DC"] or task.status != "UP":
 raise Http404
 context = {"user": user,
 "profile": profile,
 "task": task,
 }
-return render_to_response("task/confirm_approval.html", context)
+return shortcuts.render_to_response("task/confirm_approval.html", context)
 @login_required
 def approved_task(request, task_id):
 user = request.user
 profile = user.get_profile()
-task = getTask(task_id)
+task = shortcuts.get_object_or_404(taskapp_models.Task, pk=task_id)
 if profile.rights not in ["MG", "DC"] or task.status != "UP":
 raise Http404
 task.approved_by = user
 context = {"user": user,
 "profile": profile,
 "task": task,
 }
-return render_to_response("task/approved_task.html", context)
+return shortcuts.render_to_response("task/approved_task.html", context)
 @login_required
 def addreviewer(request, task_id):
 user = request.user
 profile = user.get_profile()
 task_url = reverse('view_task', kwargs={'task_id': task_id})
-task = getTask(task_id)
+task = shortcuts.get_object_or_404(taskapp_models.Task, pk=task_id)
 can_mod_reviewers = True if profile.rights in ["MG", "DC"] else False
 if not can_mod_reviewers:
 raise Http404
 context.update(csrf(request))
 # This part has to be made better
 reviewer_choices = User.objects.filter(is_active=True).\
-exclude(reviewing_tasks__uniq_key=task_id).\
+exclude(reviewing_tasks__id=task_id).\
-exclude(claimed_tasks__uniq_key=task_id).\
+exclude(claimed_tasks__id=task_id).\
-exclude(selected_tasks__uniq_key=task_id).\
+exclude(selected_tasks__id=task_id).\
-exclude(created_tasks__uniq_key=task_id)
+exclude(created_tasks__id=task_id)
 choices = ((a_user.id,a_user.username) for a_user in reviewer_choices)
 label = "Reviewer"
 if request.method == "POST":
-form = ChoiceForm(choices, data=request.POST, label=label)
+form = taskapp_forms.ChoiceForm(choices, data=request.POST, label=label)
 if form.is_valid():
 data = form.cleaned_data.copy()
 uid = data['choice']
 reviewer = User.objects.get(id=uid)
 task.reviewers.add(reviewer)
-return redirect(task_url)
+return shortcuts.redirect(task_url)
 else:
 context.update({"form": form})
-return render_to_response("task/addreviewer.html", context)
+return shortcuts.render_to_response("task/addreviewer.html", context)
 else:
-form = ChoiceForm(choices, label=label)
+form = taskapp_forms.ChoiceForm(choices, label=label)
 context.update({"form": form})
-return render_to_response("task/addreviewer.html", context)
+return shortcuts.render_to_response("task/addreviewer.html", context)
 def view_work(request, task_id):
-task = getTask(task_id)
+task = shortcuts.get_object_or_404(taskapp_models.Task, pk=task_id)
 user = request.user
 old_reports = task.reports.all()
 context = {"task": task,
 "old_reports": old_reports,
 }
 if not user.is_authenticated():
-return render_to_response("task/view_work.html", context)
+return shortcuts.render_to_response("task/view_work.html", context)
 profile = user.get_profile()
 context.update({"user": user,
 "profile": profile,
 working_users = task.selected_users.all()
 is_working = True if user in working_users else False
 context.update({"is_working": is_working})
-return render_to_response("task/view_work.html", context)
+return shortcuts.render_to_response("task/view_work.html", context)
 @login_required
 def view_report(request, report_id):
 try:
-report = WorkReport.objects.get(uniq_key=report_id)
+report = taskapp_models.WorkReport.objects.get(pk=report_id)
-except WorkReport.DoesNotExist:
+except taskapp_models.WorkReport.DoesNotExist:
 raise Http404
 user = request.user
 context = {"report": report,
 "user": user,
 }
 if not user.is_authenticated():
-return render_to_response("task/view_report.html", context)
+return shortcuts.render_to_response("task/view_report.html", context)
 profile = user.get_profile()
 context.update({"profile": profile})
-return render_to_response("task/view_report.html", context)
+return shortcuts.render_to_response("task/view_report.html", context)
 @login_required
 def submit_report(request, task_id):
 """ Check if the work is in WR state and the user is in assigned_users.
 """
 task_url = reverse('view_task', kwargs={'task_id': task_id})
-task = getTask(task_id)
+task = shortcuts.get_object_or_404(taskapp_models.Task, pk=task_id)
 user = request.user
 old_reports = task.reports.all()
 if not task.status == "WR":
 if request.method == "POST":
 if not can_upload:
 return show_msg(user, "You are not authorised to upload data to this task", task_url, "view the task")
-form = WorkReportForm(request.POST, request.FILES)
+form = taskapp_forms.WorkReportForm(request.POST, request.FILES)
 if form.is_valid():
 data = form.cleaned_data.copy()
 data.update({"task":task,
 "revision": old_reports.count(),
-"uniq_key": make_key(WorkReport),
 "submitted_by": user,
 "submitted_at": datetime.now(),
 })
-r = WorkReport(**data)
+r = taskapp_models.WorkReport(**data)
 r.save()
 report_url = reverse('view_report', kwargs={'report_id': r.id})
-return redirect(report_url)
+return shortcuts.redirect(report_url)
 else:
 context.update({"form":form})
-return render_to_response('task/submit_report.html', context)
+return shortcuts.render_to_response('task/submit_report.html', context)
 else:
-form = WorkReportForm()
+form = taskapp_forms.WorkReportForm()
 context.update({"form":form})
-return render_to_response('task/submit_report.html', context)
+return shortcuts.render_to_response('task/submit_report.html', context)
 @login_required
 def create_textbook(request):
 user = request.user
 }
 context.update(csrf(request))
 if request.method == "POST":
-form = CreateTextbookForm(request.POST)
+form = taskapp_forms.CreateTextbookForm(request.POST)
 if form.is_valid():
 data = form.cleaned_data.copy()
-data.update({"uniq_key": make_key(TextBook),
+data.update({"created_by": user,
-"created_by": user,
 "creation_datetime": datetime.now()})
 del data['chapters']
-new_textbook = TextBook(**data)
+new_textbook = taskapp_models.TextBook(**data)
 new_textbook.save()
 new_textbook.chapters = form.cleaned_data['chapters']
 textbook_url = reverse(
 'view_textbook', kwargs={'task_id': new_textbook.id})
-return redirect(textbook_url)
+return shortcuts.redirect(textbook_url)
 else:
 context.update({"form": form})
-return render_to_response("task/create_textbook.html", context)
+return shortcuts.render_to_response("task/create_textbook.html", context)
 else:
-form = CreateTextbookForm()
+form = taskapp_forms.CreateTextbookForm()
 context.update({"form": form})
-return render_to_response("task/create_textbook.html", context)
+return shortcuts.render_to_response("task/create_textbook.html", context)
 def view_textbook(request, task_id):
-textbook = getTextBook(task_id)
+textbook = shortcuts.get_object_or_404(taskapp_models.TextBook, pk=task_id)
 chapters = textbook.chapters.all()
 user = request.user
 context = {"user": user,
 "textbook": textbook,
 "chapters": chapters,
 }
 if not user.is_authenticated():
-return render_to_response("task/view_textbook.html", context)
+return shortcuts.render_to_response("task/view_textbook.html", context)
 profile = user.get_profile()
 context.update({"profile": profile,
 "textbook": textbook,
 can_approve = True if profile.rights in ["MG", "DC"] and \
 textbook.status == "UP" else False
 context.update({"can_edit": can_edit,
 "can_approve": can_approve})
-return render_to_response("task/view_textbook.html", context)
+return shortcuts.render_to_response("task/view_textbook.html", context)
 def browse_textbooks(request):
 user = request.user
-open_textbooks = TextBook.objects.filter(status="OP").\
+open_textbooks = taskapp_models.TextBook.objects.filter(status="OP").\
 order_by("creation_datetime")
-comp_textbooks = TextBook.objects.filter(status="CM").\
+comp_textbooks = taskapp_models.TextBook.objects.filter(status="CM").\
 order_by("creation_datetime")
 context = {"user": user,
 "open_textbooks": open_textbooks,
 "comp_textbooks": comp_textbooks,
 }
 if user.is_authenticated() and user.get_profile().rights in ["DC", "MG"]:
-unpub_textbooks = TextBook.objects.filter(status="UP")
+unpub_textbooks = taskapp_models.TextBook.objects.filter(status="UP")
 context.update({"unpub_textbooks": unpub_textbooks})
-return render_to_response("task/browse_textbooks.html", context)
+return shortcuts.render_to_response("task/browse_textbooks.html", context)
 @login_required
 def edit_textbook(request, task_id):
 user = request.user
 profile = user.get_profile()
-textbook = getTextBook(task_id)
+textbook = shortcuts.get_object_or_404(taskapp_models.TextBook, pk=task_id)
 textbook_url = reverse(
 'view_textbook', kwargs={'task_id': textbook.id})
 can_edit = True if user == textbook.created_by and textbook.status == "UP"\
 else False
 }
 context.update(csrf(request))
 if request.method == "POST":
-form = EditTextbookForm(request.POST, instance=textbook)
+form = taskapp_forms.EditTextbookForm(request.POST, instance=textbook)
 if form.is_valid():
 form.save()
-return redirect(textbook_url)
+return shortcuts.redirect(textbook_url)
 else:
 context.update({"form": form})
-return render_to_response("task/edit_textbook.html", context)
+return shortcuts.render_to_response("task/edit_textbook.html", context)
 else:
-form = EditTextbookForm(instance=textbook)
+form = taskapp_forms.EditTextbookForm(instance=textbook)
 context.update({"form": form})
-return render_to_response("task/edit_textbook.html", context)
+return shortcuts.render_to_response("task/edit_textbook.html", context)
 @login_required
 def claim_task(request, task_id):
 claim_url = "/task/claim/task_id=%s"%task_id
-task = getTask(task_id)
+task = shortcuts.get_object_or_404(taskapp_models.Task, pk=task_id)
 if task.status == "UP":
 raise Http404
 user = request.user
 "task_claimable": task_claimable,
 "can_claim": can_claim,
 "old_claims": old_claims})
 if request.method == "POST" and can_claim:
-form = ClaimTaskForm(request.POST)
+form = taskapp_forms.ClaimTaskForm(request.POST)
 if form.is_valid():
 data = form.cleaned_data.copy()
-data.update({"uniq_key": make_key(TaskClaim),
+data.update({"task": task,
-"task": task,
 "claim_datetime": datetime.now(),
 "claimed_by": user,})
-new_claim = TaskClaim(**data)
+new_claim = taskapp_models.TaskClaim(**data)
 new_claim.save()
 task.claimed_users.add(user)
 task.save()
-return redirect(claim_url)
+return shortcuts.redirect(claim_url)
 else:
 context.update({"form": form})
-return render_to_response("task/claim.html", context)
+return shortcuts.render_to_response("task/claim.html", context)
 else:
-form = ClaimTaskForm()
+form = taskapp_forms.ClaimTaskForm()
 context.update({"form": form})
-return render_to_response("task/claim.html", context)
+return shortcuts.render_to_response("task/claim.html", context)
 @login_required
 def select_user(request, task_id):
 """ first get the status of the task and then select one of claimed users
 generate list of claimed users by passing it as an argument to a function.
 task_url = reverse('view_task', kwargs={'task_id': task_id})
 user = request.user
 profile = user.get_profile()
-task = getTask(task_id)
+task = shortcuts.get_object_or_404(taskapp_models.Task, pk=task_id)
 context = {"user": user,
 "profile": profile,
 "task": task,
 }
 if task_claimed:
 user_list = ((user.id,user.username) for user in claimed_users)
 if request.method == "POST":
-form = ChoiceForm(user_list, request.POST)
+form = taskapp_forms.ChoiceForm(user_list, request.POST)
 if form.is_valid():
 uid = form.cleaned_data['choice']
 selected_user = User.objects.get(id=uid)
 task.selected_users.add(selected_user)
 task.claimed_users.remove(selected_user)
 task.status = "WR"
 task.save()
-return redirect(task_url)
+return shortcuts.redirect(task_url)
 else:
 context.update({"form": form})
-return render_to_response('task/select_user.html', context)
+return shortcuts.render_to_response('task/select_user.html', context)
 else:
-form = ChoiceForm(user_list)
+form = taskapp_forms.ChoiceForm(user_list)
 context.update({"form": form})
-return render_to_response('task/select_user.html', context)
+return shortcuts.render_to_response('task/select_user.html', context)
 else:
 return show_msg(user, 'There are no pending claims for this task',
 task_url, 'view the task')
 else:
 raise Http404
 def approve_textbook(request, task_id):
 user = request.user
 profile = user.get_profile()
-textbook = getTextBook(task_id)
+textbook = shortcuts.get_object_or_404(taskapp_models.TextBook, pk=task_id)
 if profile.rights not in ["MG", "DC"] or textbook.status != "UP":
 raise Http404
 context = {"user": user,
 "profile": profile,
 "textbook": textbook,
 }
-return render_to_response("task/confirm_textbook_approval.html", context)
+return shortcuts.render_to_response("task/confirm_textbook_approval.html", context)
 @login_required
 def approved_textbook(request, task_id):
 user = request.user
 profile = user.get_profile()
-textbook = getTextBook(task_id)
+textbook = shortcuts.get_object_or_404(taskapp_models.TextBook, pk=task_id)
 if profile.rights not in ["MG", "DC"] or textbook.status != "UP":
 raise Http404
 textbook.approved_by = user
 context = {"user": user,
 "profile": profile,
 "textbook": textbook,
 }
-return render_to_response("task/approved_textbook.html", context)
+return shortcuts.render_to_response("task/approved_textbook.html", context)

changeset 422	4bb891fc7a54
parent 408	0c12181e2c02
child 425	e15749fab2e4