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}") # Если адреса не получили выводим ошибку