diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bd2171ce..f899e28cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), #### Changed +- Changed layout of source detail page [#526](https://github.com/askap-vast/vast-pipeline/pull/526). - Updated mkdocs-material to 7.1.4 for native creation date support [#518](https://github.com/askap-vast/vast-pipeline/pull/518). - Updated developing docs to specify the main development branch as dev instead of master [#521](https://github.com/askap-vast/vast-pipeline/pull/521). - Updated tests to account for relation fix [#510](https://github.com/askap-vast/vast-pipeline/pull/510). @@ -94,6 +95,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), #### List of PRs +- [#526](https://github.com/askap-vast/vast-pipeline/pull/526) feat: Updated source detail page layout. - [#518](https://github.com/askap-vast/vast-pipeline/pull/518) dep: Updated mkdocs-material for native creation date support. - [#523](https://github.com/askap-vast/vast-pipeline/pull/523) fix: Fixed external search results table nan values. - [#521](https://github.com/askap-vast/vast-pipeline/pull/521) doc: update doc related to default dev branch. diff --git a/static/js/datatables-pipeline.js b/static/js/datatables-pipeline.js index 7edf83d5e..9d7e43224 100644 --- a/static/js/datatables-pipeline.js +++ b/static/js/datatables-pipeline.js @@ -254,7 +254,7 @@ $(document).ready(function() { */ .DataTable({ "searching": false, - "pageLength": 5, + "pageLength": 15, "lengthChange": false, // need a different dom for external results table "dom": ( diff --git a/templates/measurement_detail.html b/templates/measurement_detail.html index f90125379..36346e956 100644 --- a/templates/measurement_detail.html +++ b/templates/measurement_detail.html @@ -136,13 +136,6 @@
Details
- -
-
-
-
-
-
@@ -154,6 +147,15 @@
Postage Stamp
+ + +
+
+
+
+
+ +
diff --git a/templates/source_detail.html b/templates/source_detail.html index 0cf0707c3..68accff5a 100644 --- a/templates/source_detail.html +++ b/templates/source_detail.html @@ -78,9 +78,8 @@

Source: {{ source.name }}

- - -
+ +
Details
@@ -89,101 +88,121 @@
Details

Name: {{ source.name }}
Pipeline Run: {{ source.run_name }} + target="_blank">{{ source.run_name }}

Position: {{ source.wavg_ra_hms }} {{ source.wavg_dec_dms }}
Position (Decimal): {{ source.wavg_ra|floatformat:6 }} {{ source.wavg_dec|floatformat:6 }}
Position (Galactic): {{ source.wavg_l|floatformat:6 }} {{ source.wavg_b|floatformat:6 }}

-

-

+

- Avg. Int. Flux: {{ source.avg_flux_int|floatformat:3 }} mJy
- Min. Int. Flux: {{ source.min_flux_int|floatformat:3 }} mJy
- Max Int. Flux: {{ source.max_flux_int|floatformat:3 }} mJy
- Min Int. Flux Isl. Ratio: {{ source.min_flux_int_isl_ratio|floatformat:2 }} + Nr Datapoints: {{ source.n_meas }} (Table)
+ Nr Selavy: {{ source.n_meas_sel }}
+ Nr Forced: {{ source.n_meas_forced }}
+ Nr Relations: {{ source.n_rel }} + {% if source.n_rel > 0 %}(Table){% endif %}
+ Nr Siblings: {{ source.n_sibl }} +

+

+ W. Avg RA Err: {{ source.wavg_uncertainty_ew|deg_to_arcsec|floatformat:3 }}″
+ W. Avg Dec Err: + {{ source.wavg_uncertainty_ns|deg_to_arcsec|floatformat:3 }}″

- Avg. Peak Flux: {{ source.avg_flux_peak|floatformat:3 }} mJy/beam
- Min. Peak Flux: {{ source.min_flux_peak|floatformat:3 }} mJy/beam
- Max Peak Flux: {{ source.max_flux_peak|floatformat:3 }} mJy/beam
- Min Peak Flux Isl. Ratio: {{ source.min_flux_peak_isl_ratio|floatformat:2 }} + Avg. Compactness: {{ source.avg_compactness|floatformat:3 }}
+ Neighbour Dist: {{ source.n_neighbour_dist|deg_to_arcmin|floatformat:2 }}′
+ Max SNR: {{ source.max_snr|floatformat:2 }}
+ Min SNR: {{ source.min_snr|floatformat:2 }} +

+

+
+ New Source: {{ source.new }}
+ New High Sigma: + {% if source.new %}{{ source.new_high_sigma|floatformat:2 }}{% else %}N/A{% endif %}

