Improve web gui and night summary (#168)

- Fix bug in the web log viewer.
- Add other source names to web gui list.
- Add last night date next to last night mag in admin.
- Fix time range of link to interactive plot in night summary.
- Fix minor bugs related to web gui (filtering, table creation).

Author: juanep97

iop4admin/modeladmins/astrosource.py

@@ -57,9 +57,9 @@ def get_last_reducedfit(self, obj):
 
     @admin.display(description="LAST MAG")
     def get_last_mag_R(self, obj):
-        mag_r_avg, mag_r_err_avg = obj.last_night_mag_R
+        mag_r_avg, mag_r_err_avg, night = obj.last_night_mag_R
         if mag_r_avg is not None:
-            return f"{mag_r_avg:.2f}"
+            return f"{mag_r_avg:.2f} ± {mag_r_err_avg:.2f} ({night})"
         else:
             return None
 
@@ -77,7 +77,7 @@ def get_urls(self):
 
     @admin.display(description='T. Andor90')
     def get_texp_andor90(self, obj):
-        last_night_mag_R, _ = obj.last_night_mag_R
+        last_night_mag_R = obj.last_night_mag_R[0]
         texp = obj.texp_andor90
 
         if last_night_mag_R is None:
@@ -90,7 +90,7 @@ def get_texp_andor90(self, obj):
 
     @admin.display(description='T. Andor150')
     def get_texp_andor150(self, obj):
-        last_night_mag_R, _ = obj.last_night_mag_R
+        last_night_mag_R = obj.last_night_mag_R[0]
         texp = obj.texp_andor150
 
         if last_night_mag_R is None:
@@ -103,7 +103,7 @@ def get_texp_andor150(self, obj):
 
     @admin.display(description='T. x N DIPOL')
     def get_texp_dipol(self, obj):
-        last_night_mag_R, _ = obj.last_night_mag_R
+        last_night_mag_R = obj.last_night_mag_R[0]
         texp = obj.texp_dipol
         nreps = obj.nreps_dipol
 

iop4api/static/iop4api/gui.js

@@ -105,6 +105,12 @@ Tabulator.extendModule("filter", "filters", {
 
 function make_nice_table() {
 
+    var tables = Tabulator.findTable('#tableDiv');
+    if (tables && tables.length > 0) {
+        console.log("Destroying old table")
+        tables[0].destroy();
+    }
+
     var table = new Tabulator("#tableDiv", {
         data: vueApp.$data.tableData.data,
         columns: vueApp.$data.tableData.tabulatorjs_coldefs,

iop4api/templates/iop4api/explore.html

@@ -14,8 +14,10 @@ <h1>Explore data &nbsp;<span class="material-symbols-outlined">&#xE8B6;</span></
 <div id="explore_container" class="tab-container">
 
     <datalist id="source_name_list">
-        {% for source_name in source_name_list %}
-            <option value="{{ source_name }}">{{ source_name }}</option>
+        {% for srcname, altname in source_name_list %}
+            <option value="{{ srcname }}">
+                {{ srcname }} {% if altname and srcname != altname %}&nbsp;&nbsp; ({{altname}}){% endif %}
+            </option>
         {% endfor %}
     </datalist>
 

iop4api/templates/iop4api/index.html

@@ -305,7 +305,7 @@ <h2><a href="https://vhega.iaa.es/">VHEGA@IAA-CSIC</a></h2>
 
                             if (value === '') { // if empty, null (works with = or != default filters)
                                 value = null;
-                            } else if (type != 'after') { // if values can be numbers, fix type
+                            } else if (type !== 'after' && type !== 'before') { // if values can be numbers, fix type
                                 if (!isNaN(value) && !isNaN(Number(value))) {
                                     value = Number(value);
                                 }

iop4api/views/data.py

@@ -25,7 +25,7 @@ def data(request):
     source_name = request.POST.get("source_name", None)
 
     if not AstroSource.objects.filter(name=source_name).exists(): 
-        return HttpResponseBadRequest(f"Source '{source_name}' does not exist".format(source_name=source_name))
+        return HttpResponseBadRequest(f"Source '{source_name}' does not exist")
 
     qs = PhotoPolResult.objects.filter(astrosource__name=source_name)
 
@@ -45,7 +45,7 @@ def data(request):
                         }
     }
 
-    # annotate with date fromt the julian date
+    # annotate with date from the julian date
     for r in result["data"]:
         r["date"] = Time(r["juliandate"], format='jd').iso
     result["columns"].append({"name": "date", "title": "date", "type": "date", "help": "date and time in ISO 8601 format, from the julian date"})    

iop4api/views/index.py

@@ -47,7 +47,9 @@ def index(request, tabs=None):
 
     # if the user is logged, pass source names to the template
     if request.user.is_authenticated:
-        context['source_name_list'] = AstroSource.objects.exclude(is_calibrator=True).values_list('name', flat="True")
+        source_name_list = list(AstroSource.objects.exclude(is_calibrator=True).values_list('name','other_names'))
+        source_name_list = [ (name, (other_names.split(';')[0].strip()) if other_names else '') for (name, other_names) in source_name_list]
+        context['source_name_list'] = source_name_list
 
     # add the hash of the current commit installed 
     context['git_commit_hash'] = GIT_COMMIT_HASH

iop4api/views/log.py

@@ -27,7 +27,7 @@ def _log_file_generator():
     return _log_file_generator()
 
 @staff_member_required
-@permission_required(["iop4api.view_photpolresult", "iop4api.view_astrosource"]) 
+@permission_required(["iop4api.view_photopolresult", "iop4api.view_astrosource"])
 def log(request):
     r"""Staff member required. Since the log file can be very large, we use a generator to stream it to the client."""
 

iop4lib/db/astrosource.py

@@ -8,6 +8,7 @@
 
 # iop4lib imports
 from ..enums import *
+from iop4lib.utils import get_column_values
 
 # other imports
 import os
@@ -18,6 +19,7 @@
 from astropy.coordinates import Angle, SkyCoord
 import astropy.units as u
 import math
+import numpy as np
 
 # logging
 import logging
@@ -228,20 +230,29 @@ def last_reducedfit(self):
     def last_night_mag_R(self):
         """Returns the average magnitude and error of the last night in the R band."""
 
-        last_night = self.photopolresults.filter(band=BANDS.R).earliest('-epoch__night').epoch.night
-        r_avg = self.photopolresults.filter(band=BANDS.R, epoch__night=last_night).aggregate(mag_avg=Avg('mag'), mag_err_avg=Avg('mag_err'))
+        qs = self.photopolresults.filter(band=BANDS.R).exclude(mag=None).exclude(mag_err=None)
 
-        mag_r_avg = r_avg.get('mag_avg', None)
-        mag_r_err_avg = r_avg.get('mag_err_avg', None)
+        if not qs:
+            return None, None, None
+        
+        last_night = qs.earliest('-epoch__night').epoch.night
+
+        qs = qs.filter(epoch__night=last_night)
+        
+        vals = get_column_values(qs, ['mag', 'mag_err'])
+        mag_r, mag_r_err = vals['mag'], vals['mag_err']
+
+        mag_r_avg = np.average(mag_r, weights=1/mag_r_err**2)
+        mag_r_avg_err = 1/np.sqrt(np.sum(1/mag_r_err**2))
 
-        return mag_r_avg, mag_r_err_avg
+        return mag_r_avg, mag_r_avg_err, last_night
 
     @property
     def texp_andor90(self):
-        """Recommneded exposure time for Andor90, based on the last R magnitude and for a SNR of 150."""
+        """Recommended exposure time for Andor90, based on the last R magnitude and for a SNR of 150."""
 
         snr = 150
-        last_night_mag_R, _ = self.last_night_mag_R
+        last_night_mag_R = self.last_night_mag_R[0]
 
         if last_night_mag_R is None:
             return None
@@ -263,10 +274,10 @@ def texp_andor90(self):
 
     @property
     def texp_andor150(self):
-        """Recommneded exposure time for Andor150, based on the last night R magnitude and for a SNR of 150."""
+        """Recommended exposure time for Andor150, based on the last night R magnitude and for a SNR of 150."""
 
         snr = 150
-        last_night_mag_R, _ = self.last_night_mag_R
+        last_night_mag_R = self.last_night_mag_R[0]
 
         if last_night_mag_R is None:
             return None
@@ -286,10 +297,10 @@ def texp_andor150(self):
 
     @property
     def texp_dipol(self):
-        """Recommneded exposure time for DIPOL, based on the last night R magnitude and for a SNR of 150."""
+        """Recommended exposure time for DIPOL, based on the last night R magnitude and for a SNR of 150."""
 
         snr = 150
-        last_night_mag_R, _ = self.last_night_mag_R
+        last_night_mag_R = self.last_night_mag_R[0]
 
         if last_night_mag_R is None:
             return None
@@ -305,10 +316,10 @@ def texp_dipol(self):
 
     @property
     def nreps_dipol(self):
-        """Recommneded number of repetitions for DIPOL, based on the last night R magnitude and for a SNR of 150."""
+        """Recommended number of repetitions for DIPOL, based on the last night R magnitude and for a SNR of 150."""
 
         snr = 150
-        last_night_mag_R, _ = self.last_night_mag_R
+        last_night_mag_R = self.last_night_mag_R[0]
 
         if last_night_mag_R is None:
             return None

iop4lib/db/fitfilemodel.py

@@ -307,23 +307,4 @@ def fscale_inv(y):
                 f.write(imgbytes)
 
         return imgbytes
-        
-
-
-
-
-
-
-""" # how it would be done without matplotlib
-imgdata = LogNorm(vmin=vmin, vmax=vmax)(imgdata)
-
-imgdata = 256*imgdata
-imgdata = imgdata.astype(np.uint8)
-image = Image.fromarray(imgdata).resize((width,height))
-
-
-buf = io.BytesIO()
-image.save(buf, format='png')
-buf.seek(0)
-imgbytes = buf.read()
-"""
+    

iop4lib/iop4_night_summary.py

@@ -69,9 +69,12 @@ def gather_context(args):
         epoch.files_with_error_astrometry_href = args.site_url + "/iop4/admin/iop4api/reducedfit/?id__in=" + ",".join(epoch.files_with_error_astrometry_ids_str_L)
         # TODO: include IOP4Admin in Django configure and use reverse as in PhotoPolResult admin for line above
 
-    # get list of all sources for which there are results in this night
+    # get list of all sources for which there are band R results in this night
 
-    sources = AstroSource.objects.exclude(is_calibrator=True).filter(photopolresults__epoch__night=args.date).distinct()
+    sources = AstroSource.objects.exclude(is_calibrator=True).filter(
+        photopolresults__epoch__night=args.date, 
+        photopolresults__band="R",
+    ).distinct()
 
     # check if some of these sources lack calibrators
     sources_without_calibrators = [source for source in sources if not source.calibrators.exists()]
@@ -170,8 +173,10 @@ def gather_context(args):
 
         url_args['srcname'] = source.name
 
-        if prev_night is not None:
+        if prev_night is not None and qs_today.count() == 1:
             url_args['from'] = str(prev_night)
+        else:
+            url_args['from'] = (qs0.last().datetime - datetime.timedelta(hours=1)).strftime('%Y-%m-%d %H:%M:%S')
 
         # we need 12:00 of the next day
         next_day_noon = (datetime.datetime.combine(args.date, datetime.time(12, 0)) + datetime.timedelta(days=1))