diff --git a/src/ajaxrequests.py b/src/ajaxrequests.py index 6d4aa72f..725387f9 100644 --- a/src/ajaxrequests.py +++ b/src/ajaxrequests.py @@ -312,18 +312,29 @@ def ajax_event_galaxies(): for glist in galLists: markers = [] entries = [x for x in galEntries if x.listid == glist.id] + name_list = [] + ra_list = [] + dec_list = [] + rank_list = [] + info_list = [] + for e in entries: ra, dec = function.sanatize_pointing(e.position) - markers.append({ - "name":e.name, - "ra": ra, - "dec": dec, - "info":function.sanatize_gal_info(e, glist) - }) + name_list.append(e.name) + ra_list.append(ra) + dec_list.append(dec) + rank_list.append(int(e.rank)) + info_list.append(function.sanatize_gal_info(e, glist)) + + df = pd.DataFrame({'name': name_list, 'ra':ra_list, 'dec':dec_list, 'rank':rank_list, 'info':info_list}) + df.sort_values(by=['rank'], inplace=True, ignore_index=True) + df.drop(columns = 'rank') + + markers = df.to_dict('records') event_galaxies.append({ - "name":glist.groupname, - "color":"", - "markers":markers + "name": glist.groupname, + "color": "", + "markers": markers }) return(jsonify(event_galaxies)) diff --git a/src/function.py b/src/function.py index bc5674e4..a77c1630 100644 --- a/src/function.py +++ b/src/function.py @@ -151,16 +151,21 @@ def sanatize_XRT_source_info(info): def sanatize_gal_info(entry, glist): ra, dec = sanatize_pointing(entry.position) ret = "
"
- ret = " RA DEC: "+str(round(ra,4))+" "+str(round(dec,4))+"
"
- ret += "Score: "+str(entry.score)+"
"
+ ret += " RA: " +f"{ra:.4f}" + "
"
+ ret += " DEC: " + f"{dec:.4f}" + "
"
+ ret += "Score: "+ f"{entry.score:.4E}"+"
"
ret += "Rank: "+str(entry.rank)+"
"
if glist.reference:
- ret+= f"Reference
"
+ ret += f"Reference
"
if glist.doi_url:
- ret+= f"DOI
"
+ ret += f"DOI
"
+ ret += f"NED
"
ret+="
"
for key in entry.info.keys():
- ret += ""+str(key)+": "+str(entry.info[key]).split('\n')[0]+"
"
+ if 'Dist' in str(key):
+ ret += ""+str(key)+": "+ "{:.2f}".format(float(str(entry.info[key]).split('\n')[0])) +"
"
+ else:
+ ret += ""+str(key)+": "+ "{:.2E}".format(float(str(entry.info[key]).split('\n')[0])) +"
"
ret += "