|
|
|
@ -2,7 +2,7 @@ |
|
|
|
from django.contrib.auth.decorators import login_required, permission_required |
|
|
|
from django.shortcuts import render, redirect, get_object_or_404 |
|
|
|
from abonapp.models import Abon |
|
|
|
|
|
|
|
from datetime import date |
|
|
|
from models import Task |
|
|
|
from mydefs import pag_mn, only_admins, safe_int |
|
|
|
from forms import TaskFrm |
|
|
|
@ -11,7 +11,7 @@ from forms import TaskFrm |
|
|
|
@login_required |
|
|
|
@only_admins |
|
|
|
def home(request): |
|
|
|
tasks = Task.objects.filter(recipient=request.user, state='S') # Новые задачи |
|
|
|
tasks = Task.objects.filter(recipients=request.user, state='S') # Новые задачи |
|
|
|
|
|
|
|
# filter |
|
|
|
# dir, field = order_helper(request) |
|
|
|
@ -28,7 +28,7 @@ def home(request): |
|
|
|
@login_required |
|
|
|
@only_admins |
|
|
|
def active_tasks(request): |
|
|
|
tasks = Task.objects.filter(recipient=request.user, state='C') # На выполнении |
|
|
|
tasks = Task.objects.filter(recipients=request.user, state='C') # На выполнении |
|
|
|
tasks = pag_mn(request, tasks) |
|
|
|
return render(request, 'taskapp/tasklist_active.html', { |
|
|
|
'tasks': tasks |
|
|
|
@ -38,7 +38,7 @@ def active_tasks(request): |
|
|
|
@login_required |
|
|
|
@only_admins |
|
|
|
def finished_tasks(request): |
|
|
|
tasks = Task.objects.filter(recipient=request.user, state='F') # Выполненные |
|
|
|
tasks = Task.objects.filter(recipients=request.user, state='F') # Выполненные |
|
|
|
tasks = pag_mn(request, tasks) |
|
|
|
return render(request, 'taskapp/tasklist_finish.html', { |
|
|
|
'tasks': tasks |
|
|
|
@ -58,7 +58,7 @@ def own_tasks(request): |
|
|
|
@login_required |
|
|
|
@only_admins |
|
|
|
def my_tasks(request): |
|
|
|
tasks = Task.objects.filter(recipient=request.user) # Все задачи |
|
|
|
tasks = Task.objects.filter(recipients=request.user) # Все задачи |
|
|
|
tasks = pag_mn(request, tasks) |
|
|
|
return render(request, 'taskapp/tasklist.html', { |
|
|
|
'tasks': tasks |
|
|
|
@ -78,52 +78,73 @@ def all_tasks(request): |
|
|
|
@permission_required('taskapp.can_delete_task') |
|
|
|
def task_delete(request, task_id): |
|
|
|
task = get_object_or_404(Task, id=task_id) |
|
|
|
if request.user != task.recipient: |
|
|
|
# нельзя удалить назначенную мне задачу |
|
|
|
if request.user not in task.recipients.all(): |
|
|
|
task.delete() |
|
|
|
return redirect('taskapp:home') |
|
|
|
|
|
|
|
|
|
|
|
@login_required |
|
|
|
@only_admins |
|
|
|
def view(request, task_id): |
|
|
|
tsk = get_object_or_404(Task, id=task_id) |
|
|
|
toc = date(tsk.time_of_create.year, tsk.time_of_create.month, tsk.time_of_create.day) |
|
|
|
time_diff = tsk.out_date - toc |
|
|
|
return render(request, 'taskapp/view.html', { |
|
|
|
'task': tsk, |
|
|
|
'time_diff': time_diff |
|
|
|
}) |
|
|
|
|
|
|
|
@login_required |
|
|
|
@permission_required('taskapp.can_change_task') |
|
|
|
def task_add_edit(request, task_id=0): |
|
|
|
task_id = safe_int(task_id) |
|
|
|
warntext = '' |
|
|
|
|
|
|
|
uid = request.GET.get('uid') |
|
|
|
selected_abon = None |
|
|
|
frm = TaskFrm() |
|
|
|
|
|
|
|
# чтоб при добавлении сразу был выбран исполнитель |
|
|
|
frm_recipient_id = safe_int(request.GET.get('rp')) |
|
|
|
#frm_recipient_id = safe_int(request.GET.get('rp')) |
|
|
|
|
|
|
|
if task_id == 0: |
|
|
|
tsk = Task() |
|
|
|
tsk.author = request.user |
|
|
|
else: |
|
|
|
tsk = get_object_or_404(Task, id=task_id) |
|
|
|
frm = TaskFrm(instance=tsk) |
|
|
|
selected_abon = tsk.abon |
|
|
|
|
|
|
|
if uid: |
|
|
|
selected_abon = get_object_or_404(Abon, username=str(uid)) |
|
|
|
|
|
|
|
if request.method == 'POST': |
|
|
|
|
|
|
|
tsk.author = request.user |
|
|
|
frm = TaskFrm(request.POST, request.FILES, instance=tsk) |
|
|
|
|
|
|
|
if frm.is_valid(): |
|
|
|
frm.save() |
|
|
|
return redirect('taskapp:home') |
|
|
|
else: |
|
|
|
warntext = u'Исправте ошибки' |
|
|
|
else: |
|
|
|
if task_id == 0: |
|
|
|
try: |
|
|
|
uid = int(uid or 0) |
|
|
|
selected_abon = None if uid == 0 else get_object_or_404(Abon, username=str(uid)) |
|
|
|
frm = TaskFrm(initial={ |
|
|
|
'recipient': frm_recipient_id, |
|
|
|
'abon': selected_abon |
|
|
|
}) |
|
|
|
except ValueError: |
|
|
|
warntext=u'Передаваемый логин абонента должен состоять только из цифр' |
|
|
|
frm = TaskFrm(initial={ |
|
|
|
'recipient': frm_recipient_id |
|
|
|
}) |
|
|
|
task_instance = frm.save() |
|
|
|
# получим абонента, выбранного в форме |
|
|
|
selected_abon = task_instance.abon |
|
|
|
if selected_abon: |
|
|
|
# получаем аккаунты назначенные на группу выбранного абонента |
|
|
|
profiles = selected_abon.group.profiles.filter(is_active=True).filter(is_admin=True) |
|
|
|
|
|
|
|
# если нашли кого-нибудь |
|
|
|
if profiles.count() > 0: |
|
|
|
# выбираем их id в базе |
|
|
|
profile_ids = [prof.id for prof in profiles] |
|
|
|
# добавляем найденных работников в задачу |
|
|
|
task_instance.recipients.add(*profile_ids) |
|
|
|
# окончательно сохраняемся |
|
|
|
task_instance.save() |
|
|
|
return redirect('taskapp:home') |
|
|
|
else: |
|
|
|
warntext=u'Нет ответственных за группу, в которой находится выбранный абонент' |
|
|
|
else: |
|
|
|
warntext=u'Нужно выбрать абонента' |
|
|
|
else: |
|
|
|
frm = TaskFrm(instance=tsk) |
|
|
|
selected_abon = tsk.abon |
|
|
|
warntext = u'Ошибка в полях формы в задаче' |
|
|
|
|
|
|
|
return render(request, 'taskapp/add_edit_task.html', { |
|
|
|
'warntext': warntext, |
|
|
|
|
Dmitry
9 years ago