From a194386606cbafed67cee11e1fe678c140b5661c Mon Sep 17 00:00:00 2001
From: Noretsa <norets@klintorg.ru>
Date: Sat, 10 Oct 2020 10:33:50 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D0=B8=D0=B7-=D0=B7=D0=B0=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BD=D0=B0=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Добавлено условие проверки на тип задания
---
 knd_bot.py          | 37 +++++++++++++++++++------------------
 knd_bot_assigned.py | 37 +++++++++++++++++++------------------
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/knd_bot.py b/knd_bot.py
index d539668..feea27d 100644
--- a/knd_bot.py
+++ b/knd_bot.py
@@ -201,25 +201,26 @@ def get_task(session, headers):
                     for execution in enterances:
                         address_from_tasks = execution['dimensions'][0].get('entity_value_name')
                         name_from_tasks = execution['name']
-                        enterance = execution['dimensions'][2].get('entity_value_name')
-                        if address_from_tasks == 'Клин г, '+ addr.replace("_", "/")[:-4] and \
-                           enterance[-1] == address[-2]:
-                            print('\n')
-                            print(name_from_tasks)
-                            print('\n')
-                            task = {
-                                'id': execution['execution_id'],
-                                'address': execution['dimensions'][0].get('entity_value_name'),
-                                'enterance': execution['dimensions'][2].get('entity_value_name'),
-                                'coord': coord
-                            }
-                            if name_from_tasks == desinfection:
-                                pass
+                        if name_from_tasks == proverka:
+                            enterance = execution['dimensions'][2].get('entity_value_name')
+                            if address_from_tasks == 'Клин г, '+ addr.replace("_", "/")[:-4] and \
+                               enterance[-1] == address[-2]:
+                                print('\n')
+                                print(name_from_tasks)
+                                print('\n')
+                                task = {
+                                    'id': execution['execution_id'],
+                                    'address': execution['dimensions'][0].get('entity_value_name'),
+                                    'enterance': execution['dimensions'][2].get('entity_value_name'),
+                                    'coord': coord
+                                }
+                                if name_from_tasks == desinfection:
+                                    pass
                                 # des.assign_task(session, headers, task, address)
-                            elif name_from_tasks == proverka:
-                                prov.assign_task(session, headers, task, address)
-                            else:
-                                pass
+                                elif name_from_tasks == proverka:
+                                    prov.assign_task(session, headers, task, address)
+                                else:
+                                    pass
             else:
                 print(f"Нет доступных заданий для пользователя {headers['uid']} по адресу: {address}")
     # Если адреса не получили выводим ошибку
diff --git a/knd_bot_assigned.py b/knd_bot_assigned.py
index 928cad2..24bc85a 100644
--- a/knd_bot_assigned.py
+++ b/knd_bot_assigned.py
@@ -201,25 +201,26 @@ def get_task(session, headers):
                     for execution in enterances:
                         address_from_tasks = execution['dimensions'][0].get('entity_value_name')
                         name_from_tasks = execution['name']
-                        enterance = execution['dimensions'][2].get('entity_value_name')
-                        if address_from_tasks == 'Клин г, '+ addr.replace("_", "/")[:-4] and \
-                           enterance[-1] == address[-2]:
-                            print('\n')
-                            print(name_from_tasks)
-                            print('\n')
-                            task = {
-                                'id': execution['execution_id'],
-                                'address': execution['dimensions'][0].get('entity_value_name'),
-                                'enterance': execution['dimensions'][2].get('entity_value_name'),
-                                'coord': coord
-                            }
-                            if name_from_tasks == desinfection:
-                                pass
+                        if name_from_tasks == proverka:
+                            enterance = execution['dimensions'][2].get('entity_value_name')
+                            if address_from_tasks == 'Клин г, '+ addr.replace("_", "/")[:-4] and \
+                               enterance[-1] == address[-2]:
+                                print('\n')
+                                print(name_from_tasks)
+                                print('\n')
+                                task = {
+                                    'id': execution['execution_id'],
+                                    'address': execution['dimensions'][0].get('entity_value_name'),
+                                    'enterance': execution['dimensions'][2].get('entity_value_name'),
+                                    'coord': coord
+                                }
+                                if name_from_tasks == desinfection:
+                                    pass
                                 # des.assign_task(session, headers, task, address)
-                            elif name_from_tasks == proverka:
-                                prov.assign_task(session, headers, task, address)
-                            else:
-                                pass
+                                elif name_from_tasks == proverka:
+                                    prov.assign_task(session, headers, task, address)
+                                else:
+                                    pass
             else:
                 print(f"Нет доступных заданий для пользователя {headers['uid']} по адресу: {address}")
     # Если адреса не получили выводим ошибку