-
+
+
+
+ + +
+
+
+
First Detection Postage Stamp
+
+
+
+
+
+
+ + +
+
+
+
+
+ +
+ +
+ +
+
+
+
Flux & Variability Details
+
+
+

- W. Avg RA Err: {{ source.wavg_uncertainty_ew|deg_to_arcsec|floatformat:3 }}″
- W. Avg Dec Err: - {{ source.wavg_uncertainty_ns|deg_to_arcsec|floatformat:3 }}″
- Avg. Compactness: {{ source.avg_compactness|floatformat:3 }}
- Neighbour Dist: {{ source.n_neighbour_dist|deg_to_arcmin|floatformat:2 }}′ + Integrated Flux (mJy)

- Max SNR: {{ source.max_snr|floatformat:2 }}
- Min SNR: {{ source.min_snr|floatformat:2 }} + Avg. Int. Flux: {{ source.avg_flux_int|floatformat:3 }}
+ Min. Int. Flux: {{ source.min_flux_int|floatformat:3 }}
+ Max Int. Flux: {{ source.max_flux_int|floatformat:3 }}
+ Min Int. Flux Isl. Ratio: {{ source.min_flux_int_isl_ratio|floatformat:2 }}

- Nr Datapoints: {{ source.n_meas }} (Table)
- Nr Selavy: {{ source.n_meas_sel }}
- Nr Forced: {{ source.n_meas_forced }} + Max |Vs| metric (int): {{ source.vs_abs_significant_max_int|floatformat:2 }}
+ Max |m| metric (int): {{ source.m_abs_significant_max_int|floatformat:2 }}

- Nr Relations: {{ source.n_rel }} - {% if source.n_rel > 0 %}(Table){% endif %}
- Nr Siblings: {{ source.n_sibl }} + V (Int. Flux): {{ source.v_int|floatformat:2 }}
+ η (Int. Flux): {{ source.eta_int|floatformat:2 }}

- V (Int. Flux): {{ source.v_int|floatformat:2 }}
- V (Peak Flux): {{ source.v_peak|floatformat:2 }}
- η (Int. Flux): {{ source.eta_int|floatformat:2 }}
- η (Peak Flux): {{ source.eta_peak|floatformat:2 }} + Peak Flux (mJy/beam)

- New Source: {{ source.new }}
- New High Sigma: - {% if source.new %}{{ source.new_high_sigma|floatformat:2 }}{% else %}N/A{% endif %} + Avg. Peak Flux: {{ source.avg_flux_peak|floatformat:3 }}
+ Min. Peak Flux: {{ source.min_flux_peak|floatformat:3 }}
+ Max Peak Flux: {{ source.max_flux_peak|floatformat:3 }}
+ Min Peak Flux Isl. Ratio: {{ source.min_flux_peak_isl_ratio|floatformat:2 }}

Max |Vs| metric (peak): {{ source.vs_abs_significant_max_peak|floatformat:2 }}
- Max |Vs| metric (int): {{ source.vs_abs_significant_max_int|floatformat:2 }}
Max |m| metric (peak): {{ source.m_abs_significant_max_peak|floatformat:2 }}
- Max |m| metric (int): {{ source.m_abs_significant_max_int|floatformat:2 }}

- Lightcurve
- Postage stamps -

+ V (Peak Flux): {{ source.v_peak|floatformat:2 }}
+ η (Peak Flux): {{ source.eta_peak|floatformat:2 }}
-
- - {% include "comments_component.html" %} -
- - -
-
-
-
-
- -
- -
- - +
@@ -212,8 +231,11 @@
Light Curve
+
+ +
-
+
External Search Results (1 arcmin)
@@ -238,7 +260,11 @@
External Search Results (1 arcmin)
-
+ +
+ {% include "comments_component.html" %} +
+
@@ -498,9 +524,11 @@ { var displayId = "JS9_" + (i + 1); diff --git a/vast_pipeline/views.py b/vast_pipeline/views.py index b79d0bc08..79e984772 100644 --- a/vast_pipeline/views.py +++ b/vast_pipeline/views.py @@ -1333,6 +1333,9 @@ def SourceDetail(request, pk): frequency=F('image__band__frequency'), ).order_by('datetime').values(*tuple(cols)) ) + + first_det_meas_index = [i['forced'] for i in measurements].index(False) + for one_m in measurements: one_m['datetime'] = one_m['datetime'].isoformat() @@ -1444,6 +1447,7 @@ def SourceDetail(request, pk): 'source': source, 'source_next_id': source_next_id, 'source_previous_id': source_previous_id, + 'first_det_meas_index': first_det_meas_index, 'datatables': [measurements, related_datatables], # flag to deactivate starring and render yellow star 'sourcefav': (