gov-uk-dashboards 16.1.0__tar.gz → 16.2.0__tar.gz

{gov_uk_dashboards-16.1.0/gov_uk_dashboards.egg-info → gov_uk_dashboards-16.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gov_uk_dashboards
-Version: 16.1.0
+Version: 16.2.0
 Summary: Provides access to functionality common to creating a data dashboard.
 Author: Department for Levelling Up, Housing and Communities
 Description-Content-Type: text/markdown

{gov_uk_dashboards-16.1.0 → gov_uk_dashboards-16.2.0}/gov_uk_dashboards/components/plotly/time_series_chart.py

@@ -156,6 +156,7 @@ class TimeSeriesChart:
                 line={"color": line_color},
                 hoverinfo="skip",  # 👈 This line disables hover for this trace
                 showlegend=False,  # Optional: hide it from legend too
+                legendgroup=self.additional_line["legend_group"],
             )
             fig.add_trace(trace_connector)
         # pylint: disable=unused-variable
@@ -173,12 +174,14 @@ class TimeSeriesChart:
                 marker_sizes = [0] + [12] * (len(df.with_row_count()) - 1)
             else:
                 marker_sizes = [12] * (len(df.with_row_count()))
+            legendgroup = self._get_legend_group(df)
             fig.add_trace(
                 self.create_time_series_trace(
                     df.sort(self.x_axis_column),
                     trace_name,
                     line_style={"dash": "solid", "color": colour},
                     marker={"symbol": marker, "size": marker_sizes, "opacity": 1},
+                    legendgroup=legendgroup,
                 ),
             )
 
@@ -220,6 +223,7 @@ class TimeSeriesChart:
             ]
 
             hover_text_full = hover_text + hover_text[::-1]
+            legendgroup = self._get_legend_group(fill_df)
             fig.add_trace(
                 go.Scatter(
                     x=x_series + x_series[::-1],
@@ -232,6 +236,7 @@ class TimeSeriesChart:
                     name=self.filled_traces_dict["name"] + LEGEND_SPACING,
                     hovertemplate=hover_text_full,
                     hoveron="points",
+                    legendgroup=legendgroup,
                 )
             )
         self._format_x_axis(fig)
@@ -299,6 +304,14 @@ class TimeSeriesChart:
         )
         return fig
 
+    def _get_legend_group(self, df):
+        if "legend_group" in df.columns and len(df) > 0:
+            value = df["legend_group"][0]
+            legendgroup = value if value is not None else None
+        else:
+            legendgroup = None
+        return legendgroup
+
     # pylint: disable=duplicate-code
     def _format_x_axis(self, fig):
         tick_text, tick_values, range_x = self._get_x_axis_content()
@@ -317,6 +330,7 @@ class TimeSeriesChart:
         trace_name: str,
         line_style: dict[str, str],
         marker: dict[str, str],
+        legendgroup: str,
     ):
         """Creates a trace for the plot.
 
@@ -326,6 +340,7 @@ class TimeSeriesChart:
             trace_name (str): Name of trace.
             line_style (dict[str, str]): Properties for line_style parameter.
             marker (dict[str,str]): Properties for marker parameter.
+            legendgroup (str): Name to group by in legend,
         """
         return go.Scatter(
             x=df[self.x_axis_column],
@@ -339,6 +354,7 @@ class TimeSeriesChart:
             showlegend=(
                 trace_name in self.legend_dict if self.legend_dict is not None else True
             ),
+            legendgroup=legendgroup,
         )
 
     def _get_hover_template(self, df, trace_name):

{gov_uk_dashboards-16.1.0 → gov_uk_dashboards-16.2.0/gov_uk_dashboards.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gov_uk_dashboards
-Version: 16.1.0
+Version: 16.2.0
 Summary: Provides access to functionality common to creating a data dashboard.
 Author: Department for Levelling Up, Housing and Communities
 Description-Content-Type: text/markdown

{gov_uk_dashboards-16.1.0 → gov_uk_dashboards-16.2.0}/setup.py

@@ -10,7 +10,7 @@ setup(
     author="Department for Levelling Up, Housing and Communities",
     description="Provides access to functionality common to creating a data dashboard.",
     name="gov_uk_dashboards",
-    version="16.1.0",
+    version="16.2.0",
     long_description=long_description,
     long_description_content_type="text/markdown",
     packages=find_packages(),