andrei/Moona
andrei/Moona
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправлена ошибка, возникающая если пользователь не указал адреса и хотел построить маршрут

Browse Source
This commit is contained in:
Andrei 2022-10-31 22:42:19 +05:00
parent 123ff92d27
commit 6db712b31b
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
main.py
View File

@ -315,25 +315,29 @@ def safe_app_school_go(point):
if current_user.is_authenticated: if current_user.is_authenticated:
data_session = db_session.create_session() data_session = db_session.create_session()
address = data_session.query(UserPoint).filter(UserPoint.user == current_user.id).first() address = data_session.query(UserPoint).filter(UserPoint.user == current_user.id).first()
if address.school_address and address.home_address: if address:
with open('static/js/safe_app_school/mapbasics_templates.js', 'r', encoding='utf-8') as file: if address.school_address and address.home_address:
new_file = file.read().split('<point1>') with open('static/js/safe_app_school/mapbasics_templates.js', 'r', encoding='utf-8') as file:
new_file = new_file[0] + f'\'{address.home_address if point == "home" else address.school_address}\'' \ new_file = file.read().split('<point1>')
+ new_file[1] new_file = new_file[
new_file = new_file.split('<point2>') 0] + f'\'{address.home_address if point == "home" else address.school_address}\'' \
new_file = new_file[ + new_file[1]
0] + f'\'{address.school_address if point == "home" else address.home_address}\'' + \ new_file = new_file.split('<point2>')
new_file[1] new_file = new_file[
with open('static/js/safe_app_school/mapbasics.js', 'w', encoding='utf-8') as new_js: 0] + f'\'{address.school_address if point == "home" else address.home_address}\'' + \
new_js.write(new_file) new_file[1]
t = Timer(1, remove_java, args=None, kwargs=None) with open('static/js/safe_app_school/mapbasics.js', 'w', encoding='utf-8') as new_js:
t.start() new_js.write(new_file)
if point == 'home': t = Timer(1, remove_java, args=None, kwargs=None)
return render_template('safe_app_school/route.html', title='Маршрут домой', route='домой') t.start()
elif point == 'school': if point == 'home':
return render_template('safe_app_school/route.html', title='Маршрут в школу', route='в школу') return render_template('safe_app_school/route.html', title='Маршрут домой', route='домой')
elif point == 'school':
return render_template('safe_app_school/route.html', title='Маршрут в школу', route='в школу')
else:
return redirect('/safe_app_school/main')
else: else:
return redirect('/safe_app_school/main') return render_template('safe_app_school/route.html', title='Маршрут не указан', route=False)
else: else:
return render_template('safe_app_school/route.html', title='Маршрут не указан', route=False) return render_template('safe_app_school/route.html', title='Маршрут не указан', route=False)
else: else: