From 0133c887ea768471d1f443475f301871f49103b3 Mon Sep 17 00:00:00 2001
From: Dmitry <nerosketch@gmail.com>
Date: Sun, 15 Jan 2017 23:30:57 +0000
Subject: [PATCH] =?UTF-8?q?=D0=B2=20=D0=BE=D0=BF=D0=BE=D0=B2=D0=B5=D1=89?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=D0=BD=D0=B5=D0=B4=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=87=D0=B0=D1=82=20=D0=B1=D0=BE=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 taskapp/models.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/taskapp/models.py b/taskapp/models.py
index 85957ed..3d18c84 100644
--- a/taskapp/models.py
+++ b/taskapp/models.py
@@ -2,14 +2,15 @@
 from __future__ import unicode_literals
 
 from datetime import datetime, timedelta
-import os
-from subprocess import call
+#import os
+#from subprocess import call
 from django.db import models
 from django.conf import settings
 from abonapp.models import Abon
 
 #from devapp.models import Device
-from djing.settings import BASE_DIR
+#from djing.settings import BASE_DIR
+from handle import handle as task_handle
 
 
 TASK_PRIORITIES = (
@@ -60,7 +61,7 @@ def _delta_add_days():
     return datetime.now() + timedelta(days=3)
 
 class Task(models.Model):
-    descr = models.CharField(max_length=128)
+    descr = models.CharField(max_length=128, null=True, blank=True)
     recipients = models.ManyToManyField(settings.AUTH_USER_MODEL, related_name='them_task')
     author = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='+')
     #device = models.ForeignKey(Device, related_name='dev')
@@ -101,26 +102,28 @@ class Task(models.Model):
 
 
 def task_handler(sender, instance, **kwargs):
-    cur_dir = os.path.join(BASE_DIR, "taskapp")
-    group_name = ''
+    #cur_dir = os.path.join(BASE_DIR, "taskapp")
+    group = ''
     if instance.abon:
-        if instance.abon.group:
-            group_name = instance.abon.group.title
+        group = instance.abon.group
     if kwargs['created']:
-        first_param = 'start'
         ChangeLog.objects.create(
             task=instance,
             act_type=b'c',
             who=instance.author
         )
     else:
-        first_param = 'change'
         ChangeLog.objects.create(
             task=instance,
             act_type=b'e',
             who=instance.author
         )
     for recipient in instance.recipients.all():
+        task_handle(
+            instance, instance.author,
+            recipient, group
+        )
+        '''
         call(['%s/handle.sh' % cur_dir,
             first_param,                    # start or change
             instance.get_mode_display(),    # mode - Характер поломки
@@ -134,6 +137,7 @@ def task_handler(sender, instance, **kwargs):
               instance.abon.address if instance.abon else '<нет адреса>',
               instance.abon.telephone if instance.abon else '<нет телефона>',
               group_name])                  # Имя группы абонента
+              '''
 
 
 def task_delete(sender, instance, **kwargs):