norets/knd_klinteplo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Исправление ошибки из-за задания на сервере

Browse Source 
Добавлено условие проверки на тип задания
This commit is contained in:
Noretsa 2020-10-10 10:33:50 +03:00
parent 151a915911
commit a194386606
2 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
knd_bot.py
View File

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

37
knd_bot_assigned.py
View File

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