Merge 29778dc into cbcc967

Clinical-Genomics · Jul 26, 2021 · ace59d0 · ace59d0
2 parents cbcc967 + 29778dc
commit ace59d0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/statina/API/external/api/api_v1/templates/batch/plots/FF.html b/statina/API/external/api/api_v1/templates/batch/plots/FF.html
@@ -29,8 +29,8 @@
         var backstat = {
             y: {{control['FF']}},
             x: {{control['FFY']}},
+            text: {{control['names']|tojson}},
             name: 'Negative (N={{control['count']}})',
-            hoverinfo: 'none',
             mode: 'markers',
             type: 'scatter',
             marker: {color: '#ccccb3'}
@@ -85,8 +85,8 @@
         var backstat = {
             y: {{control['FF']}},
             x: {{control['FFX']}},
+            text: {{control['names']|tojson}},
             name: 'Negative (N={{control['count']}})',
-            hoverinfo: 'none',
             mode: 'markers',
             type: 'scatter',
             marker: {color: '#ccccb3'}

diff --git a/statina/API/external/api/api_v1/templates/batch/plots/FF_XY.html b/statina/API/external/api/api_v1/templates/batch/plots/FF_XY.html
@@ -33,7 +33,6 @@
             x: {{control['FFX']}},
             text: {{control['names']|tojson}},
             name: 'Negative (N={{control['count']}})',
-            hoverinfo: 'none',
             mode: 'markers',
             type: 'scatter',
             marker: {color: '#ccccb3'}

diff --git a/statina/API/external/api/api_v1/templates/batch/plots/Zscore.html b/statina/API/external/api/api_v1/templates/batch/plots/Zscore.html
@@ -11,7 +11,7 @@
                         showline: true,
                         ticktext: {{ncv_chrom_data[chrom]['names']|tojson}},
                         tickvals: {{ncv_chrom_data[chrom]['x_axis']}},
-                        tickangle: 20,
+                        tickangle: 90,
                         linecolor: '#636363',
                         linewidth: 5,
                         showgrid: true,
@@ -41,13 +41,13 @@
 
                 var box = {
                     y: {{ normal_data[chrom].ncv_values }},
+                    text: {{ normal_data[chrom].names|tojson }},
                     pointpos: 30,
                     type: 'box',
                     marker: {
                         color: '#ccccb3'
                     },
                     name: 'Negative (N={{normal_data[chrom].count}})',
-                    hoverinfo: 'none'
                 }
                 data.push(box)
 

diff --git a/statina/API/external/api/api_v1/templates/sample/sample_tris.html b/statina/API/external/api/api_v1/templates/sample/sample_tris.html
@@ -78,13 +78,13 @@
         var normal = {
             y: {{data.ncv_values}},
             x: {{data.x_axis}},
+            text: {{ data.names|tojson }},
             pointpos: 30,
             type: 'box',
             showlegend: true,
             marker: {
                 color: '#ccccb3'},
                 name: 'Negative T{{chrom}} (N={{data.count}})',
-                hoverinfo:'none',
                 boxpoints: 'suspectedoutliers',
             };
 

diff --git a/tests/crud/test_get_statistics.py b/tests/crud/test_get_statistics.py
@@ -67,6 +67,7 @@ def test_get_statistics_for_box_plot(database, small_helpers):
     # THEN the results shoule be:
     for batch_id in batches:
         assert results[batch_id] == {
+            "sample_ids": [f"{batch_id}1", f"{batch_id}2", f"{batch_id}3"],
             "FF_Formatted": [1, 2, 3],
             "Ratio_13": [1, 2, 3],
             "_id": {"batch": batch_id, "date": "2022-03-10"},