ua1zbe
/
gps
mirror of https://github.com/kf7eel/hbnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

finish APRS settings for unregistered

This commit is contained in:
KF7EEL 2021-10-25 04:56:42 -07:00
parent 2fa91b5316
commit 47df0f11ee
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
web/app.py
View File

@ -695,8 +695,18 @@ def hbnet_web_service():
edit_user.first_name = str(radioid_data[1]) edit_user.first_name = str(radioid_data[1])
edit_user.last_name = str(radioid_data[2]) edit_user.last_name = str(radioid_data[2])
edit_user.city = str(radioid_data[3]) edit_user.city = str(radioid_data[3])
unreg_set = Misc.query.filter_by(field_1='unregistered_aprs').first()
aprs_settings = ast.literal_eval(unreg_set.field_2)
for i in radioid_data[0].items(): for i in radioid_data[0].items():
aprs_dict[i[0]] = """[{'call': '""" + str(user.username).upper() + """'}, {'ssid': ''}, {'icon': ''}, {'comment': ''}, {'pin': ''}, {'APRS': False}]""" try:
if i[0] in aprs_settings:
aprs_dict[i[0]] = aprs_settings[i[0]]
del aprs_settings[i[0]]
misc_edit_field_1('unregistered_aprs', str(aprs_settings), '', '', 0, 0, 0, 0, False, False)
except Exception as e:
aprs_dict[i[0]] = """[{'call': '""" + str(user.username).upper() + """'}, {'ssid': ''}, {'icon': ''}, {'comment': ''}, {'pin': ''}, {'APRS': False}]"""
print(e)
edit_user.aprs = str(aprs_dict) edit_user.aprs = str(aprs_dict)
user_role = UserRoles( user_role = UserRoles(
user_id=edit_user.id, user_id=edit_user.id,
@ -3262,8 +3272,9 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
mode = 'unreg' mode = 'unreg'
unreg_set = Misc.query.filter_by(field_1='unregistered_aprs').first() unreg_set = Misc.query.filter_by(field_1='unregistered_aprs').first()
aprs_settings = ast.literal_eval(unreg_set.field_2) aprs_settings = ast.literal_eval(unreg_set.field_2)
print(mode)
try: try:
aprs_settings[_dmr_id] print(aprs_settings[_dmr_id])
except: except:
aprs_settings[_dmr_id] = [{'call': _user.upper()}, {'ssid': ''}, {'icon': ''}, {'comment': ''}, {'pin': ''}, {'APRS': False}] aprs_settings[_dmr_id] = [{'call': _user.upper()}, {'ssid': ''}, {'icon': ''}, {'comment': ''}, {'pin': ''}, {'APRS': False}]
if _setting == 'ssid': if _setting == 'ssid':
@ -6295,8 +6306,18 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
if not User.query.filter(User.username == request.form.get('username')).first(): if not User.query.filter(User.username == request.form.get('username')).first():
radioid_data = ast.literal_eval(get_ids(request.form.get('username'))) radioid_data = ast.literal_eval(get_ids(request.form.get('username')))
aprs_dict = {} aprs_dict = {}
unreg_set = Misc.query.filter_by(field_1='unregistered_aprs').first()
aprs_settings = ast.literal_eval(unreg_set.field_2)
for i in radioid_data[0].items(): for i in radioid_data[0].items():
aprs_dict[i[0]] = """[{'call': '""" + str(request.form.get('username')).upper() + """'}, {'ssid': ''}, {'icon': ''}, {'comment': ''}, {'pin': ''}, {'APRS': False}]""" try:
if i[0] in aprs_settings:
aprs_dict[i[0]] = aprs_settings[i[0]]
del aprs_settings[i[0]]
misc_edit_field_1('unregistered_aprs', str(aprs_settings), '', '', 0, 0, 0, 0, False, False)
except Exception as e:
aprs_dict[i[0]] = """[{'call': '""" + str(user.username).upper() + """'}, {'ssid': ''}, {'icon': ''}, {'comment': ''}, {'pin': ''}, {'APRS': False}]"""
print(e)
user = User( user = User(
username=request.form.get('username'), username=request.form.get('username'),
email=request.form.get('email'), email=request.form.get('email'),